X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f58a6c817e7ae62f6cbd60c85decbba5775ebbea..64c1effefabacc175cf601ea4118f3b806a1fd65:/wxPython/distrib/make_installer_inno4.py?ds=sidebyside

diff --git a/wxPython/distrib/make_installer_inno4.py b/wxPython/distrib/make_installer_inno4.py
index 2b9cc7b2c4..dcc7f0378b 100755
--- 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"]
 
 
 #----------------------------------------------------------------------
@@ -112,6 +106,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
@@ -195,6 +191,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";
@@ -403,7 +403,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"; 
@@ -627,9 +627,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)
@@ -669,18 +668,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 +681,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)