Fix "warning: operation on 'y' may be undefined".

[wxWidgets.git] / wxPython / distrib / make_installer.py

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 21b77a504be3772a2750e5a38beaba9fcfb2806e..ad17b9d7a01d3236f6a622a9f977a1189f573da1 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -83,6 +83,7 @@ Source: "wx\_calendar.pyd";                    DestDir: "{app}\%(PKGDIR)s\wx"; C
 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\_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\_grid.pyd";                        DestDir: "{app}\%(PKGDIR)s\wx"; Components: core
@@ -156,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
 
 
 
@@ -358,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"; 
@@ -382,7 +384,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";
 
@@ -408,11 +409,16 @@ 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\docview\activegrid\*.py";               DestDir: "{app}\samples\docview\activegrid"; 
-Source: "samples\docview\activegrid\tool\*.py";          DestDir: "{app}\samples\docview\activegrid\tool"; 
-Source: "samples\docview\activegrid\tool\data\*.txt";    DestDir: "{app}\samples\docview\activegrid\tool\data"; 
-Source: "samples\docview\activegrid\tool\images\*.jpg";  DestDir: "{app}\samples\docview\activegrid\tool\images"; 
+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"; 
@@ -508,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";
+
 
 '''
 
@@ -522,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