[Python-checkins] python/dist/src/Tools/msi msi.py,1.12,1.13

Tue Nov 2 23:59:59 CET 2004

Update of /cvsroot/python/python/dist/src/Tools/msi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25674
Modified Files:
	msi.py 
Log Message:
Exclude badsyntax from compileall; adjust options to what Makefile.pre.in does.
Fixes #1049003.
Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/msi/msi.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13

--- msi.py	19 Sep 2004 18:36:45 -0000	1.12
+++ msi.py	2 Nov 2004 22:59:56 -0000	1.13
@@ -352,6 +352,7 @@
 ("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 @@
 ("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"
