update from herbert breunung

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

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index f16f158a73b261dbdb8e1b1105a601c3590f5a46..c78854abaaf0765952c6e928c9bc5663433f2756 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -108,6 +108,7 @@ Source: "wx\lib\editor\*.txt";                 DestDir: "{app}\wx\lib\editor"; C
 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
@@ -196,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\lib\vc_dll\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
 
@@ -277,6 +279,13 @@ 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";
@@ -456,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():