X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d1679124ae303fb78561ee2b0c56b5831fd0fafe..77436c4cbac2269e564dc4fcf4494a58feca0af4:/wxPython/distrib/make_installer.py?ds=sidebyside

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index a9894a26dd..78cba8bd89 100644
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -18,7 +18,7 @@ ISS_Template = r'''
 
 [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
 DefaultDirName = {code:GetPythonDir|c:\DoNotInstallHere}
@@ -38,6 +38,8 @@ DisableReadyPage = true
 ;;DisableDirPage = true
 DisableProgramGroupPage = true
 DisableAppendDir = true
+UsePreviousAppDir = no
+UsePreviousGroup = no
 
 UninstallFilesDir = {app}\wxPython
 AppPublisherURL = http://wxPython.org/
@@ -74,11 +76,13 @@ Source: "wxPython\calendarc.pyd";           DestDir: "{app}\wxPython"; Component
 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\*.py";                    DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\lib\*.py";                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\mixins\*.py";         DestDir: "{app}\wxPython\lib\mixins"; Components: core
 
 Source: "demo\*.py";                        DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.xml";                       DestDir: "{app}\wxPython\demo"; Components: demo
@@ -98,6 +102,9 @@ Source: "demo\data\*.bmp";                  DestDir: "{app}\wxPython\demo\data";
 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\*.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: "README.txt";                       DestDir: "{app}\wxPython\docs";  Flags: isreadme; Components: core
 Source: "CHANGES.txt";                      DestDir: "{app}\wxPython\docs"; Components: core
@@ -143,6 +150,8 @@ 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\mixins\*.pyc";
+Type: files; Name: "{app}\wxPython\lib\mixins\*.pyo";
 Type: files; Name: "{app}\wxPython\demo\*.pyc";
 Type: files; Name: "{app}\wxPython\demo\*.pyo";
 Type: files; Name: "{app}\wxPython\demo\data\showTips";
@@ -172,9 +181,16 @@ 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;
+
+        if not RegQueryStringValue(HKEY_CURRENT_USER,
+                                   '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;
     end else
         Result := true;
 end;