diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 23418db29a..d6fbbe81c4 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -151,6 +151,8 @@ Source: "scripts\img2png"; DestDir: "{code:GetPythonDir}\Script Source: "scripts\img2py"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools Source: "scripts\img2xpm"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools Source: "scripts\xrced"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools +Source: "scripts\pyshell"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools +Source: "scripts\pycrust"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools Source: "samples\doodle\*.py"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples Source: "samples\doodle\*.txt"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples @@ -194,14 +196,15 @@ Filename: "{code:GetPythonDir}\python.exe"; Parameters: "CreateBatchFiles.py"; [Icons] 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}\PyCrust"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pycrust"; IconFilename: "{app}\wxPython\lib\PyCrust\PyCrust.ico"; Components: core +Name: "{group}\PyShell"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\pyshell"; 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}\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 +Name: "{group}\Resource Editor"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "c:\"; Parameters: "{code:GetPythonDir}\Scripts\xrced"; IconFilename: "{app}\wxPython\Tools\XRCed\xrced.ico"; Components: tools ;;------------------------------------------------------------ diff --git a/wxPython/scripts/CreateBatchFiles.py b/wxPython/scripts/CreateBatchFiles.py index ac4a84a084..60c4d520a4 100644 --- a/wxPython/scripts/CreateBatchFiles.py +++ b/wxPython/scripts/CreateBatchFiles.py @@ -13,7 +13,7 @@ import sys, os python = sys.executable -pythonw = ow.path.join(os.path.split(python)[0], 'pythonw.exe') +pythonw = 'start ' + os.path.join(os.path.split(python)[0], 'pythonw.exe') scriptdir = os.getcwd() scripts = [ ("img2png", 0), diff --git a/wxPython/scripts/img2png.bat b/wxPython/scripts/img2png.bat index 76c0311539..d926caa621 100755 --- a/wxPython/scripts/img2png.bat +++ b/wxPython/scripts/img2png.bat @@ -1,2 +1,3 @@ @echo off + C:\TOOLS\PYTHON22\PYTHON.EXE C:\projects\wx\wxPython\scripts\img2png %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/wxPython/scripts/img2py.bat b/wxPython/scripts/img2py.bat index f1f402483c..b63e13ac62 100755 --- a/wxPython/scripts/img2py.bat +++ b/wxPython/scripts/img2py.bat @@ -1,2 +1,3 @@ @echo off + C:\TOOLS\PYTHON22\PYTHON.EXE C:\projects\wx\wxPython\scripts\img2py %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/wxPython/scripts/img2xpm.bat b/wxPython/scripts/img2xpm.bat index 5fe28d9794..adda6be6de 100755 --- a/wxPython/scripts/img2xpm.bat +++ b/wxPython/scripts/img2xpm.bat @@ -1,2 +1,3 @@ @echo off + C:\TOOLS\PYTHON22\PYTHON.EXE C:\projects\wx\wxPython\scripts\img2xpm %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/wxPython/scripts/pycrust.bat b/wxPython/scripts/pycrust.bat new file mode 100755 index 0000000000..6f4b5dc07c --- /dev/null +++ b/wxPython/scripts/pycrust.bat @@ -0,0 +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 diff --git a/wxPython/scripts/pyshell.bat b/wxPython/scripts/pyshell.bat new file mode 100755 index 0000000000..6e02101940 --- /dev/null +++ b/wxPython/scripts/pyshell.bat @@ -0,0 +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 diff --git a/wxPython/scripts/xrced.bat b/wxPython/scripts/xrced.bat index 4f80e8a937..e3b87fa793 100755 --- a/wxPython/scripts/xrced.bat +++ b/wxPython/scripts/xrced.bat @@ -1,2 +1,3 @@ @echo off -C:\TOOLS\PYTHON22\PYTHON.EXE C:\projects\wx\wxPython\scripts\xrced %1 %2 %3 %4 %5 %6 %7 %8 %9 + +start C:\TOOLS\PYTHON22\pythonw.exe C:\projects\wx\wxPython\scripts\xrced %1 %2 %3 %4 %5 %6 %7 %8 %9 diff --git a/wxPython/setup.py b/wxPython/setup.py index 0831e6d9b8..fdea8d9826 100755 --- a/wxPython/setup.py +++ b/wxPython/setup.py @@ -919,6 +919,8 @@ if __name__ == "__main__": 'scripts/img2xpm', 'scripts/img2py', 'scripts/xrced', + 'scripts/pyshell', + 'scripts/pycrust', ], )