Docsrings for wxSplitterWindow

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

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index e4a463b5b79aa470a684b7208b796cba95690d25..3a14fea336da194f15d0fd70c0473f394ed84237 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -65,11 +65,11 @@ CodeFile = %(IFSFILE)s
 ;;------------------------------------------------------------
 
 [Components]
 ;;------------------------------------------------------------
 
 [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: ; Description: "Manifest files for XP LnF";     Types: full

 
 ;;------------------------------------------------------------
 
 
 ;;------------------------------------------------------------
 


@@ -78,7 +78,7 @@ Source: "%(SYSDIR)s\MSVCRT.dll";        DestDir: "{code:GetPythonDir}"; CopyMode
 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: "%(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: "%(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
 %(MSLU)s
 Source: "wx\_core.pyd";                        DestDir: "{app}\wx"; Components: core
 Source: "wx\_gdi.pyd";                         DestDir: "{app}\wx"; Components: core


@@ -98,6 +98,7 @@ Source: "wx\_xrc.pyd";                         DestDir: "{app}\wx"; Components:
 
 
 Source: "wx\*.py";                             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
 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


@@ -191,7 +192,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: "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
 
 Source: "samples\doodle\*.py";              DestDir: "{app}\wx\samples\doodle"; Components: samples
 Source: "samples\doodle\*.txt";             DestDir: "{app}\wx\samples\doodle"; Components: samples


@@ -228,8 +229,8 @@ Source: "samples\wxProject\*.txt";          DestDir: "{app}\wx\samples\wxProject
 Source: "samples\wxProject\*.py";           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

 
 
 ;;------------------------------------------------------------
 
 
 ;;------------------------------------------------------------


@@ -269,6 +270,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\*.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";
 Type: files; Name: "{app}\wx\lib\*.pyc";
 Type: files; Name: "{app}\wx\lib\*.pyo";
 Type: files; Name: "{app}\wx\lib\colourchooser\*.pyc";


@@ -430,7 +433,9 @@ def find_DLLs():
     proc.close()
     for line in lines:
         if line.startswith("    wxbase"):
     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]
 
         if line.startswith("    python"):
             PYTHONVER = line[10] + '.' + line[11]


@@ -509,7 +514,7 @@ def main():
 
     MSLU=''
     if len(sys.argv) > 1 and sys.argv[1] == "UNICODE=1":
 
     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())
 
     f = open(ISSFILE, "w")
     f.write(ISS_Template % vars())