summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2006-07-06 07:05:21 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2006-07-06 07:05:21 (GMT)
commit4cbd05c322d7ebb95b3623fe8e24b5e6bab7492c (patch)
tree7813828ecb7027dbe5fcc01f9f6a95583dd99273
parent88ef6377773b9bafdec0c7d85d3eefccf8209c61 (diff)
downloadcpython-4cbd05c322d7ebb95b3623fe8e24b5e6bab7492c.zip
cpython-4cbd05c322d7ebb95b3623fe8e24b5e6bab7492c.tar.gz
cpython-4cbd05c322d7ebb95b3623fe8e24b5e6bab7492c.tar.bz2
Properly quote compileall and Lib paths in case TARGETDIR has a space.
-rw-r--r--Misc/NEWS3
-rw-r--r--Tools/msi/msi.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 3de2823..b3fc3e1 100644
--- 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 c65c6bc..aebab98 100644
--- 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