fix format mismatch warnings

[wxWidgets.git] / wxPython / distrib / make_installer_inno4.py

diff --git a/wxPython/distrib/make_installer_inno4.py b/wxPython/distrib/make_installer_inno4.py
index 2b9cc7b2c4349c2592d887f2353b558dae666da0..58987ee9aa58cedb3209d833332edbd5ac8e7d85 100755 (executable)
--- a/wxPython/distrib/make_installer_inno4.py
+++ b/wxPython/distrib/make_installer_inno4.py
@@ -23,17 +23,11 @@ will be created.
 import sys, os, time
 
 KEEP_TEMPS = 1
-ISCC = r"%s\InnoSetup2Ex\ISCC.exe %s"
+# default InnoSetup installer location
+ISCC = r"C:\progra~1\innose~1\ISCC.exe %s"
 
-# see if we can find Inno Setup 4 and use that if so
-USING_INNO4=False
-try:
-    import _winreg as wreg
-    key = wreg.OpenKey(wreg.HKEY_CURRENT_USER, "Software\Bjornar Henden\ISTool4\Prefs")
-    INNO_FOLDER = wreg.QueryValueEx(key,'InnoFolder')[0] 
-    USING_INNO4=True
-except:
-    pass               
+if os.environ.has_key("INNO4"):
+    ISCC = os.environ["INNO4"]
 
 
 #----------------------------------------------------------------------
@@ -44,7 +38,7 @@ ISS_Template = r'''
 AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s
 AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
 OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s
-AppCopyright = Copyright © 2004 Total Control Software
+AppCopyright = Copyright © 2006 Total Control Software
 DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere}
 DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s
 AdminPrivilegesRequired = no
@@ -105,6 +99,8 @@ Source: "wx\_webkit.pyd";                      DestDir: "{app}\%(PKGDIR)s\wx"; C
 Source: "wx\_windows_.pyd";                    DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\_wizard.pyd";                      DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\_xrc.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
+Source: "wx\_aui.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
+Source: "wx\_richtext.pyd";                    DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 ;;Source: "wx\_iewin.pyd";                       DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 ;;Source: "wx\_ogl.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 
@@ -112,6 +108,8 @@ Source: "wx\_xrc.pyd";                         DestDir: "{app}\%(PKGDIR)s\wx"; C
 Source: "wx\*.py";                             DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
 Source: "wx\build\*.py";                       DestDir: "{app}\%(PKGDIR)s\wx\build"; Components: core
 Source: "wx\lib\*.py";                         DestDir: "{app}\%(PKGDIR)s\wx\lib"; Components: core
+Source: "wx\lib\analogclock\*.py";             DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock"; Components: core
+Source: "wx\lib\analogclock\lib_setup\*.py";   DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup"; Components: core
 Source: "wx\lib\colourchooser\*.py";           DestDir: "{app}\%(PKGDIR)s\wx\lib\colourchooser"; Components: core
 Source: "wx\lib\editor\*.py";                  DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
 Source: "wx\lib\editor\*.txt";                 DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core
@@ -146,6 +144,7 @@ Source: "wxPython\tools\*.py";                    DestDir: "{app}\%(PKGDIR)s\wxP
 Source: "src\winxp.manifest";               DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest";   Flags: sharedfile; Components:  manifest
 Source: "src\winxp.manifest";               DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest";  Flags: sharedfile; Components: manifest
 Source: "wxversion\wxversion.py";           DestDir: "{app}";  Flags: sharedfile;  Components: core
+Source: "wxaddons\*.py";                    DestDir: "{app}\wxaddons";  Flags: sharedfile;  Components: core
 Source: "src\wx.pth";                       DestDir: "{app}";  Flags: sharedfile;  Components: pthfile
 
 %(LOCALE)s
@@ -195,6 +194,10 @@ Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyo";
+Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyc";
+Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyo";
+Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyc";
+Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyc";
@@ -231,6 +234,12 @@ Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\mixins\*.pyo";
 Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyc";
 Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyo";
 
+Type: files; Name: "{app}\wxversion.pyc";
+Type: files; Name: "{app}\wxversion.pyo";
+
+Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyc";
+Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyo";
+
 %(UNINSTALL_BATCH)s
 
 '''
