added missing comma

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

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index e4a463b5b79aa470a684b7208b796cba95690d25..49ac90cd2e4b354a2c4be847becd48cd478f20f7 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -65,20 +65,20 @@ CodeFile = %(IFSFILE)s
 ;;------------------------------------------------------------
 
 [Components]
-Name: core;    Description: "wxPython modules and library";  Types: full compact custom;  Flags: fixed
-Name: docs;    Description: "Documentation";                 Types: full
-Name: demo;    Description: "Demo application";              Types: full
-Name: samples; Description: "Sample applications";           Types: full
-
+Name: core;     Description: "wxPython modules and library";  Types: full compact custom;  Flags: fixed
+Name: docs;     Description: "Documentation";                 Types: full
+Name: demo;     Description: "Demo application";              Types: full
+Name: samples;  Description: "Sample applications";           Types: full
+Name: manifest; Description: "Manifest files for XP LnF";     Types: full
 
 ;;------------------------------------------------------------
 
 [Files]
-Source: "%(SYSDIR)s\MSVCRT.dll";        DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-Source: "%(SYSDIR)s\MSVCIRT.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
-Source: "%(SYSDIR)s\MSVCP60.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
+Source: "distrib\msw\MSVCRT.dll";        DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
+Source: "distrib\msw\MSVCIRT.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
+Source: "distrib\msw\MSVCP60.dll";       DestDir: "{code:GetPythonDir}"; CopyMode: alwaysskipifsameorolder; Flags: uninsneveruninstall; Components: core
 
-Source: "%(WXDIR)s\BIN\wx*%(WXDLLVER)s*.dll";  DestDir: "{app}\wx"; Components: core
+Source: "%(WXDIR)s\lib\vc_dll\wx*%(WXDLLVER)s_*.dll";  DestDir: "{app}\wx"; Components: core
 %(MSLU)s
 Source: "wx\_core.pyd";                        DestDir: "{app}\wx"; Components: core
 Source: "wx\_gdi.pyd";                         DestDir: "{app}\wx"; Components: core
@@ -92,12 +92,14 @@ Source: "wx\_wizard.pyd";                      DestDir: "{app}\wx"; Components:
 Source: "wx\_gizmos.pyd";                      DestDir: "{app}\wx"; Components: core
 Source: "wx\_glcanvas.pyd";                    DestDir: "{app}\wx"; Components: core
 Source: "wx\_iewin.pyd";                       DestDir: "{app}\wx"; Components: core
+Source: "wx\_activex.pyd";                     DestDir: "{app}\wx"; Components: core
 Source: "wx\_ogl.pyd";                         DestDir: "{app}\wx"; Components: core
 Source: "wx\_stc.pyd";                         DestDir: "{app}\wx"; Components: core
 Source: "wx\_xrc.pyd";                         DestDir: "{app}\wx"; Components: core
 
 
 Source: "wx\*.py";                             DestDir: "{app}\wx"; Components: core
+Source: "wx\build\*.py";                       DestDir: "{app}\wx\build"; Components: core
 Source: "wx\lib\*.py";                         DestDir: "{app}\wx\lib"; Components: core
 Source: "wx\lib\*.wdr";                        DestDir: "{app}\wx\lib"; Components: core
 Source: "wx\lib\colourchooser\*.py";           DestDir: "{app}\wx\lib\colourchooser"; Components: core
@@ -160,6 +162,7 @@ Source: "demo\data\*.wav";                  DestDir: "{app}\wx\demo\data"; Compo
 Source: "demo\data\*.wdr";                  DestDir: "{app}\wx\demo\data"; Components: demo
 Source: "demo\data\*.xrc";                  DestDir: "{app}\wx\demo\data"; Components: demo
 Source: "demo\data\*.gif";                  DestDir: "{app}\wx\demo\data"; Components: demo
+Source: "demo\data\*.swf";                  DestDir: "{app}\wx\demo\data"; Components: demo
 
 ;;Source: "demo\dllwidget\*.cpp";             DestDir: "{app}\wx\demo\dllwidget"; Components: demo
 ;;Source: "demo\dllwidget\*.py";              DestDir: "{app}\wx\demo\dllwidget"; Components: demo
