Exclude badsyntax from compileall; adjust options to what Makefile.pre.in does.

Fixes #1049003.

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index cda7bb656311dc9a495f946f50daea50fccae3b8..35f2c4a50a0b4fd97e8d65b994a4f89566c5c007 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -352,6 +352,7 @@ def add_ui(db):
               ("VerdanaBold10", "Verdana", 10, None, 1),
              ])
 
+    compileargs = r"-Wi [TARGETDIR]Lib\compileall.py -f -x badsyntax [TARGETDIR]Lib"
     # See "CustomAction Table"
     add_data(db, "CustomAction", [
         # msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty
@@ -363,8 +364,8 @@ def add_ui(db):
         ("SetDLLDirToSystem32", 307, "DLLDIR", SystemFolderName),
         # msidbCustomActionTypeExe + msidbCustomActionTypeSourceFile
         # See "Custom Action Type 18"
-        ("CompilePyc", 18, "python.exe", r"[TARGETDIR]Lib\compileall.py [TARGETDIR]Lib"),
-        ("CompilePyo", 18, "python.exe", r"-O [TARGETDIR]Lib\compileall.py [TARGETDIR]Lib")
+        ("CompilePyc", 18, "python.exe", compileargs),
+        ("CompilePyo", 18, "python.exe", "-O "+compileargs),
         ])
 
     # UI Sequences, see "InstallUISequence Table", "Using a Sequence Table"