X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b499eb38ee3f706c9881674b020d1980794d74a..c50e42a1223f6da4a07f5c8472a3fe7bf682356a:/wxPython/distrib/make_installer.py diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 8735520c3a..cdc7ca6e5e 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -65,26 +65,26 @@ CodeFile = %(IFSFILE)s ;;------------------------------------------------------------ [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: manifest; Description: "Manifest files for XP LnF"; Types: full ;;------------------------------------------------------------ [Files] -Source: "%(SYSDIR)s\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core -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: "distrib\msw\MSVCRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core +Source: "distrib\msw\MSVCIRT.dll"; DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core +Source: "distrib\msw\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 -Source: "wx\_windows.pyd"; DestDir: "{app}\wx"; Components: core -Source: "wx\_controls.pyd"; DestDir: "{app}\wx"; Components: core -Source: "wx\_misc.pyd"; DestDir: "{app}\wx"; Components: core +Source: "wx\_core_.pyd"; DestDir: "{app}\wx"; Components: core +Source: "wx\_gdi_.pyd"; DestDir: "{app}\wx"; Components: core +Source: "wx\_windows_.pyd"; DestDir: "{app}\wx"; Components: core +Source: "wx\_controls_.pyd"; DestDir: "{app}\wx"; Components: core +Source: "wx\_misc_.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_calendar.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_grid.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_html.pyd"; DestDir: "{app}\wx"; Components: core @@ -92,24 +92,28 @@ Source: "wx\_wizard.pyd"; DestDir: "{app}\wx"; Components: Source: "wx\_gizmos.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_glcanvas.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_iewin.pyd"; DestDir: "{app}\wx"; Components: core +Source: "wx\_activex.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_ogl.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_stc.pyd"; DestDir: "{app}\wx"; Components: core Source: "wx\_xrc.pyd"; DestDir: "{app}\wx"; Components: core 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\*.wdr"; DestDir: "{app}\wx\lib"; Components: core Source: "wx\lib\colourchooser\*.py"; DestDir: "{app}\wx\lib\colourchooser"; Components: core Source: "wx\lib\editor\*.py"; DestDir: "{app}\wx\lib\editor"; Components: core Source: "wx\lib\editor\*.txt"; DestDir: "{app}\wx\lib\editor"; Components: core Source: "wx\lib\mixins\*.py"; DestDir: "{app}\wx\lib\mixins"; Components: core +Source: "wx\lib\masked\*.py"; DestDir: "{app}\wx\lib\masked"; Components: core +Source: "wx\lib\ogl\*.py"; DestDir: "{app}\wx\lib\ogl"; Components: core +Source: "wx\lib\floatcanvas\*.py"; DestDir: "{app}\wx\lib\floatcanvas"; Components: core Source: "wx\py\*.py"; DestDir: "{app}\wx\py"; Components: core Source: "wx\py\*.txt"; DestDir: "{app}\wx\py"; Components: core 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 @@ -161,6 +165,7 @@ Source: "demo\data\*.wav"; DestDir: "{app}\wx\demo\data"; Compo Source: "demo\data\*.wdr"; DestDir: "{app}\wx\demo\data"; Components: demo Source: "demo\data\*.xrc"; DestDir: "{app}\wx\demo\data"; Components: demo Source: "demo\data\*.gif"; DestDir: "{app}\wx\demo\data"; Components: demo +Source: "demo\data\*.swf"; DestDir: "{app}\wx\demo\data"; Components: demo ;;Source: "demo\dllwidget\*.cpp"; DestDir: "{app}\wx\demo\dllwidget"; Components: demo ;;Source: "demo\dllwidget\*.py"; DestDir: "{app}\wx\demo\dllwidget"; Components: demo @@ -192,10 +197,11 @@ 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\BIN\wxrc.exe"; 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 +Source: "samples\doodle\*.bat"; DestDir: "{app}\wx\samples\doodle"; Components: samples Source: "samples\doodle\sample.ddl"; DestDir: "{app}\wx\samples\doodle"; Components: samples Source: "samples\doodle\superdoodle.iss"; DestDir: "{app}\wx\samples\doodle"; Components: samples @@ -221,16 +227,12 @@ Source: "samples\StyleEditor\*.txt"; DestDir: "{app}\wx\samples\StyleEdit Source: "samples\StyleEditor\*.py"; DestDir: "{app}\wx\samples\StyleEditor"; Components: samples Source: "samples\StyleEditor\*.cfg"; DestDir: "{app}\wx\samples\StyleEditor"; Components: samples -Source: "samples\wx_examples\basic\*.py"; DestDir: "{app}\wx\samples\wx_examples\basic"; Components: samples -Source: "samples\wx_examples\hello\*.py"; DestDir: "{app}\wx\samples\wx_examples\hello"; Components: samples -Source: "samples\wx_examples\hello\*.jpg"; DestDir: "{app}\wx\samples\wx_examples\hello"; Components: samples - Source: "samples\wxProject\*.txt"; DestDir: "{app}\wx\samples\wxProject"; Components: samples 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 ;;------------------------------------------------------------ @@ -256,12 +258,9 @@ Name: "{group}\Resource Editor"; Filename: "{code:GetPythonDir}\pythonw.ex Name: "{group}\Sample Apps"; Filename: "{app}\wx\samples"; Components: samples Name: "{group}\wxWindows Reference"; Filename: "{app}\wx\docs\wx.chm"; Components: docs -Name: "{group}\wxOGL Reference"; Filename: "{app}\wx\docs\ogl.chm"; Components: docs -Name: "{group}\licence.txt"; Filename: "{app}\wx\docs\licence\licence.txt"; Components: core -Name: "{group}\README.txt"; Filename: "{app}\wx\docs\README.txt"; Components: docs -Name: "{group}\CHANGES.txt"; Filename: "{app}\wx\docs\CHANGES.txt"; Components: docs Name: "{group}\Migration Guide"; Filename: "{app}\wx\docs\MigrationGuide.html"; Components: docs -Name: "{group}\Other wxPython Docs"; Filename: "{app}\wx\docs\wxPythonDocs.html"; Components: docs +Name: "{group}\Recent Changes"; Filename: "{app}\wx\docs\CHANGES.html"; Components: docs +Name: "{group}\Other Docs"; Filename: "{app}\wx\docs"; Components: docs ;;------------------------------------------------------------ @@ -270,6 +269,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"; @@ -278,12 +279,17 @@ Type: files; Name: "{app}\wx\lib\editor\*.pyc"; Type: files; Name: "{app}\wx\lib\editor\*.pyo"; Type: files; Name: "{app}\wx\lib\mixins\*.pyc"; Type: files; Name: "{app}\wx\lib\mixins\*.pyo"; +Type: files; Name: "{app}\wx\lib\masked\*.pyc"; +Type: files; Name: "{app}\wx\lib\masked\*.pyo"; +Type: files; Name: "{app}\wx\lib\ogl\*.pyc"; +Type: files; Name: "{app}\wx\lib\ogl\*.pyo"; +Type: files; Name: "{app}\wx\lib\floatcanvas\*.pyc"; +Type: files; Name: "{app}\wx\lib\floatcanvas\*.pyo"; + 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"; @@ -428,12 +434,14 @@ def find_DLLs(): WXDLLVER = PYTHONVER = None - proc = os.popen(r"dumpbin /imports wx\_core.pyd", "r") + proc = os.popen(r"dumpbin /imports wx\_core_.pyd", "r") lines = proc.readlines() 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] @@ -457,7 +465,7 @@ def build_locale_string(): if not os.path.isdir(filename): lst.append( locale_template % (filename, dirname) ) - os.path.walk('wxPython\\locale', walk_helper, stringlst) + os.path.walk('wx\\locale', walk_helper, stringlst) return '\n'.join(stringlst) def get_system_dir(): @@ -512,7 +520,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: "distrib\msw\unicows.dll"; DestDir: "{code:GetPythonDir}"; Components: core' % vars() f = open(ISSFILE, "w") f.write(ISS_Template % vars()) @@ -522,7 +530,10 @@ def main(): f.write(IFS_Template % vars()) f.close() - os.system(ISCC % (os.environ['TOOLS'], ISSFILE)) + TOOLS = os.environ['TOOLS'] + if TOOLS.startswith('/cygdrive'): + TOOLS = r"c:\TOOLS" # temporary hack until I convert everything over to bash + os.system(ISCC % (TOOLS, ISSFILE)) if not KEEP_TEMPS: time.sleep(1)