@@ -191,7 +194,7 @@ 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\BIN\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
@@ -220,16 +223,12 @@ Source: "samples\StyleEditor\*.txt";        DestDir: "{app}\wx\samples\StyleEdit
 Source: "samples\StyleEditor\*.py";         DestDir: "{app}\wx\samples\StyleEditor"; Components: samples
 Source: "samples\StyleEditor\*.cfg";        DestDir: "{app}\wx\samples\StyleEditor"; Components: samples
 
-Source: "samples\wx_examples\basic\*.py";   DestDir: "{app}\wx\samples\wx_examples\basic"; Components: samples
-Source: "samples\wx_examples\hello\*.py";   DestDir: "{app}\wx\samples\wx_examples\hello"; Components: samples
-Source: "samples\wx_examples\hello\*.jpg";  DestDir: "{app}\wx\samples\wx_examples\hello"; Components: samples
-
 Source: "samples\wxProject\*.txt";          DestDir: "{app}\wx\samples\wxProject"; Components: samples
 Source: "samples\wxProject\*.py";           DestDir: "{app}\wx\samples\wxProject"; Components: samples
 
 
-Source: "src\winxp.manifest";               DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components: core
-Source: "src\winxp.manifest";               DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: core
+Source: "src\winxp.manifest";               DestDir: "{code:GetPythonDir}"; DestName: "python.exe.manifest"; Components:  manifest
+Source: "src\winxp.manifest";               DestDir: "{code:GetPythonDir}"; DestName: "pythonw.exe.manifest"; Components: manifest
 
 
 ;;------------------------------------------------------------
@@ -255,12 +254,9 @@ Name: "{group}\Resource Editor";       Filename: "{code:GetPythonDir}\pythonw.ex
 Name: "{group}\Sample Apps";           Filename: "{app}\wx\samples"; Components: samples
 
 Name: "{group}\wxWindows Reference";   Filename: "{app}\wx\docs\wx.chm";                Components: docs
-Name: "{group}\wxOGL Reference";       Filename: "{app}\wx\docs\ogl.chm";               Components: docs
-Name: "{group}\licence.txt";           Filename: "{app}\wx\docs\licence\licence.txt";   Components: core
-Name: "{group}\README.txt";            Filename: "{app}\wx\docs\README.txt";            Components: docs
-Name: "{group}\CHANGES.txt";           Filename: "{app}\wx\docs\CHANGES.txt";           Components: docs
 Name: "{group}\Migration Guide";       Filename: "{app}\wx\docs\MigrationGuide.html";   Components: docs
-Name: "{group}\Other wxPython Docs";   Filename: "{app}\wx\docs\wxPythonDocs.html";     Components: docs
+Name: "{group}\Recent Changes";        Filename: "{app}\wx\docs\CHANGES.html";          Components: docs
+Name: "{group}\Other Docs";            Filename: "{app}\wx\docs";                       Components: docs
 
 
 ;;------------------------------------------------------------
@@ -269,6 +265,8 @@ Name: "{group}\Other wxPython Docs";   Filename: "{app}\wx\docs\wxPythonDocs.htm
 Type: files; Name: "{app}\wx\*.pyc";
 Type: files; Name: "{app}\wx\*.pyo";
 Type: files; Name: "{app}\wx\*.pyd";
+Type: files; Name: "{app}\wx\build\*.pyc";
+Type: files; Name: "{app}\wx\build\*.pyo";
 Type: files; Name: "{app}\wx\lib\*.pyc";
 Type: files; Name: "{app}\wx\lib\*.pyo";
 Type: files; Name: "{app}\wx\lib\colourchooser\*.pyc";
@@ -430,7 +428,9 @@ def find_DLLs():
     proc.close()
     for line in lines:
         if line.startswith("    wxbase"):
-            WXDLLVER = line[10:14]
+            WXDLLVER = line[10:15]
+            if WXDLLVER.endswith('_'):
+                WXDLLVER = WXDLLVER[:-1]
 
         if line.startswith("    python"):
             PYTHONVER = line[10] + '.' + line[11]
@@ -509,7 +509,7 @@ def main():
 
     MSLU=''
     if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1":
-        MSLU=r'Source: "%(WXDIR)s\BIN\unicows.dll";  DestDir: "{code:GetPythonDir}"; Components: core' % vars()
+        MSLU=r'Source: "%(WXDIR)s\lib\vc_dll\unicows.dll";  DestDir: "{code:GetPythonDir}"; Components: core' % vars()
 
     f = open(ISSFILE, "w")
     f.write(ISS_Template % vars())