[Python-checkins] python/nondist/sandbox/msi msi.py, 1.32, 1.33 msilib.py, 1.14, 1.15

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/nondist/sandbox/msi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13137

Modified Files:
	msi.py msilib.py 
Log Message:
Add Advanced dialog. Add option to COMPILEALL byte code.

Index: msi.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msi.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** msi.py	17 Aug 2004 13:46:39 -0000	1.32
--- msi.py	17 Aug 2004 15:39:09 -0000	1.33
***************
*** 347,350 ****
--- 347,354 ----
          ("SetDLLDirToTarget", 307, "DLLDIR", "[TARGETDIR]"),
          ("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")
          ])
  
***************
*** 373,380 ****
--- 377,388 ----
               ("SetDLLDirToSystem32", 'DLLDIR="" and ' + sys32cond, 751),
               ("SetDLLDirToTarget", 'DLLDIR="" and not ' + sys32cond, 752),
+              ("CompilePyc", "COMPILEALL", 6800),
+              ("CompilePyo", "COMPILEALL", 6801),
              ])
      add_data(db, "AdminExecuteSequence",
              [("InitialTargetDir", 'TARGETDIR=""', 750),
               ("SetDLLDirToTarget", 'DLLDIR=""', 751),
+              ("CompilePyc", "COMPILEALL", 6800),
+              ("CompilePyo", "COMPILEALL", 6801),
              ])
  
***************
*** 567,570 ****
--- 575,581 ----
      c.event("SpawnDialog", "DiskCostDlg")
  
+     c=features.xbutton("Advanced", "Advanced", None, 0.30)
+     c.event("SpawnDialog", "AdvancedDlg")
+ 
      c=features.text("ItemDescription", 140, 180, 210, 30, 3,
                    "Multiline description of the currently selected item.")
***************
*** 623,626 ****
--- 634,652 ----
                          
      #####################################################################
+     # Advanced Dialog.
+     advanced = PyDialog(db, "AdvancedDlg", x, y, w, h, modal, title,
+                         "CompilePyc", "Next", "Cancel")
+     advanced.title("Advanced Options for [ProductName]")
+     # A radio group with two options: allusers, justme
+     advanced.checkbox("CompilePyc", 135, 60, 230, 50, 3,
+                       "COMPILEALL", "Compile .py files to byte code after installation", "Next")
+ 
+     c = advanced.next("Finish", "Cancel")
+     c.event("EndDialog", "Return")
+ 
+     c = advanced.cancel("Cancel", "CompilePyc")
+     c.event("SpawnDialog", "CancelDlg")
+                         
+     #####################################################################
      # Existing Directory dialog 
      dlg = Dialog(db, "ExistingDirectoryDlg", 50, 30, 200, 80, modal, title,

Index: msilib.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/msi/msilib.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** msilib.py	17 Aug 2004 13:46:39 -0000	1.14
--- msilib.py	17 Aug 2004 15:39:09 -0000	1.15
***************
*** 637,638 ****
--- 637,641 ----
                     x, y, w, h, attr, prop, text, next, None)])
          return RadioButtonGroup(self, name, prop)
+ 
+     def checkbox(self, name, x, y, w, h, attr, prop, text, next):
+         return self.control(name, "CheckBox", x, y, w, h, attr, prop, text, next, None)
\ No newline at end of file