X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d7ec65649840e37d75138e5144224cdce04e5c6e..5bf2abe34850e0952a44f3be4a4390ea12c55bd0:/wxPython/distrib/make_installer.py?ds=sidebyside diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index eee5c57209..50435888ed 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -1,5 +1,4 @@ """ - This script will generate a setup script for InnoSetup and then run it to make the installer executable. If all goes right the proper versions of Python and wxWindows (including hybrid/final settings) will all be @@ -10,8 +9,6 @@ will be created. import os, string -#---------------------------------------------------------------------- - KEEP_TEMPS = 0 #---------------------------------------------------------------------- @@ -21,7 +18,7 @@ ISS_Template = r''' [Setup] AppName = wxPython -AppVerName = wxPython %(VERSION)s +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} @@ -41,6 +38,8 @@ DisableReadyPage = true ;;DisableDirPage = true DisableProgramGroupPage = true DisableAppendDir = true +UsePreviousAppDir = no +UsePreviousGroup = no UninstallFilesDir = {app}\wxPython AppPublisherURL = http://wxPython.org/ @@ -65,23 +64,29 @@ Name: tools; Description: "Tools"; Types: full ;;------------------------------------------------------------ [Files] -Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall; Components: core -Source: "%(SYSDIR)s\MSVCIRT.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall; Components: core +Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Components: core +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 Source: "wxPython\wxc.pyd"; 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\*.py"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\lib\*.py"; 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 @@ -99,8 +104,11 @@ Source: "demo\data\*.py"; DestDir: "{app}\wxPython\demo\data"; 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: "README.txt"; DestDir: "{app}\wxPython\docs"; Flags: isreadme; Components: core Source: "CHANGES.txt"; DestDir: "{app}\wxPython\docs"; Components: core @@ -109,11 +117,17 @@ 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: "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 @@ -122,6 +136,13 @@ Source: "samples\stxview\*.stx"; DestDir: "{app}\wxPython\sample 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\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 + ;;------------------------------------------------------------ @@ -146,15 +167,21 @@ 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\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"; @@ -165,6 +192,10 @@ Type: files; Name: "{app}\wxPython\samples\stxview\StructuredText\*.pyo"; #---------------------------------------------------------------------- +## TODO: For Python 2.2 wxPython should go into +# os.path.join(sys.prefix, 'Lib', 'site-packages') + + IFS_Template = r""" program Setup; var @@ -175,11 +206,17 @@ 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.\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; + Result := true; end;