X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58d0421cf53ccae8bf2d42a4b8e38368d002dc09..96285a18aa6f39e754ae562cc427f005a3402f43:/wxPython/distrib/make_installer.py?ds=sidebyside diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 9771f4b966..62f680bac7 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -33,7 +33,7 @@ ISS_Template = r''' AppName = wxPython%(SHORTVER)s-%(CHARTYPE)s-%(PYVER)s AppVerName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-%(CHARTYPE)s-%(VERSION)s-%(PYVER)s -AppCopyright = Copyright © 2004 Total Control Software +AppCopyright = Copyright © 2006 Total Control Software DefaultDirName = {code:GetInstallDir|c:\DoNotInstallHere} DefaultGroupName = wxPython %(VERSION)s (%(CHARTYPE)s) for Python %(PYTHONVER)s AlwaysCreateUninstallIcon = no @@ -75,6 +75,7 @@ Name: pthfile; Description: "Make this install be the default wxPython"; Types: [Files] %(RTDLL)s +Source: "distrib\msw\gdiplus.dll"; DestDir: "{code:GetPythonDir}"; OnlyBelowVersion: 5.1; CopyMode: alwaysskipifsameorolder; Flags: sharedfile; Components: core Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core %(MSLU)s @@ -95,6 +96,8 @@ Source: "wx\_webkit.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; C Source: "wx\_windows_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\_wizard.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\_xrc.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_aui.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_richtext.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core ;;Source: "wx\_iewin.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core ;;Source: "wx\_ogl.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core @@ -102,6 +105,8 @@ Source: "wx\_xrc.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; C Source: "wx\*.py"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\build\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\build"; Components: core Source: "wx\lib\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib"; Components: core +Source: "wx\lib\analogclock\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock"; Components: core +Source: "wx\lib\analogclock\lib_setup\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup"; Components: core Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\colourchooser"; Components: core Source: "wx\lib\editor\*.py"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core Source: "wx\lib\editor\*.txt"; DestDir: "{app}\%(PKGDIR)s\wx\lib\editor"; Components: core @@ -136,6 +141,7 @@ Source: "wxPython\tools\*.py"; DestDir: "{app}\%(PKGDIR)s\wxP Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Flags: sharedfile; Components: manifest Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Flags: sharedfile; Components: manifest Source: "wxversion\wxversion.py"; DestDir: "{app}"; Flags: sharedfile; Components: core +Source: "wxaddons\*.py"; DestDir: "{app}\wxaddons"; Flags: sharedfile; Components: core Source: "src\wx.pth"; DestDir: "{app}"; Flags: sharedfile; Components: pthfile %(LOCALE)s @@ -157,6 +163,9 @@ Source: "scripts\xrced"; DestDir: "{code:GetPythonDir}\Script Source: "distrib\README.win32.txt"; DestDir: "{app}\%(PKGDIR)s\docs"; Flags: isreadme; Components: core Source: "licence\*.txt"; DestDir: "{app}\%(PKGDIR)s\docs\licence"; Components: core +Source: "docs\CHANGES.*"; DestDir: "{app}\%(PKGDIR)s\docs"; Components: core +Source: "docs\MigrationGuide.*"; DestDir: "{app}\%(PKGDIR)s\docs"; Components: core +Source: "docs\default.css"; DestDir: "{app}\%(PKGDIR)s\docs"; Components: core @@ -182,6 +191,10 @@ Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\build\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\*.pyo"; +Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyc"; +Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\*.pyo"; +Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyc"; +Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\analogclock\lib_setup\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\colourchooser\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wx\lib\editor\*.pyc"; @@ -218,6 +231,12 @@ Type: files; Name: "{app}\%(PKGDIR)s\wxPython\lib\mixins\*.pyo"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyc"; Type: files; Name: "{app}\%(PKGDIR)s\wxPython\tools\*.pyo"; +Type: files; Name: "{app}\wxversion.pyc"; +Type: files; Name: "{app}\wxversion.pyo"; + +Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyc"; +Type: files; Name: "{app}\%(PKGDIR)s\wxaddons\*.pyo"; + %(UNINSTALL_BATCH)s ''' @@ -318,7 +337,7 @@ ISS_DocDemo_Template = r''' AppName = wxPython%(SHORTVER)s-docs-demos AppVerName = wxPython Docs and Demos %(VERSION)s OutputBaseFilename = wxPython%(SHORTVER)s-win32-docs-demos-%(VERSION)s -AppCopyright = Copyright © 2004 Total Control Software +AppCopyright = Copyright © 2006 Total Control Software DefaultDirName = {pf}\wxPython%(SHORTVER)s Docs and Demos DefaultGroupName = wxPython%(SHORTVER)s Docs Demos and Tools AlwaysCreateUninstallIcon = yes @@ -358,12 +377,14 @@ LicenseFile = licence\licence.txt Source: "demo\demo.py"; DestDir: "{app}\demo"; DestName: "demo.pyw"; Source: "demo\*.py"; DestDir: "{app}\demo"; Source: "demo\*.xml"; DestDir: "{app}\demo"; -Source: "demo\*.txt"; DestDir: "{app}\demo"; +Source: "demo\*.txt"; DestDir: "{app}\demo"; +Source: "demo\*.ico"; DestDir: "{app}\demo"; Source: "demo\bitmaps\*.bmp"; DestDir: "{app}\demo\bitmaps"; Source: "demo\bitmaps\*.gif"; DestDir: "{app}\demo\bitmaps"; Source: "demo\bitmaps\*.jpg"; DestDir: "{app}\demo\bitmaps"; -Source: "demo\bitmaps\*.png"; DestDir: "{app}\demo\bitmaps"; +Source: "demo\bitmaps\*.png"; DestDir: "{app}\demo\bitmaps"; +Source: "demo\bitmaps\*.ico"; DestDir: "{app}\demo\bitmaps"; Source: "demo\bmp_source\*.gif"; DestDir: "{app}\demo\bmp_source"; Source: "demo\bmp_source\*.bmp"; DestDir: "{app}\demo\bmp_source"; @@ -416,6 +437,7 @@ Source: "samples\ide\activegrid\*.py"; DestDir: "{app}\samples\ide\ac Source: "samples\ide\activegrid\tool\*.py"; DestDir: "{app}\samples\ide\activegrid\tool"; Source: "samples\ide\activegrid\tool\data\*.txt"; DestDir: "{app}\samples\ide\activegrid\tool\data"; Source: "samples\ide\activegrid\util\*.py"; DestDir: "{app}\samples\ide\activegrid\util"; +Source: "samples\ide\activegrid\model\*.py"; DestDir: "{app}\samples\ide\activegrid\model"; Source: "samples\embedded\*.py"; DestDir: "{app}\samples\embedded"; Source: "samples\embedded\*.cpp"; DestDir: "{app}\samples\embedded"; @@ -511,6 +533,22 @@ Type: files; Name: "{app}\samples\wx_examples\hello\*.pyo"; Type: files; Name: "{app}\samples\wxProject\*.pyc"; Type: files; Name: "{app}\samples\wxProject\*.pyo"; +Type: files; Name: "{app}\samples\ide\*.pyc"; +Type: files; Name: "{app}\samples\ide\activegrid\*.pyc"; +Type: files; Name: "{app}\samples\ide\activegrid\tool\*.pyc"; +Type: files; Name: "{app}\samples\ide\activegrid\util\*.pyc"; +Type: files; Name: "{app}\samples\ide\activegrid\model\*.pyc"; +Type: files; Name: "{app}\samples\ide\*.pyo"; +Type: files; Name: "{app}\samples\ide\activegrid\*.pyo"; +Type: files; Name: "{app}\samples\ide\activegrid\tool\*.pyo"; +Type: files; Name: "{app}\samples\ide\activegrid\util\*.pyo"; +Type: files; Name: "{app}\samples\ide\activegrid\model\*.pyo"; + +Type: files; Name: "{app}\samples\docview\*.pyc"; +Type: files; Name: "{app}\samples\pydocview\*.pyc"; +Type: files; Name: "{app}\samples\docview\*.pyo"; +Type: files; Name: "{app}\samples\pydocview\*.pyo"; + ''' @@ -570,7 +608,7 @@ def get_batch_files(): runtime_template = 'Source: "%s"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core' def get_runtime_dlls(PYVER): - if PYVER == "py24": + if PYVER >= "py24": source = [ r"distrib\msw\msvcr71.dll", r"distrib\msw\msvcp71.dll" ] else: @@ -617,9 +655,7 @@ def main(): SYSDIR = %(SYSDIR)s """ % vars() - if PYTHONVER >= "2.4": - IF22 = r"InstallDir := InstallDir + 'Lib\site-packages';" - elif PYTHONVER >= "2.2": + if PYTHONVER >= "2.2": IF22 = r"InstallDir := InstallDir + '\Lib\site-packages';" else: IF22 = ""