In GetPath(), don't append separator if there's already one at the end

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

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index ed7c301c0044776b3da6064f9456614763004f0d..71c7faaddf1ecb75695fe6f285b4b4c0090cf771 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -7,9 +7,10 @@ will be created.
 """
 
 
-import os, string
+import sys, os, string
 
 KEEP_TEMPS = 0
+ISCC = r"C:\TOOLS\InnoSetup2Ex\ISCC.exe %s"
 
 #----------------------------------------------------------------------
 
@@ -68,12 +69,12 @@ Source: "%(SYSDIR)s\MSVCRT.dll";            DestDir: "{sys}"; CopyMode: alwayssk
 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
+%(MSLU)s
 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\helpc.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
@@ -84,6 +85,7 @@ Source: "wxPython\dllwidget_c.pyd";         DestDir: "{app}\wxPython"; Component
 
 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\mixins\*.py";         DestDir: "{app}\wxPython\lib\mixins"; Components: core
@@ -95,6 +97,7 @@ Source: "demo\*.py";                        DestDir: "{app}\wxPython\demo"; Comp
 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
@@ -119,6 +122,7 @@ Source: "demo\data\*.txt";                  DestDir: "{app}\wxPython\demo\data";
 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
@@ -138,6 +142,7 @@ Source: "tools\XRCed\README";               DestDir: "{app}\wxPython\tools\XRCed
 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
@@ -305,6 +310,10 @@ def main():
     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()
@@ -313,7 +322,7 @@ def main():
     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)