X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2b154e39165e74ff8a651bf5289b3b6a167a0d7..96285a18aa6f39e754ae562cc427f005a3402f43:/wxPython/distrib/make_installer.py diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 488099633c..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,30 +75,38 @@ 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 +Source: "wx\_activex.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_calendar.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_controls_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\_core_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\_gdi_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_windows_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_controls_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_misc_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_calendar.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_grid.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_html.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_wizard.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_animate.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\_gizmos.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\_glcanvas.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_iewin.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_activex.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core -Source: "wx\_ogl.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_grid.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_html.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_media.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_misc_.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core Source: "wx\_stc.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +Source: "wx\_webkit.pyd"; DestDir: "{app}\%(PKGDIR)s\wx"; Components: core +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 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 @@ -133,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 @@ -154,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 @@ -179,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"; @@ -215,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 ''' @@ -315,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 @@ -355,14 +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\*.ico"; 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\*.ico"; 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"; @@ -380,8 +402,8 @@ Source: "demo\data\*.txt"; DestDir: "{app}\demo\data"; Source: "demo\data\*.wav"; DestDir: "{app}\demo\data"; Source: "demo\data\*.wdr"; DestDir: "{app}\demo\data"; Source: "demo\data\*.xrc"; DestDir: "{app}\demo\data"; -Source: "demo\data\*.gif"; DestDir: "{app}\demo\data"; -Source: "demo\data\*.swf"; DestDir: "{app}\demo\data"; +Source: "demo\data\*.swf"; DestDir: "{app}\demo\data"; +Source: "demo\data\*.mpg"; DestDir: "{app}\demo\data"; ;;Source: "demo\dllwidget\*.cpp"; DestDir: "{app}\demo\dllwidget"; ;;Source: "demo\dllwidget\*.py"; DestDir: "{app}\demo\dllwidget"; @@ -390,7 +412,7 @@ Source: "demo\data\*.swf"; DestDir: "{app}\demo\data"; Source: "licence\*.txt"; DestDir: "{app}\docs\licence"; Source: "%(WXDIR)s\docs\htmlhelp\wx.chm"; DestDir: "{app}\docs"; -Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\docs"; +;;Source: "%(WXDIR)s\docs\htmlhelp\ogl.chm"; DestDir: "{app}\docs"; Source: "docs\README.txt"; DestDir: "{app}\docs"; Flags: isreadme; Source: "docs\*.txt"; DestDir: "{app}\docs"; Source: "docs\*.css"; DestDir: "{app}\docs"; @@ -405,6 +427,18 @@ Source: "samples\doodle\*.bat"; DestDir: "{app}\samples\doodle"; Source: "samples\doodle\sample.ddl"; DestDir: "{app}\samples\doodle"; Source: "samples\doodle\superdoodle.iss"; DestDir: "{app}\samples\doodle"; +Source: "samples\docview\*.py"; DestDir: "{app}\samples\docview"; +Source: "samples\pydocview\*.py"; DestDir: "{app}\samples\pydocview"; +Source: "samples\pydocview\*.png"; DestDir: "{app}\samples\pydocview"; +Source: "samples\pydocview\*.txt"; DestDir: "{app}\samples\pydocview"; + +Source: "samples\ide\*.py"; DestDir: "{app}\samples\ide"; +Source: "samples\ide\activegrid\*.py"; DestDir: "{app}\samples\ide\activegrid"; +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"; Source: "samples\embedded\*.txt"; DestDir: "{app}\samples\embedded"; @@ -499,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"; + ''' @@ -513,16 +563,11 @@ def find_DLLs(): proc.close() for line in lines: if line.startswith(" wxmsw"): - WXDLLVER = line[9:14] - if WXDLLVER.endswith('_'): - WXDLLVER = WXDLLVER[:-1] - + WXDLLVER = line[9:14].split('_')[0] + if line.startswith(" python"): PYTHONVER = line[10] + '.' + line[11] - #if WXDLLVER and PYTHONVER: - # return WXDLLVER, PYTHONVER - return WXDLLVER, PYTHONVER @@ -563,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: @@ -610,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 = ""