X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/25379d629b7d6bc4079a6339ba7e0c5166c11710..66394199cf03f0e9a3a675fe9829d31463ad38bb:/wxPython/distrib/make_installer.py diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index bc56cf35f8..3a14fea336 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -60,16 +60,16 @@ AppPublisherURL = http://wxPython.org/ LicenseFile = licence\licence.txt CodeFile = %(IFSFILE)s -WizardDebug = yes +;; WizardDebug = yes ;;------------------------------------------------------------ [Components] -Name: core; Description: "wxPython modules and library"; Types: full compact custom; Flags: fixed -Name: docs; Description: "Documentation"; Types: full -Name: demo; Description: "Demo application"; Types: full -Name: samples; Description: "Sample applications"; Types: full - +Name: core; Description: "wxPython modules and library"; Types: full compact custom; Flags: fixed +Name: docs; Description: "Documentation"; Types: full +Name: demo; Description: "Demo application"; Types: full +Name: samples; Description: "Sample applications"; Types: full +Name: ; Description: "Manifest files for XP LnF"; Types: full ;;------------------------------------------------------------ @@ -78,7 +78,7 @@ Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode Source: "%(SYSDIR)s\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core Source: "%(SYSDIR)s\MSVCP60.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core -Source: "%(WXDIR)s\BIN\wx*%(WXDLLVER)s*.dll"; DestDir: "{app}\wx"; Components: core +Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll"; DestDir: "{app}\wx"; Components: core %(MSLU)s Source: "wx\_core.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_gdi.pyd"; DestDir: "{app}\wx"; Components: core @@ -98,6 +98,7 @@ Source: "wx\_xrc.pyd"; DestDir: "{app}\wx"; Components: Source: "wx\*.py"; DestDir: "{app}\wx"; Components: core +Source: "wx\build\*.py"; DestDir: "{app}\wx\build"; Components: core Source: "wx\lib\*.py"; DestDir: "{app}\wx\lib"; Components: core Source: "wx\lib\*.wdr"; DestDir: "{app}\wx\lib"; Components: core Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\wx\lib\colourchooser"; Components: core @@ -109,7 +110,6 @@ Source: "wx\py\*.txt"; DestDir: "{app}\wx\py"; Component Source: "wx\py\*.ico"; DestDir: "{app}\wx\py"; Components: core Source: "wx\py\*.png"; DestDir: "{app}\wx\py"; Components: core Source: "wx\py\tests\*.py"; DestDir: "{app}\wx\py\tests"; Components: core -Source: "wx\py\wxd\*.py"; DestDir: "{app}\wx\py\wxd"; Components: core Source: "wx\tools\*.py"; DestDir: "{app}\wx\tools"; Components: core Source: "wx\tools\XRCed\*.txt"; DestDir: "{app}\wx\tools\XRCed"; Components: core Source: "wx\tools\XRCed\sawfishrc"; DestDir: "{app}\wx\tools\XRCed"; Components: core @@ -192,7 +192,7 @@ Source: "scripts\pyshell"; DestDir: "{code:GetPythonDir}\Script Source: "scripts\pycrust"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core Source: "scripts\pywrap"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core Source: "scripts\xrced"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core - +Source: "%(WXDIR)s\lib\vc_dll\wxrc.exe"; DestDir: "{code:GetPythonDir}\Scripts"; Components: core Source: "samples\doodle\*.py"; DestDir: "{app}\wx\samples\doodle"; Components: samples Source: "samples\doodle\*.txt"; DestDir: "{app}\wx\samples\doodle"; Components: samples @@ -229,8 +229,8 @@ Source: "samples\wxProject\*.txt"; DestDir: "{app}\wx\samples\wxProject Source: "samples\wxProject\*.py"; DestDir: "{app}\wx\samples\wxProject"; Components: samples -Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components: core -Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: core +Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components: manifest +Source: "src\winxp.manifest"; DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: manifest ;;------------------------------------------------------------ @@ -270,6 +270,8 @@ Name: "{group}\Other wxPython Docs"; Filename: "{app}\wx\docs\wxPythonDocs.htm Type: files; Name: "{app}\wx\*.pyc"; Type: files; Name: "{app}\wx\*.pyo"; Type: files; Name: "{app}\wx\*.pyd"; +Type: files; Name: "{app}\wx\build\*.pyc"; +Type: files; Name: "{app}\wx\build\*.pyo"; Type: files; Name: "{app}\wx\lib\*.pyc"; Type: files; Name: "{app}\wx\lib\*.pyo"; Type: files; Name: "{app}\wx\lib\colourchooser\*.pyc"; @@ -282,8 +284,6 @@ Type: files; Name: "{app}\wx\py\*.pyc"; Type: files; Name: "{app}\wx\py\*.pyo"; Type: files; Name: "{app}\wx\py\tests\*.pyc"; Type: files; Name: "{app}\wx\py\tests\*.pyo"; -Type: files; Name: "{app}\wx\py\wxd\*.pyc"; -Type: files; Name: "{app}\wx\py\wxd\*.pyo"; Type: files; Name: "{app}\wx\tools\*.pyc"; Type: files; Name: "{app}\wx\tools\*.pyo"; Type: files; Name: "{app}\wx\tools\XRCed\*.pyc"; @@ -433,7 +433,9 @@ def find_DLLs(): proc.close() for line in lines: if line.startswith(" wxbase"): - WXDLLVER = line[10:14] + WXDLLVER = line[10:15] + if WXDLLVER.endswith('_'): + WXDLLVER = WXDLLVER[:-1] if line.startswith(" python"): PYTHONVER = line[10] + '.' + line[11] @@ -512,7 +514,7 @@ def main(): MSLU='' if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1": - MSLU=r'Source: "%(WXDIR)s\BIN\unicows.dll"; DestDir: "{code:GetPythonDir}"; Components: core' % vars() + MSLU=r'Source: "%(WXDIR)s\lib\vc_dll\unicows.dll"; DestDir: "{code:GetPythonDir}"; Components: core' % vars() f = open(ISSFILE, "w") f.write(ISS_Template % vars())