Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

wxPython/scripts/CreateBatchFiles.py

@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------
 # Name:         CreateBatchFiles.py
-# Purpose:	Run by the InnoSetup installer to create a DOS batch
+# Purpose:      Run by the InnoSetup installer to create a DOS batch
 #               file for each of the wxPython tool scripts.
 #
 # Author:       Robin Dunn
@@ -22,6 +22,8 @@ scripts = [ ("img2png", 0),
             ("xrced",   1),
             ("pyshell", 1),
             ("pycrust", 1),
+            ("pycwrap", 1),
+            ("helpviewer", 1),
             ]
 
 template = """\

wxPython/scripts/CreateMacScripts.py

@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------
 # Name:         CreateMacScripts.py
-# Purpose:	Massages the scripts to be usable with MachoPython
+# Purpose:      Massages the scripts to be usable with MachoPython
 #
 # Author:       Robin Dunn
 #
@@ -13,23 +13,30 @@ import sys, os
 
 python = sys.executable
 destdir = os.path.split(python)[0]
+prefix = destdir
 pythonw = os.path.join(destdir, 'pythonw')
 scriptdir = os.getcwd()
 
 if len(sys.argv) > 1:
-    destdir = sys.argv[1]
+    root = sys.argv[1]
+    p = prefix = sys.argv[2]
+    if p[0] == '/': p = p[1:]
+    destdir = os.path.join(root, p)
+
 
 from CreateBatchFiles import scripts
 repltxt = "#!/usr/bin/env python"
 
-gui_template = """\
-#!/bin/sh
-exec /Applications/Python.app/Contents/MacOS/python %s.py
-"""
+
+# use the existing pythonw as a template
+gui_template = open(pythonw, "r").read().replace('"$@"', '"%s.py" "$@"')
+
 
 def main():
     for script, usegui in scripts:
         destfile = os.path.join(destdir, script)
+        prefixfile = os.path.join(prefix, script)
+
         thescript = open(script).read()
         if usegui:
             f = open(destfile+'.py', 'w')
@@ -38,7 +45,7 @@ def main():
             f.close()
             f = open(destfile, 'w')
             print destfile
-            f.write(gui_template % destfile)
+            f.write(gui_template % prefixfile)
             f.close()
 
         else:

wxPython/scripts/helpviewer

@@ -0,0 +1,4 @@
+#!/usr/bin/env python
+
+from wxPython.tools.helpviewer import main
+main()

wxPython/scripts/helpviewer.bat

@@ -0,0 +1,3 @@
+@echo off
+
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\helpviewer %1 %2 %3 %4 %5 %6 %7 %8 %9

wxPython/scripts/img2png.bat

@@ -1,3 +1,3 @@
 @echo off
 
-C:\TOOLS\PYTHON22\PYTHON.EXE C:\projects\wx\wxPython\scripts\img2png %1 %2 %3 %4 %5 %6 %7 %8 %9
+e:\tools\Python22\python.exe e:\PROJECTS\wx\wxPython\scripts\img2png %1 %2 %3 %4 %5 %6 %7 %8 %9

wxPython/scripts/img2py.bat

@@ -1,3 +1,3 @@
 @echo off
 
-C:\TOOLS\PYTHON22\PYTHON.EXE C:\projects\wx\wxPython\scripts\img2py %1 %2 %3 %4 %5 %6 %7 %8 %9
+e:\tools\Python22\python.exe e:\PROJECTS\wx\wxPython\scripts\img2py %1 %2 %3 %4 %5 %6 %7 %8 %9

wxPython/scripts/img2xpm.bat

@@ -1,3 +1,3 @@
 @echo off
 
-C:\TOOLS\PYTHON22\PYTHON.EXE C:\projects\wx\wxPython\scripts\img2xpm %1 %2 %3 %4 %5 %6 %7 %8 %9
+e:\tools\Python22\python.exe e:\PROJECTS\wx\wxPython\scripts\img2xpm %1 %2 %3 %4 %5 %6 %7 %8 %9

wxPython/scripts/pycrust.bat

@@ -1,3 +1,3 @@
 @echo off
 
-start C:\TOOLS\PYTHON22\pythonw.exe C:\projects\wx\wxPython\scripts\pycrust %1 %2 %3 %4 %5 %6 %7 %8 %9
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\pycrust %1 %2 %3 %4 %5 %6 %7 %8 %9

wxPython/scripts/pycwrap

@@ -0,0 +1,7 @@
+#!/usr/bin/env python
+
+from wxPython.lib.PyCrust.wrap import main
+import sys, os
+
+sys.path.insert(0, os.curdir)
+main(sys.argv)

wxPython/scripts/pycwrap.bat

@@ -0,0 +1,3 @@
+@echo off
+
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\pycwrap %1 %2 %3 %4 %5 %6 %7 %8 %9

wxPython/scripts/pyshell.bat

@@ -1,3 +1,3 @@
 @echo off
 
-start C:\TOOLS\PYTHON22\pythonw.exe C:\projects\wx\wxPython\scripts\pyshell %1 %2 %3 %4 %5 %6 %7 %8 %9
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\pyshell %1 %2 %3 %4 %5 %6 %7 %8 %9

wxPython/scripts/xrced.bat

@@ -1,3 +1,3 @@
 @echo off
 
-start C:\TOOLS\PYTHON22\pythonw.exe C:\projects\wx\wxPython\scripts\xrced %1 %2 %3 %4 %5 %6 %7 %8 %9
+start e:\tools\Python22\pythonw.exe e:\PROJECTS\wx\wxPython\scripts\xrced %1 %2 %3 %4 %5 %6 %7 %8 %9