X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2734d687721b07106dc7e72ec2487c7070650933..5f605ccf3fcce969d9a634bf1cf6aa4f13f74d2e:/wxPython/distrib/make_installer.py?ds=sidebyside diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index c5933c47cc..71c7faaddf 100644 --- 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" #---------------------------------------------------------------------- @@ -21,7 +22,7 @@ AppName = wxPython 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} +DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultGroupName = wxPython %(SHORTVER)s for Python %(PYTHONVER)s AlwaysCreateUninstallIcon = yes @@ -68,25 +69,35 @@ 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 Source: "wxPython\stc_c.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\xrcc.pyd"; DestDir: "{app}\wxPython"; Components: core +Source: "wxPython\gizmosc.pyd"; DestDir: "{app}\wxPython"; Components: core +Source: "wxPython\dllwidget_c.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\*.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 +Source: "wxPython\lib\PyCrust\*.py"; DestDir: "{app}\wxPython\lib\PyCrust"; Components: core +Source: "wxPython\lib\PyCrust\*.txt"; DestDir: "{app}\wxPython\lib\PyCrust"; Components: core +Source: "wxPython\lib\PyCrust\*.ico"; DestDir: "{app}\wxPython\lib\PyCrust"; Components: core Source: "demo\*.py"; DestDir: "{app}\wxPython\demo"; Components: demo 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 @@ -94,17 +105,29 @@ Source: "demo\bitmaps\*.jpg"; DestDir: "{app}\wxPython\demo\bitmap Source: "demo\bitmaps\*.png"; DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo Source: "demo\bitmaps\*.ico"; DestDir: "{app}\wxPython\demo\bitmaps"; Components: demo +Source: "demo\bmp_source\*.gif"; DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo +Source: "demo\bmp_source\*.bmp"; DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo +;;Source: "demo\bmp_source\*.jpg"; DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo +Source: "demo\bmp_source\*.png"; DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo +Source: "demo\bmp_source\*.ico"; DestDir: "{app}\wxPython\demo\bmp_source"; Components: demo + Source: "demo\data\*.htm"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.html"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.py"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.png"; DestDir: "{app}\wxPython\demo\data"; Components: demo Source: "demo\data\*.bmp"; DestDir: "{app}\wxPython\demo\data"; Components: demo 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\*.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: "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 +Source: "demo\dllwidget\Makefile"; DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo +Source: "demo\dllwidget\makefile.*"; DestDir: "{app}\wxPython\demo\dllwidget"; Components: demo Source: "README.txt"; DestDir: "{app}\wxPython\docs"; Flags: isreadme; Components: core Source: "CHANGES.txt"; DestDir: "{app}\wxPython\docs"; Components: core @@ -113,11 +136,19 @@ Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\wxPython\docs"; Comp Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\wxPython\docs"; Components: docs Source: "tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: tools +Source: "tools\XRCed\CHANGES"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "tools\XRCed\TODO"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "tools\XRCed\README"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +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 Source: "samples\doodle\sample.ddl"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples Source: "samples\doodle\superdoodle.iss"; DestDir: "{app}\wxPython\samples\doodle"; Components: samples + Source: "samples\wxProject\*.txt"; DestDir: "{app}\wxPython\samples\wxProject"; Components: samples Source: "samples\wxProject\*.py"; DestDir: "{app}\wxPython\samples\wxProject"; Components: samples @@ -125,20 +156,29 @@ Source: "samples\stxview\*.py"; DestDir: "{app}\wxPython\sample Source: "samples\stxview\*.stx"; DestDir: "{app}\wxPython\samples\stxview"; Components: samples Source: "samples\stxview\*.txt"; DestDir: "{app}\wxPython\samples\stxview"; Components: samples Source: "samples\stxview\StructuredText\*.py"; DestDir: "{app}\wxPython\samples\stxview\StructuredText"; Components: samples +Source: "samples\stxview\StructuredText\*.txt"; DestDir: "{app}\wxPython\samples\stxview\StructuredText"; Components: samples +Source: "samples\StyleEditor\*.txt"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples +Source: "samples\StyleEditor\*.py"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples +Source: "samples\StyleEditor\*.cfg"; DestDir: "{app}\wxPython\samples\StyleEditor"; Components: samples + +Source: "samples\pySketch\*.py"; DestDir: "{app}\wxPython\samples\pySketch"; Components: samples +Source: "samples\pySketch\images\*.bmp"; DestDir: "{app}\wxPython\samples\pySketch\images"; Components: samples + +Source: "samples\frogedit\*.py"; DestDir: "{app}\wxPython\samples\frogedit"; Components: samples ;;------------------------------------------------------------ [Icons] -Name: "{group}\Run the DEMO"; Filename: "{code:GetPythonDir}\pythonw.exe"; WorkingDir: "{app}\wxPython\demo"; Parameters: "demo.py"; -Name: "{group}\wxWindows Referece"; Filename: "{app}\wxPython\docs\wx.chm"; -Name: "{group}\wxOGL Referece"; Filename: "{app}\wxPython\docs\ogl.chm"; -Name: "{group}\licence.txt"; Filename: "{app}\wxPython\docs\licence\licence.txt"; -Name: "{group}\README.txt"; Filename: "{app}\wxPython\docs\README.txt"; -Name: "{group}\CHANGES.txt"; Filename: "{app}\wxPython\docs\CHANGES.txt"; +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}\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}\Uninstall wxPython"; Filename: "{app}\wxPython\unins000.exe"; WorkingDir: "{app}\wxPython"; +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 ;;------------------------------------------------------------ @@ -150,40 +190,60 @@ 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\lib\PyCrust\*.pyc"; +Type: files; Name: "{app}\wxPython\lib\PyCrust\*.pyo"; Type: files; Name: "{app}\wxPython\demo\*.pyc"; Type: files; Name: "{app}\wxPython\demo\*.pyo"; Type: files; Name: "{app}\wxPython\demo\data\showTips"; Type: files; Name: "{app}\wxPython\tools\*.pyc"; Type: files; Name: "{app}\wxPython\tools\*.pyo"; +Type: files; Name: "{app}\wxPython\tools\XRCed\*.pyc"; +Type: files; Name: "{app}\wxPython\tools\XRCed\*.pyo"; Type: files; Name: "{app}\wxPython\samples\doodle\*.pyc"; Type: files; Name: "{app}\wxPython\samples\doodle\*.pyo"; Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyc"; Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\StyleEditor\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\StyleEditor\*.pyo"; Type: files; Name: "{app}\wxPython\samples\stxview\*.pyc"; Type: files; Name: "{app}\wxPython\samples\stxview\*.pyo"; Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyc"; Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\frogedit\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\frogedit\*.pyo"; ''' #---------------------------------------------------------------------- + IFS_Template = r""" program Setup; var PythonDir : String; + InstallDir : String; function InitializeSetup(): Boolean; 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; - end else - Result := true; + + if not RegQueryStringValue(HKEY_CURRENT_USER, + 'Software\Python\PythonCore\%(PYTHONVER)s\InstallPath', + '', PythonDir) then begin + + MsgBox('No installation of Python %(PYTHONVER)s found in registry.\nBe sure to enter a pathname that places wxPython\non the PYTHONPATH', + mbConfirmation, MB_OK); + PythonDir := 'C:\Put a directory on PYTHONPATH here\'; + end; + end; + InstallDir := PythonDir; + %(IF22)s + Result := true; end; @@ -192,6 +252,11 @@ begin Result := PythonDir; end; +function GetInstallDir(Default: String): String; +begin + Result := InstallDir; +end; + begin end. @@ -237,10 +302,18 @@ def main(): ISSFILE = "__wxPython.iss" IFSFILE = "__wxPython.ifs" + if PYTHONVER >= "2.2": + IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';" + else: + IF22 = "" 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() @@ -249,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)