more little tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11556 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/MANIFEST.in b/wxPython/MANIFEST.in
index 0c15db0768f23d401698ab1c387f9340e3e6cf94..3cf83906b39ec07eb31026cde6ba286c32d5094b 100644 (file)
--- a/wxPython/MANIFEST.in
+++ b/wxPython/MANIFEST.in
@@ -53,6 +53,9 @@ include wxPython/lib/*.txt
 include wxPython/lib/editor/*.py
 include wxPython/lib/editor/*.txt
 include wxPython/lib/mixins/*.py
+include wxPython/lib/PyCrust/*.py
+include wxPython/lib/PyCrust/*.txt
+include wxPython/lib/PyCrust/*.ico
 
 exclude wxPython/*
 exclude tests

diff --git a/wxPython/distrib/make_installer.py b/wxPython/distrib/make_installer.py
index 73e516f4486bb18a7d699ef07f4e541308e73b6a..4be598300ad5a976a069658049f6b00b5af283e5 100644 (file)
--- a/wxPython/distrib/make_installer.py
+++ b/wxPython/distrib/make_installer.py
@@ -70,6 +70,7 @@ Source: "%(SYSDIR)s\MSVCIRT.dll";           DestDir: "{sys}"; CopyMode: alwayssk
 Source: "%(WXDIR)s\lib\%(WXDLL)s";          DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\wxc.pyd";                 DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\gridc.pyd";               DestDir: "{app}\wxPython"; Components: core
+Source: "wxPython\helpc.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\htmlc.pyd";               DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\utilsc.pyd";              DestDir: "{app}\wxPython"; Components: core
 Source: "wxPython\calendarc.pyd";           DestDir: "{app}\wxPython"; Components: core
@@ -83,6 +84,9 @@ Source: "wxPython\lib\*.py";                DestDir: "{app}\wxPython\lib"; Compo
 Source: "wxPython\lib\editor\*.py";         DestDir: "{app}\wxPython\lib\editor"; Components: core
 Source: "wxPython\lib\editor\*.txt";        DestDir: "{app}\wxPython\lib\editor"; Components: core
 Source: "wxPython\lib\mixins\*.py";         DestDir: "{app}\wxPython\lib\mixins"; Components: core
+Source: "wxPython\lib\PyCrust\*.py";        DestDir: "{app}\wxPython\lib\PyCrust"; Components: core
+Source: "wxPython\lib\PyCrust\*.txt";       DestDir: "{app}\wxPython\lib\PyCrust"; Components: core
+Source: "wxPython\lib\PyCrust\*.ico";       DestDir: "{app}\wxPython\lib\PyCrust"; Components: core
 
 Source: "demo\*.py";                        DestDir: "{app}\wxPython\demo"; Components: demo
 Source: "demo\*.xml";                       DestDir: "{app}\wxPython\demo"; Components: demo
@@ -167,6 +171,8 @@ Type: files; Name: "{app}\wxPython\demo\*.pyo";
 Type: files; Name: "{app}\wxPython\demo\data\showTips";
 Type: files; Name: "{app}\wxPython\tools\*.pyc";
 Type: files; Name: "{app}\wxPython\tools\*.pyo";
+Type: files; Name: "{app}\wxPython\tools\XRCed\*.pyc";
+Type: files; Name: "{app}\wxPython\tools\XRCed\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\doodle\*.pyc";
 Type: files; Name: "{app}\wxPython\samples\doodle\*.pyo";
 Type: files; Name: "{app}\wxPython\samples\wxProject\*.pyc";
@@ -204,7 +210,7 @@ begin
 
             MsgBox('No installation of Python %(PYTHONVER)s found.\nBe sure to enter a pathname that places wxPython\non the PYTHONPATH',
                    mbConfirmation, MB_OK);
-            PythonDir := 'C:\Put a directory on PYTHONPATH here\wxPython';
+            PythonDir := 'C:\Put a directory on PYTHONPATH here\';
         end;
     end;
     Result := true;