New style

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

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index bc56cf35f85a6498d8d2a0788e40b8f708310d43..8e726a6f06c5101d2004f7baa196802cfd41b37e 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -60,7 +60,7 @@ AppPublisherURL = http://wxPython.org/
 LicenseFile = licence\licence.txt
 CodeFile = %(IFSFILE)s
 
-WizardDebug = yes
+;; WizardDebug = yes
 
 ;;------------------------------------------------------------
 
@@ -78,7 +78,7 @@ Source: "%(SYSDIR)s\MSVCRT.dll";        DestDir: "{code:GetPythonDir}"; CopyMode
 Source: "%(SYSDIR)s\MSVCIRT.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
 Source: "%(SYSDIR)s\MSVCP60.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
 
-Source: "%(WXDIR)s\BIN\wx*%(WXDLLVER)s*.dll";  DestDir: "{app}\wx"; Components: core
+Source: "%(WXDIR)s\BIN\wx*%(WXDLLVER)s_*.dll";  DestDir: "{app}\wx"; Components: core
 %(MSLU)s
 Source: "wx\_core.pyd";                        DestDir: "{app}\wx"; Components: core
 Source: "wx\_gdi.pyd";                         DestDir: "{app}\wx"; Components: core
@@ -109,7 +109,6 @@ Source: "wx\py\*.txt";                         DestDir: "{app}\wx\py"; Component
 Source: "wx\py\*.ico";                         DestDir: "{app}\wx\py"; Components: core
 Source: "wx\py\*.png";                         DestDir: "{app}\wx\py"; Components: core
 Source: "wx\py\tests\*.py";                    DestDir: "{app}\wx\py\tests"; Components: core
-Source: "wx\py\wxd\*.py";                      DestDir: "{app}\wx\py\wxd"; Components: core
 Source: "wx\tools\*.py";                       DestDir: "{app}\wx\tools"; Components: core
 Source: "wx\tools\XRCed\*.txt";                DestDir: "{app}\wx\tools\XRCed"; Components: core
 Source: "wx\tools\XRCed\sawfishrc";            DestDir: "{app}\wx\tools\XRCed"; Components: core
@@ -192,7 +191,7 @@ Source: "scripts\pyshell";                  DestDir: "{code:GetPythonDir}\Script
 Source: "scripts\pycrust";                  DestDir: "{code:GetPythonDir}\Scripts"; Components: core
 Source: "scripts\pywrap";                   DestDir: "{code:GetPythonDir}\Scripts"; Components: core
 Source: "scripts\xrced";                    DestDir: "{code:GetPythonDir}\Scripts"; Components: core
-
+Source: "%(WXDIR)s\BIN\wxrc.exe";           DestDir: "{code:GetPythonDir}\Scripts"; Components: core
 
 Source: "samples\doodle\*.py";              DestDir: "{app}\wx\samples\doodle"; Components: samples
 Source: "samples\doodle\*.txt";             DestDir: "{app}\wx\samples\doodle"; Components: samples
@@ -282,8 +281,6 @@ Type: files; Name: "{app}\wx\py\*.pyc";
 Type: files; Name: "{app}\wx\py\*.pyo";
 Type: files; Name: "{app}\wx\py\tests\*.pyc";
 Type: files; Name: "{app}\wx\py\tests\*.pyo";
-Type: files; Name: "{app}\wx\py\wxd\*.pyc";
-Type: files; Name: "{app}\wx\py\wxd\*.pyo";
 Type: files; Name: "{app}\wx\tools\*.pyc";
 Type: files; Name: "{app}\wx\tools\*.pyo";
 Type: files; Name: "{app}\wx\tools\XRCed\*.pyc";
@@ -433,7 +430,9 @@ def find_DLLs():
     proc.close()
     for line in lines:
         if line.startswith("    wxbase"):
-            WXDLLVER = line[10:14]
+            WXDLLVER = line[10:15]
+            if WXDLLVER.endswith('_'):
+                WXDLLVER = WXDLLVER[:-1]
 
         if line.startswith("    python"):
             PYTHONVER = line[10] + '.' + line[11]