X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1f780e48af479e7bf9a07eaaa1ab6b41f1ffb17b..3030ae493df7500fd5da7555f141c0c8a690bd8a:/wxPython/distrib/make_installer.py diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 96672b8ddf..8dcd68359c 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -95,6 +95,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 +104,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 +140,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 +162,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 +190,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 +230,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 ''' @@ -358,14 +376,13 @@ 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\bmp_source\*.gif"; DestDir: "{app}\demo\bmp_source"; Source: "demo\bmp_source\*.bmp"; DestDir: "{app}\demo\bmp_source"; @@ -383,7 +400,6 @@ 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\*.mpg"; DestDir: "{app}\demo\data"; @@ -411,7 +427,7 @@ 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\*.jpg"; 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"; @@ -514,6 +530,20 @@ 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\*.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\docview\*.pyc"; +Type: files; Name: "{app}\samples\pydocview\*.pyc"; +Type: files; Name: "{app}\samples\docview\*.pyo"; +Type: files; Name: "{app}\samples\pydocview\*.pyo"; + ''' @@ -528,16 +558,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