X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0f475e8aa9e236b097411bfc9ad9db7309a43b1a..1c92f2983de294f332d79b0ac3634646db03c561:/wxPython/distrib/make_installer.py

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 418d8aa751..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,6 +75,7 @@ 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
 
@@ -95,6 +96,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
 
@@ -334,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
@@ -380,7 +383,8 @@ 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\*.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"; 
@@ -433,6 +437,7 @@ Source: "samples\ide\activegrid\*.py";            DestDir: "{app}\samples\ide\ac
 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"; 
@@ -532,10 +537,12 @@ 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";
@@ -601,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:
@@ -648,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 = ""