X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0815db26866a57eb72dbda72cc060e2649da45f5..05159a2750ed2cc5945a85bc5fc6849ad1a30e75:/wxPython/distrib/make_installer.py diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 06812c4e80..3b77adba35 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -20,7 +20,7 @@ ISS_Template = r''' [Setup] AppName = wxPython AppVerName = wxPython %(VERSION)s for Python %(PYTHONVER)s -OutputBaseFilename = wxPython-%(VERSION)s-%(PYVER)s +OutputBaseFilename = wxPythonWIN32-%(VERSION)s-%(PYVER)s AppCopyright = Copyright © 2002 Total Control Software DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultGroupName = wxPython %(SHORTVER)s for Python %(PYTHONVER)s @@ -67,6 +67,7 @@ Name: tools; Description: "Tools"; Types: full [Files] 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: "%(SYSDIR)s\MSVCP60.dll"; DestDir: "{sys}"; CopyMode: alwaysskipifsameorolder; Flags: sharedfile uninsneveruninstall restartreplace; Components: core Source: "%(WXDIR)s\lib\%(WXDLL)s"; DestDir: "{app}\wxPython"; Components: core %(MSLU)s @@ -76,11 +77,13 @@ Source: "wxPython\gridc.pyd"; DestDir: "{app}\wxPython"; Component Source: "wxPython\helpc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\htmlc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\calendarc.pyd"; DestDir: "{app}\wxPython"; Components: core +Source: "wxPython\wizardc.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\iewinc.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\dllwidget_c.pyd"; DestDir: "{app}\wxPython"; Components: core Source: "wxPython\*.py"; DestDir: "{app}\wxPython"; Components: core @@ -135,14 +138,23 @@ Source: "licence\*.txt"; DestDir: "{app}\wxPython\docs\licenc Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\wxPython\docs"; Components: docs 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: "wxPython\tools\*.py"; DestDir: "{app}\wxPython\tools"; Components: tools +Source: "wxPython\tools\XRCed\CHANGES"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\TODO"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\README"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.py"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.xrc"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.ico"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools +Source: "wxPython\tools\XRCed\*.sh"; DestDir: "{app}\wxPython\tools\XRCed"; Components: tools + +Source: "scripts\*.bat"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools +Source: "scripts\*.py"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools +Source: "scripts\img2png"; DestDir: "{code:GetPythonDir}\Scripts"; Components: tools +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 @@ -175,18 +187,27 @@ Source: "samples\embedded\*.unx"; DestDir: "{app}\wxPython\samples\embe Source: "samples\embedded\*.ico"; DestDir: "{app}\wxPython\samples\embedded"; Components: samples Source: "samples\embedded\*.xpm"; DestDir: "{app}\wxPython\samples\embedded"; Components: samples +;;------------------------------------------------------------ + +[Run] +;; Recreate the tool scripts to use the paths on the users machine +Filename: "{code:GetPythonDir}\python.exe"; Parameters: "{code:GetPythonDir}\Lib\compileall.py {app}\wxPython"; Description: "Compile Python .py files to .pyc"; Flags: postinstall; Components: core +Filename: "{code:GetPythonDir}\python.exe"; Parameters: "CreateBatchFiles.py"; WorkingDir: "{code:GetPythonDir}\Scripts"; Description: "Create batch files for tool scripts"; Flags: postinstall; Components: tools + + ;;------------------------------------------------------------ [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 ;;------------------------------------------------------------ @@ -194,6 +215,7 @@ Name: "{group}\Resource Editor"; Filename: "{code:GetPythonDir}\pythonw.ex [UninstallDelete] Type: files; Name: "{app}\wxPython\*.pyc"; Type: files; Name: "{app}\wxPython\*.pyo"; +Type: files; Name: "{app}\wxPython\*.pyd"; Type: files; Name: "{app}\wxPython\lib\*.pyc"; Type: files; Name: "{app}\wxPython\lib\*.pyo"; Type: files; Name: "{app}\wxPython\lib\editor\*.pyc"; @@ -202,6 +224,10 @@ 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\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\demo\*.pyc"; Type: files; Name: "{app}\wxPython\demo\*.pyo"; Type: files; Name: "{app}\wxPython\demo\data\showTips"; @@ -221,6 +247,15 @@ 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"; +Type: files; Name: "{app}\wxPython\demo\data\*.pyc"; +Type: files; Name: "{app}\wxPython\demo\data\*.pyo"; +Type: files; Name: "{app}\wxPython\demo\dllwidget\*.pyc"; +Type: files; Name: "{app}\wxPython\demo\dllwidget\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\embedded\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\embedded\*.pyo"; +Type: files; Name: "{app}\wxPython\samples\pySketch\*.pyc"; +Type: files; Name: "{app}\wxPython\samples\pySketch\*.pyo"; + ''' @@ -315,8 +350,10 @@ def main(): else: IF22 = "" - if string.find(WXDLL, "h") != -1: - PYVER = PYVER + "-hybrid" + # Starting with 2.3.3 the hybrid build is the release build too, so + # no need to label it that way. + ##if string.find(WXDLL, "h") != -1: + ## PYVER = PYVER + "-hybrid" MSLU='' if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1":