X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e2b154e39165e74ff8a651bf5289b3b6a167a0d7..d0ee33f5c6908b4ac5e1364381f0ef00942e3936:/wxPython/distrib/make_installer.py?ds=inline diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py index 488099633c..ad17b9d7a0 100644 --- a/wxPython/distrib/make_installer.py +++ b/wxPython/distrib/make_installer.py @@ -78,22 +78,25 @@ Name: pthfile; Description: "Make this install be the default wxPython"; Types: 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\_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 @@ -154,6 +157,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 @@ -356,13 +362,11 @@ Source: "demo\demo.py"; DestDir: "{app}\demo"; DestName: "de 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\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"; @@ -380,8 +384,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 +394,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 +409,17 @@ 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\embedded\*.py"; DestDir: "{app}\samples\embedded"; Source: "samples\embedded\*.cpp"; DestDir: "{app}\samples\embedded"; Source: "samples\embedded\*.txt"; DestDir: "{app}\samples\embedded"; @@ -499,6 +514,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"; + ''' @@ -513,16 +542,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