]> git.saurik.com Git - wxWidgets.git/blobdiff - wxPython/distrib/make_installer.py
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
corrected assert even better
[wxWidgets.git] / wxPython / distrib / make_installer.py
diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index eee5c572099d4d97b9adfee49ecf147b26cf6e49..71c7faaddf1ecb75695fe6f285b4b4c0090cf771 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -1,5 +1,4 @@
 """
 """
-
 This script will generate a setup script for InnoSetup and then run it
 to make the installer executable.  If all goes right the proper versions
 of Python and wxWindows (including hybrid/final settings) will all be
 This script will generate a setup script for InnoSetup and then run it
 to make the installer executable.  If all goes right the proper versions
 of Python and wxWindows (including hybrid/final settings) will all be
@@ -8,11 +7,10 @@ will be created.
 """
 
 
 """
 
 
-import os, string
-
-#----------------------------------------------------------------------
+import sys, os, string
 
 KEEP_TEMPS = 0
 
 KEEP_TEMPS = 0
+ISCC = r"C:\TOOLS\InnoSetup2Ex\ISCC.exe %s"
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------
 
@@ -21,10 +19,10 @@ ISS_Template = r'''
 
 [Setup]
 AppName = wxPython
 
 [Setup]
 AppName = wxPython
-AppVerName = wxPython %(VERSION)s
+AppVerName = wxPython %(VERSION)s for Python %(PYTHONVER)s
 OutputBaseFilename = wxPython-%(VERSION)s-%(PYVER)s
 AppCopyright = Copyright © 2001 Total Control Software
 OutputBaseFilename = wxPython-%(VERSION)s-%(PYVER)s
 AppCopyright = Copyright © 2001 Total Control Software
-DefaultDirName = {code:GetPythonDir|c:\DoNotInstallHere}
+DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere}
 DefaultGroupName = wxPython %(SHORTVER)s for Python %(PYTHONVER)s
 AlwaysCreateUninstallIcon = yes
 
 DefaultGroupName = wxPython %(SHORTVER)s for Python %(PYTHONVER)s
 AlwaysCreateUninstallIcon = yes
 
@@ -41,6 +39,8 @@ DisableReadyPage = true
 ;;DisableDirPage = true
 DisableProgramGroupPage = true
 DisableAppendDir = true
 ;;DisableDirPage = true
 DisableProgramGroupPage = true
 DisableAppendDir = true
+UsePreviousAppDir = no
+UsePreviousGroup = no
 
 UninstallFilesDir = {app}\wxPython
 AppPublisherURL = http://wxPython.org/
 
 UninstallFilesDir = {app}\wxPython
 AppPublisherURL = http://wxPython.org/
@@ -65,27 +65,39 @@ Name: tools;   Description: "Tools";                         Types: full
 ;;------------------------------------------------------------
 
 [Files]
 ;;------------------------------------------------------------
 
 [Files]
-Source: "%(SYSDIR)s\MSVCRT.dll";            DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall; Components: core
-Source: "%(SYSDIR)s\MSVCIRT.dll";           DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall; Components: core
+Source: "%(SYSDIR)s\MSVCRT.dll";            DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Components: core
+Source: "%(SYSDIR)s\MSVCIRT.dll";           DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Components: core
 
 Source: "%(WXDIR)s\lib\%(WXDLL)s";          DestDir: "{app}\wxPython"; Components: core
 
 Source: "%(WXDIR)s\lib\%(WXDLL)s";          DestDir: "{app}\wxPython"; Components: core
+%(MSLU)s
 Source: "wxPython\wxc.pyd";                 DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\wxc.pyd";                 DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\wxc.pyd.manifest";        DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\gridc.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\gridc.pyd";               DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\helpc.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\htmlc.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\htmlc.pyd";               DestDir: "{app}\wxPython"; Components: core
-Source: "wxPython\utilsc.pyd";              DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\calendarc.pyd";           DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\glcanvasc.pyd";           DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\oglc.pyd";                DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\stc_c.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\calendarc.pyd";           DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\glcanvasc.pyd";           DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\oglc.pyd";                DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\stc_c.pyd";               DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\xrcc.pyd";                DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\gizmosc.pyd";             DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\dllwidget_c.pyd";         DestDir: "{app}\wxPython"; Components: core
 
 Source: "wxPython\*.py";                    DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\lib\*.py";                DestDir: "{app}\wxPython\lib"; Components: core
 
 Source: "wxPython\*.py";                    DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\lib\*.py";                DestDir: "{app}\wxPython\lib"; Components: core
+Source: "wxPython\lib\*.wdr";               DestDir: "{app}\wxPython\lib"; Components: core
 Source: "wxPython\lib\editor\*.py";         DestDir: "{app}\wxPython\lib\editor"; Components: core
 Source: "wxPython\lib\editor\*.txt";        DestDir: "{app}\wxPython\lib\editor"; Components: core
 Source: "wxPython\lib\editor\*.py";         DestDir: "{app}\wxPython\lib\editor"; Components: core
 Source: "wxPython\lib\editor\*.txt";        DestDir: "{app}\wxPython\lib\editor"; Components: core
+Source: "wxPython\lib\mixins\*.py";         DestDir: "{app}\wxPython\lib\mixins"; Components: core
+Source: "wxPython\lib\PyCrust\*.py";        DestDir: "{app}\wxPython\lib\PyCrust"; Components: core
+Source: "wxPython\lib\PyCrust\*.txt";       DestDir: "{app}\wxPython\lib\PyCrust"; Components: core
+Source: "wxPython\lib\PyCrust\*.ico";       DestDir: "{app}\wxPython\lib\PyCrust"; Components: core
 
 Source: "demo\*.py";                        DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.xml";                       DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.txt";                       DestDir: "{app}\wxPython\demo"; Components: demo
 
 Source: "demo\*.py";                        DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.xml";                       DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.txt";                       DestDir: "{app}\wxPython\demo"; Components: demo
+Source: "demo\*.ico";                       DestDir: "{app}\wxPython\demo"; Components: demo
+Source: "demo\*.wdr";                       DestDir: "{app}\wxPython\demo"; Components: demo
 
 Source: "demo\bitmaps\*.gif";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 Source: "demo\bitmaps\*.bmp";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 
 Source: "demo\bitmaps\*.gif";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 Source: "demo\bitmaps\*.bmp";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
@@ -93,14 +105,29 @@ Source: "demo\bitmaps\*.jpg";               DestDir: "{app}\wxPython\demo\bitmap
 Source: "demo\bitmaps\*.png";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 Source: "demo\bitmaps\*.ico";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 
 Source: "demo\bitmaps\*.png";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 Source: "demo\bitmaps\*.ico";               DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo
 
+Source: "demo\bmp_source\*.gif";               DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo
+Source: "demo\bmp_source\*.bmp";               DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo
+;;Source: "demo\bmp_source\*.jpg";               DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo
+Source: "demo\bmp_source\*.png";               DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo
+Source: "demo\bmp_source\*.ico";               DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo
+
 Source: "demo\data\*.htm";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.html";                 DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.py";                   DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.png";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.bmp";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.i";                    DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.htm";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.html";                 DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.py";                   DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.png";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.bmp";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.i";                    DestDir: "{app}\wxPython\demo\data"; Components: demo
-Source: "demo\data\*.h";                    DestDir: "{app}\wxPython\demo\data"; Components: demo
+;;Source: "demo\data\*.h";                    DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.txt";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
 Source: "demo\data\*.txt";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
+Source: "demo\data\*.wav";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
+Source: "demo\data\*.wdr";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
+Source: "demo\data\*.xrc";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
+Source: "demo\data\*.gif";                  DestDir: "{app}\wxPython\demo\data"; Components: demo
+
+Source: "demo\dllwidget\*.cpp";             DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo
+Source: "demo\dllwidget\*.py";              DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo
+Source: "demo\dllwidget\Makefile";          DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo
+Source: "demo\dllwidget\makefile.*";        DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo
 
 Source: "README.txt";                       DestDir: "{app}\wxPython\docs";  Flags: isreadme; Components: core
 Source: "CHANGES.txt";                      DestDir: "{app}\wxPython\docs"; Components: core
 
 Source: "README.txt";                       DestDir: "{app}\wxPython\docs";  Flags: isreadme; Components: core
 Source: "CHANGES.txt";                      DestDir: "{app}\wxPython\docs"; Components: core
@@ -109,11 +136,19 @@ Source: "%(WXDIR)s\docs\htmlhelp\wx.chm";   DestDir: "{app}\wxPython\docs"; Comp
 Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm";  DestDir: "{app}\wxPython\docs"; Components: docs
 
 Source: "tools\*.py";                       DestDir: "{app}\wxPython\tools"; Components: tools
 Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm";  DestDir: "{app}\wxPython\docs"; Components: docs
 
 Source: "tools\*.py";                       DestDir: "{app}\wxPython\tools"; Components: tools
+Source: "tools\XRCed\CHANGES";              DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
+Source: "tools\XRCed\TODO";                 DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
+Source: "tools\XRCed\README";               DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
+Source: "tools\XRCed\*.py";                 DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
+Source: "tools\XRCed\*.xrc";                DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
+Source: "tools\XRCed\*.ico";                DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
+Source: "tools\XRCed\*.sh";                 DestDir: "{app}\wxPython\tools\XRCed"; Components: tools
 
 Source: "samples\doodle\*.py";              DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\*.txt";             DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\sample.ddl";        DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\superdoodle.iss";   DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 
 Source: "samples\doodle\*.py";              DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\*.txt";             DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\sample.ddl";        DestDir: "{app}\wxPython\samples\doodle"; Components: samples
 Source: "samples\doodle\superdoodle.iss";   DestDir: "{app}\wxPython\samples\doodle"; Components: samples
+
 Source: "samples\wxProject\*.txt";          DestDir: "{app}\wxPython\samples\wxProject"; Components: samples
 Source: "samples\wxProject\*.py";           DestDir: "{app}\wxPython\samples\wxProject"; Components: samples
 
 Source: "samples\wxProject\*.txt";          DestDir: "{app}\wxPython\samples\wxProject"; Components: samples
 Source: "samples\wxProject\*.py";           DestDir: "{app}\wxPython\samples\wxProject"; Components: samples
 
@@ -121,20 +156,29 @@ Source: "samples\stxview\*.py";                  DestDir: "{app}\wxPython\sample
 Source: "samples\stxview\*.stx";                 DestDir: "{app}\wxPython\samples\stxview"; Components: samples
 Source: "samples\stxview\*.txt";                 DestDir: "{app}\wxPython\samples\stxview"; Components: samples
 Source: "samples\stxview\StructuredText\*.py";   DestDir: "{app}\wxPython\samples\stxview\StructuredText"; Components: samples
 Source: "samples\stxview\*.stx";                 DestDir: "{app}\wxPython\samples\stxview"; Components: samples
 Source: "samples\stxview\*.txt";                 DestDir: "{app}\wxPython\samples\stxview"; Components: samples
 Source: "samples\stxview\StructuredText\*.py";   DestDir: "{app}\wxPython\samples\stxview\StructuredText"; Components: samples
+Source: "samples\stxview\StructuredText\*.txt";   DestDir: "{app}\wxPython\samples\stxview\StructuredText"; Components: samples
+
+Source: "samples\StyleEditor\*.txt";           DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples
+Source: "samples\StyleEditor\*.py";            DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples
+Source: "samples\StyleEditor\*.cfg";           DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples
+
+Source: "samples\pySketch\*.py";           DestDir: "{app}\wxPython\samples\pySketch"; Components: samples
+Source: "samples\pySketch\images\*.bmp";   DestDir: "{app}\wxPython\samples\pySketch\images"; Components: samples
 
 
+Source: "samples\frogedit\*.py";           DestDir: "{app}\wxPython\samples\frogedit"; Components: samples
 
 ;;------------------------------------------------------------
 
 [Icons]
 
 ;;------------------------------------------------------------
 
 [Icons]
-Name: "{group}\Run the DEMO";          Filename: "{code:GetPythonDir}\pythonw.exe";         WorkingDir: "{app}\wxPython\demo";      Parameters: "demo.py";
-Name: "{group}\wxWindows Referece";    Filename: "{app}\wxPython\docs\wx.chm";
-Name: "{group}\wxOGL Referece";        Filename: "{app}\wxPython\docs\ogl.chm";
-Name: "{group}\licence.txt";           Filename: "{app}\wxPython\docs\licence\licence.txt";
-Name: "{group}\README.txt";            Filename: "{app}\wxPython\docs\README.txt";
-Name: "{group}\CHANGES.txt";           Filename: "{app}\wxPython\docs\CHANGES.txt";
+Name: "{group}\Run the DEMO";          Filename: "{code:GetPythonDir}\pythonw.exe";   WorkingDir: "{app}\wxPython\demo";   Parameters: "demo.py"; IconFilename: "{app}\wxPython\demo\wxpdemo.ico"; Components: core
+Name: "{group}\PyCrust";               Filename: "{code:GetPythonDir}\pythonw.exe";   WorkingDir: "c:\";                   Parameters: "{app}\wxPython\lib\PyCrust\PyCrustApp.py";  IconFilename: "{app}\wxPython\lib\PyCrust\PyCrust.ico"; Components: core
+Name: "{group}\wxWindows Reference";   Filename: "{app}\wxPython\docs\wx.chm";                Components: docs
+Name: "{group}\wxOGL Reference";       Filename: "{app}\wxPython\docs\ogl.chm";               Components: docs
+Name: "{group}\licence.txt";           Filename: "{app}\wxPython\docs\licence\licence.txt";   Components: core
+Name: "{group}\README.txt";            Filename: "{app}\wxPython\docs\README.txt";            Components: core
+Name: "{group}\CHANGES.txt";           Filename: "{app}\wxPython\docs\CHANGES.txt";           Components: core
 Name: "{group}\Sample Apps";           Filename: "{app}\wxPython\samples"; Components: samples
 Name: "{group}\Sample Apps";           Filename: "{app}\wxPython\samples"; Components: samples
-
-;;Name: "{group}\Uninstall wxPython";    Filename: "{app}\wxPython\unins000.exe";            WorkingDir: "{app}\wxPython";
+Name: "{group}\Resource Editor";       Filename: "{code:GetPythonDir}\pythonw.exe";   WorkingDir: "c:\";   Parameters: "{app}\wxPython\Tools\XRCed\xrced.py"; IconFilename: "{app}\wxPython\Tools\XRCed\xrced.ico"; Components: tools
 
 
 ;;------------------------------------------------------------
 
 
 ;;------------------------------------------------------------
@@ -146,40 +190,60 @@ Type: files; Name: "{app}\wxPython\lib\*.pyc";
 Type: files; Name: "{app}\wxPython\lib\*.pyo";
 Type: files; Name: "{app}\wxPython\lib\editor\*.pyc";
 Type: files; Name: "{app}\wxPython\lib\editor\*.pyo";
 Type: files; Name: "{app}\wxPython\lib\*.pyo";
 Type: files; Name: "{app}\wxPython\lib\editor\*.pyc";
 Type: files; Name: "{app}\wxPython\lib\editor\*.pyo";
+Type: files; Name: "{app}\wxPython\lib\mixins\*.pyc";
+Type: files; Name: "{app}\wxPython\lib\mixins\*.pyo";
+Type: files; Name: "{app}\wxPython\lib\PyCrust\*.pyc";
+Type: files; Name: "{app}\wxPython\lib\PyCrust\*.pyo";
 Type: files; Name: "{app}\wxPython\demo\*.pyc";
 Type: files; Name: "{app}\wxPython\demo\*.pyo";
 Type: files; Name: "{app}\wxPython\demo\data\showTips";
 Type: files; Name: "{app}\wxPython\tools\*.pyc";
 Type: files; Name: "{app}\wxPython\tools\*.pyo";
 Type: files; Name: "{app}\wxPython\demo\*.pyc";
 Type: files; Name: "{app}\wxPython\demo\*.pyo";
 Type: files; Name: "{app}\wxPython\demo\data\showTips";
 Type: files; Name: "{app}\wxPython\tools\*.pyc";
 Type: files; Name: "{app}\wxPython\tools\*.pyo";
+Type: files; Name: "{app}\wxPython\tools\XRCed\*.pyc";
+Type: files; Name: "{app}\wxPython\tools\XRCed\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\doodle\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\doodle\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\doodle\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\doodle\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyo";
+Type: files; Name: "{app}\wxPython\samples\StyleEditor\*.pyc";
+Type: files; Name: "{app}\wxPython\samples\StyleEditor\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\stxview\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\stxview\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\stxview\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\stxview\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyo";
+Type: files; Name: "{app}\wxPython\samples\frogedit\*.pyc";
+Type: files; Name: "{app}\wxPython\samples\frogedit\*.pyo";
 
 '''
 
 
 #----------------------------------------------------------------------
 
 
 '''
 
 
 #----------------------------------------------------------------------
 
+
 IFS_Template = r"""
 program Setup;
 var
     PythonDir : String;
 IFS_Template = r"""
 program Setup;
 var
     PythonDir : String;
+    InstallDir : String;
 
 function InitializeSetup(): Boolean;
 begin
     if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
                                'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath',
                                '', PythonDir) then begin
 
 function InitializeSetup(): Boolean;
 begin
     if not RegQueryStringValue(HKEY_LOCAL_MACHINE,
                                'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath',
                                '', PythonDir) then begin
-        MsgBox('No installation of Python %(PYTHONVER)s found.  Aborting...',
-               mbConfirmation, MB_OK);
-        Result := false;
-    end else
-        Result := true;
+
+        if not RegQueryStringValue(HKEY_CURRENT_USER,
+                                   'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath',
+                                   '', PythonDir) then begin
+
+            MsgBox('No installation of Python %(PYTHONVER)s found in registry.\nBe sure to enter a pathname that places wxPython\non the PYTHONPATH',
+                   mbConfirmation, MB_OK);
+            PythonDir := 'C:\Put a directory on PYTHONPATH here\';
+        end;
+    end;
+    InstallDir := PythonDir;
+    %(IF22)s
+    Result := true;
 end;
 
 
 end;
 
 
@@ -188,6 +252,11 @@ begin
     Result := PythonDir;
 end;
 
     Result := PythonDir;
 end;
 
+function GetInstallDir(Default: String): String;
+begin
+    Result := InstallDir;
+end;
+
 begin
 end.
 
 begin
 end.
 
@@ -233,10 +302,18 @@ def main():
     ISSFILE    = "__wxPython.iss"
     IFSFILE    = "__wxPython.ifs"
 
     ISSFILE    = "__wxPython.iss"
     IFSFILE    = "__wxPython.ifs"
 
+    if PYTHONVER >= "2.2":
+        IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';"
+    else:
+        IF22 = ""
 
     if string.find(WXDLL, "h") != -1:
         PYVER = PYVER + "-hybrid"
 
 
     if string.find(WXDLL, "h") != -1:
         PYVER = PYVER + "-hybrid"
 
+    MSLU=''
+    if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1":
+        MSLU=r'Source: "%(WXDIR)s\lib\unicows.dll";  DestDir: "{code:GetPythonDir}"; Components: core' % vars()
+
     f = open(ISSFILE, "w")
     f.write(ISS_Template % vars())
     f.close()
     f = open(ISSFILE, "w")
     f.write(ISS_Template % vars())
     f.close()
@@ -245,7 +322,7 @@ def main():
     f.write(IFS_Template % vars())
     f.close()
 
     f.write(IFS_Template % vars())
     f.close()
 
-    os.system(r"C:\TOOLS\InnoSetup2Ex\ISCC.exe %s" % ISSFILE)
+    os.system(ISCC % ISSFILE)
 
     if not KEEP_TEMPS:
         os.remove(ISSFILE)
 
     if not KEEP_TEMPS:
         os.remove(ISSFILE)
wxWidgets (Impactor)