Properly quote compileall and Lib paths in case TARGETDIR has a space.

diff --git a/Misc/NEWS b/Misc/NEWS
index 3de28233e462e5b4ae604963a377450026003a48..b3fc3e1c36cfbc01c2a4cb3e39e9b1d73eea2579 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -89,6 +89,9 @@ Extension Modules
 Build
 -----
 
+- The MSI compileall step was fixed to also support a TARGETDIR
+  with spaces in it.
+
 - Bug #1517388: sqlite3.dll is now installed on Windows independent
   of Tcl/Tk.
 

diff --git a/Tools/msi/msi.py b/Tools/msi/msi.py
index c65c6bc2bbd46c546602776b219d5d12a130678a..aebab9836a3d9779db139b7f33d7fc61027f6080 100644 (file)
--- a/Tools/msi/msi.py
+++ b/Tools/msi/msi.py
@@ -367,7 +367,7 @@ def add_ui(db):
               ("VerdanaRed9", "Verdana", 9, 255, 0),
              ])
 
-    compileargs = r"-Wi [TARGETDIR]Lib\compileall.py -f -x bad_coding|badsyntax|site-packages [TARGETDIR]Lib"
+    compileargs = r'-Wi "[TARGETDIR]Lib\compileall.py" -f -x bad_coding|badsyntax|site-packages "[TARGETDIR]Lib"'
     # See "CustomAction Table"
     add_data(db, "CustomAction", [
         # msidbCustomActionTypeFirstSequence + msidbCustomActionTypeTextData + msidbCustomActionTypeProperty