@@ -331,7 +340,7 @@ ISS_DocDemo_Template = r'''
 AppName = wxPython%(SHORTVER)s-docs-demos
 AppVerName = wxPython Docs and Demos %(VERSION)s
 OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s
-AppCopyright = Copyright © 2004 Total Control Software
+AppCopyright = Copyright © 2006 Total Control Software
 DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos
 DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools
 ;AlwaysCreateUninstallIcon = yes
@@ -403,7 +412,7 @@ Source: "demo\data\*.mpg";                  DestDir: "{app}\demo\data";
 ;;Source: "demo\dllwidget\makefile.*";        DestDir: "{app}\demo\dllwidget"; 
 
 Source: "licence\*.txt";                    DestDir: "{app}\docs\licence"; 
-Source: "%(WXDIR)s\docs\htmlhelp\wx.chm";   DestDir: "{app}\docs"; 
+;;Source: "%(WXDIR)s\docs\htmlhelp\wx.chm";   DestDir: "{app}\docs"; 
 ;;Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm";  DestDir: "{app}\docs"; 
 Source: "docs\README.txt";                  DestDir: "{app}\docs";  Flags: isreadme; 
 Source: "docs\*.txt";                       DestDir: "{app}\docs"; 
@@ -429,6 +438,7 @@ Source: "samples\ide\activegrid\*.py";            DestDir: "{app}\samples\ide\ac
 Source: "samples\ide\activegrid\tool\*.py";       DestDir: "{app}\samples\ide\activegrid\tool"; 
 Source: "samples\ide\activegrid\tool\data\*.txt"; DestDir: "{app}\samples\ide\activegrid\tool\data"; 
 Source: "samples\ide\activegrid\util\*.py";       DestDir: "{app}\samples\ide\activegrid\util"; 
+Source: "samples\ide\activegrid\model\*.py";      DestDir: "{app}\samples\ide\activegrid\model";
 
 Source: "samples\embedded\*.py";            DestDir: "{app}\samples\embedded"; 
 Source: "samples\embedded\*.cpp";           DestDir: "{app}\samples\embedded"; 
@@ -528,10 +538,12 @@ Type: files; Name: "{app}\samples\ide\*.pyc";
 Type: files; Name: "{app}\samples\ide\activegrid\*.pyc";
 Type: files; Name: "{app}\samples\ide\activegrid\tool\*.pyc";
 Type: files; Name: "{app}\samples\ide\activegrid\util\*.pyc";
+Type: files; Name: "{app}\samples\ide\activegrid\model\*.pyc";
 Type: files; Name: "{app}\samples\ide\*.pyo";
 Type: files; Name: "{app}\samples\ide\activegrid\*.pyo";
 Type: files; Name: "{app}\samples\ide\activegrid\tool\*.pyo";
 Type: files; Name: "{app}\samples\ide\activegrid\util\*.pyo";
+Type: files; Name: "{app}\samples\ide\activegrid\model\*.pyo";
 
 Type: files; Name: "{app}\samples\docview\*.pyc";
 Type: files; Name: "{app}\samples\pydocview\*.pyc";
@@ -597,7 +609,7 @@ def get_batch_files():
 runtime_template = 'Source: "%s"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core'
 
 def get_runtime_dlls(PYVER):
-    if PYVER == "py24":
+    if PYVER >= "py24":
         source = [ r"distrib\msw\msvcr71.dll",
                    r"distrib\msw\msvcp71.dll" ]
     else:
@@ -627,9 +639,8 @@ def main():
     ISSFILE         = "__wxPython.iss"
     ISSDEMOFILE     = "__wxPythonDemo.iss"
     IFSFILE         = "__wxPython.ifs"
-    IFSFILEREF         = "CodeFile = " + IFSFILE
-    if USING_INNO4:
-        IFSFILEREF = ""
+    IFSFILEREF      = "CodeFile = " + IFSFILE
+    IFSFILEREF = ""
     UNINSTALL_BATCH = get_batch_files()
     PKGDIR          = open('src/wx.pth').read()
     LOCALE          = build_locale_string(PKGDIR)
@@ -647,9 +658,7 @@ def main():
     SYSDIR     = %(SYSDIR)s
     """ % vars()
 
-    if PYTHONVER >= "2.4":
-        IF22 = r"InstallDir := InstallDir + 'Lib\site-packages';"
-    elif PYTHONVER >= "2.2":
+    if PYTHONVER >= "2.2":
         IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';"
     else:
         IF22 = ""
@@ -669,18 +678,12 @@ def main():
     global IFS_Template
     global ISS_DocDemo_Template
 
-    if USING_INNO4:
-        ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
+    ISS_Template = ISS_Template + "\n[Code]\n" + IFS_Template
 
     f = open(ISSFILE, "w")
     f.write(ISS_Template % vars())
     f.close()
 
-    if not USING_INNO4:
-        f = open(IFSFILE, "w")
-        f.write(IFS_Template % vars())
-        f.close()
-
     f = open(ISSDEMOFILE, "w")
     f.write(ISS_DocDemo_Template % vars())
     f.close()
@@ -688,16 +691,9 @@ def main():
     TOOLS = os.environ['TOOLS']
     if TOOLS.startswith('/cygdrive'):
         TOOLS = r"c:\TOOLS"  # temporary hack until I convert everything over to bash
-    if USING_INNO4:
-        print "Hello world!"
-        ISCC = os.path.join(INNO_FOLDER, "iscc.exe")
-        ISCC = r'"' + ISCC + '" %s'
-        os.system(ISCC % (ISSFILE))
-        #os.system(ISCC % (ISSDEMOFILE))
-    else:
-        print "not found..."
-        os.system(ISCC % (TOOLS, ISSFILE))
-        os.system(ISCC % (TOOLS, ISSDEMOFILE))
+        
+    os.system(ISCC % (ISSFILE))
+    os.system(ISCC % (ISSDEMOFILE))
     
     if not KEEP_TEMPS:
         time.sleep(1)