Add the new Tools/compiler/README to the WIndows install, as README.txt.

In the Wise installer's "Advanced Options" dialog, substitute in the
actual name of "the system directory" -- this is clearer, and especially
for people reading this dialog who aren't me <wink>.

diff --git a/PCbuild/python.iss b/PCbuild/python.iss
index e42fa10a4bbfc435c23ed21991bfaa2730a812b5..479f5bf75ebaec7e3ed4b92f1cb3863cb070e417 100644 (file)
--- a/PCbuild/python.iss
+++ b/PCbuild/python.iss
@@ -189,9 +189,10 @@ Source: Tools\idle\idle.pyw;  DestDir: "{app}\Tools\idle";       CopyMode: alway
 Source: Tools\idle\*.txt;     DestDir: "{app}\Tools\idle";       CopyMode: alwaysoverwrite; Components: tools
 Source: Tools\idle\Icons\*.*; DestDir: "{app}\Tools\idle\Icons"; CopyMode: alwaysoverwrite; Components: tools
 
-Source: Tools\compiler\*.py;           DestDir: "{app}\Tools\compiler";          CopyMode: alwaysoverwrite; Components: tools
-Source: Tools\compiler\compiler\*.py;  DestDir: "{app}\Tools\compiler\compiler"; CopyMode: alwaysoverwrite; Components: tools
-Source: Tools\compiler\compiler\*.txt; DestDir: "{app}\Tools\compiler\compiler"; CopyMode: alwaysoverwrite; Components: tools
+Source: Tools\compiler\*.py;           DestDir: "{app}\Tools\compiler";                       CopyMode: alwaysoverwrite; Components: tools
+Source: Tools\compiler\README;         DestDir: "{app}\Tools\compiler"; DestName: README.txt; CopyMode: alwaysoverwrite; Components: tools
+Source: Tools\compiler\compiler\*.py;  DestDir: "{app}\Tools\compiler\compiler";              CopyMode: alwaysoverwrite; Components: tools
+Source: Tools\compiler\compiler\*.txt; DestDir: "{app}\Tools\compiler\compiler";              CopyMode: alwaysoverwrite; Components: tools
 
 Source: Tools\pynche\*.py;       DestDir: "{app}\Tools\pynche";   CopyMode: alwaysoverwrite; Components: tools
 Source: Tools\pynche\pynche.pyw; DestDir: "{app}\Tools\pynche";   CopyMode: alwaysoverwrite; Components: tools

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index c7bfb1e8a9777d99a2fac62dfa8e8aa5e143f729..51382cbcbc37eb5f74ab628c1d9f9d63a9c99e53 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1069,7 +1069,7 @@ item: Custom Dialog Set
       Rectangle=9 9 257 42
       Enabled Color=00000000000000001111111111111111
       Create Flags=01010000000000000000000000000000
-      Text=By default, the install records settings in the per-machine area of the registry (HKLM), and installs the Python and C runtime DLLs to the system directory.  Choose "Non-Admin install" if you would prefer settings made in the per-user registry (HKCU), and DLLs installed in %MAINDIR%.
+      Text=By default, the install records settings in the per-machine area of the registry (HKLM), and installs the Python and C runtime DLLs to %SYS32%.  Choose "Non-Admin install" if you would prefer settings made in the per-user registry (HKCU), and DLLs installed in %MAINDIR%.
     end
     item: Static
       Rectangle=4 82 261 144
@@ -2049,6 +2049,12 @@ item: Install File
   Description=Python compiler written in Python
   Flags=0000000000000010
 end
+item: Install File
+  Source=..\tools\compiler\README
+  Destination=%MAINDIR%\Tools\compiler\README.txt
+  Description=Python compiler written in Python
+  Flags=0000000000000010
+end
 item: Install File
   Source=..\tools\compiler\compiler\*.py
   Destination=%MAINDIR%\Tools\compiler\compiler