[Python-checkins] python/dist/src/Tools/msi msi.py,1.14,1.15

Thu Nov 18 09:00:36 CET 2004

Update of /cvsroot/python/python/dist/src/Tools/msi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30136
Modified Files:
	msi.py 
Log Message:
Add missing have_tcl conditions
Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Tools/msi/msi.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15

--- msi.py	7 Nov 2004 07:08:25 -0000	1.14
+++ msi.py	18 Nov 2004 08:00:33 -0000	1.15
@@ -330,8 +330,10 @@
 add_data(db, "Binary", [("Script", msilib.Binary("inst.vbs"))])
 # See "Custom Action Type 6"
 add_data(db, "CustomAction",
- [("CheckDir", 6, "Script", "CheckDir"),
- ("UpdateEditIDLE", 6, "Script", "UpdateEditIDLE")])
+ [("CheckDir", 6, "Script", "CheckDir")])
+ if have_tcl:
+ add_data(db, "CustomAction",
+ [("UpdateEditIDLE", 6, "Script", "UpdateEditIDLE")])
 os.unlink("inst.vbs")
 
 
@@ -1035,6 +1037,16 @@
 ewi = "Edit with IDLE"
 pat2 = r"Software\Classes\%sPython.%sFile\DefaultIcon"
 pat3 = r"Software\Classes\%sPython.%sFile"
+ tcl_verbs = []
+ if have_tcl:
+ tcl_verbs=[
+ ("py.IDLE", -1, pat % (testprefix, "", ewi), "",
+ r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
+ "REGISTRY.tcl"),
+ ("pyw.IDLE", -1, pat % (testprefix, "NoCon", ewi), "",
+ r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
+ "REGISTRY.tcl"),
+ ]
 add_data(db, "Registry",
 [# Extensions
 ("py.ext", -1, r"Software\Classes\."+ext, "",
@@ -1057,12 +1069,7 @@
 r'"[TARGETDIR]pythonw.exe" "%1" %*', "REGISTRY.def"),
 ("pyc.open", -1, pat % (testprefix, "Compiled", "open"), "",
 r'"[TARGETDIR]python.exe" "%1" %*', "REGISTRY.def"),
- ("py.IDLE", -1, pat % (testprefix, "", ewi), "",
- r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
- "REGISTRY.tcl"),
- ("pyw.IDLE", -1, pat % (testprefix, "NoCon", ewi), "",
- r'"[TARGETDIR]pythonw.exe" "[TARGETDIR]Lib\idlelib\idle.pyw" -n -e "%1"',
- "REGISTRY.tcl"),
+ ] + tcl_verbs + [
 #Icons
 ("py.icon", -1, pat2 % (testprefix, ""), "",
 r'[TARGETDIR]py.ico', "REGISTRY.def"),
