Upgraded to WISE 5.0g; bumped to 1.5.2b2; added dialog for Tcl.

diff --git a/PCbuild/python15.wse b/PCbuild/python15.wse
index b6089cd918453b2ba04b4da749325717555ee995..826238d9dac85c059b356966cccb7336cc0735f5 100644 (file)
--- a/PCbuild/python15.wse
+++ b/PCbuild/python15.wse
@@ -1,14 +1,14 @@
 Document Type: WSE\r
 item: Global\r
   Version=5.0\r
-  Title=Python 1.5.2b1\r
+  Title=Python 1.5.2b2\r
   Flags=00010100\r
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0\r
   Japanese Font Name=MS Gothic\r
   Japanese Font Size=10\r
   Start Gradient=0 0 255\r
   End Gradient=0 0 0\r
-  Windows Flags=00000000000010010010110000001000\r
+  Windows Flags=00000100000010010010110100001000\r
   Log Pathname=%MAINDIR%\INSTALL.LOG\r
   Message Font=MS Sans Serif\r
   Font Size=8\r
@@ -17,21 +17,15 @@ item: Global
   Patch Threshold=85\r
   Patch Memory=4000\r
   Variable Name1=_SYS_\r
-  Variable Default1=D:\NT\System32\r
+  Variable Default1=C:\WINNT\System32\r
   Variable Flags1=00001000\r
-  Variable Name2=_ODBC16_\r
-  Variable Default2=D:\NT\System32\r
+  Variable Name2=_WISE_\r
+  Variable Default2=C:\Program Files\Wise\r
   Variable Flags2=00001000\r
-  Variable Name3=_ODBC32_\r
-  Variable Default3=D:\NT\System32\r
-  Variable Flags3=00001000\r
-  Variable Name4=_WISE_\r
-  Variable Default4=C:\Program Files\Wise\r
-  Variable Flags4=00001000\r
-  Variable Name5=_SRC_\r
-  Variable Description5=Root of Python Build Tree\r
-  Variable Default5=D:\src\Python-1.5\r
-  Variable Flags5=00001001\r
+  Variable Name3=_SRC_\r
+  Variable Description3=Root of Python Build Tree\r
+  Variable Default3=D:\src\Python-1.5\r
+  Variable Flags3=00001001\r
 end\r
 item: Open/Close INSTALL.LOG\r
   Flags=00000001\r
@@ -55,7 +49,7 @@ item: Check Configuration
 end\r
 item: Set Variable\r
   Variable=APPTITLE\r
-  Value=Python 1.5.2b1\r
+  Value=Python 1.5.2b2\r
 end\r
 item: Set Variable\r
   Variable=GROUP\r
@@ -202,7 +196,7 @@ item: Custom Dialog Set
       Create Flags=01010000000000000000000000000000\r
       Text=This installation program will install %APPTITLE% on your system.\r
       Text=\r
-      Text=Press the Next button to start the installation. You can press the Exit Setup button now if you do not want to install the %APPTITLE% at this time.\r
+      Text=Press the Next button to start the installation. You can press the Exit Setup button now if you do not want to install %APPTITLE% at this time.\r
       Text French=Ce programme d'installation va installer %APPTITLE%.\r
       Text French=\r
       Text French=Cliquez sur le bouton Suite pour démarrer l'installation. Vous pouvez cliquer sur le bouton Quitter l'installation si vous ne voulez pas installer %APPTITLE% tout de suite.\r
@@ -799,13 +793,13 @@ item: Install File
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=c:\winnt\system32\MSVCIRT.DLL\r
+  Source=%_SYS_%\MSVCIRT.DLL\r
   Destination=%SYS32%\MSVCIRT.DLL\r
   Description=Visual C++ Runtime DLLs\r
   Flags=0000001000000011\r
 end\r
 item: Install File\r
-  Source=c:\winnt\system32\MSVCRT.DLL\r
+  Source=%_SYS_%\MSVCRT.DLL\r
   Destination=%SYS32%\MSVCRT.DLL\r
   Description=Visual C++ Runtime DLLs\r
   Flags=0000001000000011\r
@@ -872,7 +866,7 @@ item: Install File
   Flags=0000000000000010\r
 end\r
 item: Install File\r
-  Source=%_SRC_%\Tools\idle\README\r
+  Source=%_SRC_%\Tools\idle\README.txt\r
   Destination=%MAINDIR%\Tools\idle\README.txt\r
   Description=IDLE read-me file\r
   Flags=0000000000000010\r
@@ -985,96 +979,118 @@ item: Add Text to INSTALL.LOG
   Text=File Tree: %MAINDIR%\Lib\*.*\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=.py\r
   New Value=Python.File\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=.py\r
   New Value=text/plain\r
   Value Name=Content Type\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.File\r
   New Value=Python File\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.File\shell\open\command\r
   New Value=%MAINDIR%\python.exe "%%1" %%*\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.File\DefaultIcon\r
   New Value=%MAINDIR%\Py.ico\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=.pyw\r
   New Value=Python.NoConFile\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=.pyw\r
   New Value=text/plain\r
   Value Name=Content Type\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.NoConFile\r
   New Value=Python File (no console)\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.NoConFile\shell\open\command\r
   New Value=%MAINDIR%\pythonw.exe "%%1" %%*\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.NoConFile\DefaultIcon\r
   New Value=%MAINDIR%\Py.ico\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=.pyc\r
   New Value=Python.CompiledFile\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=.pyo\r
   New Value=Python.CompiledFile\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.CompiledFile\r
   New Value=Compiled Python File\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.CompiledFile\shell\open\command\r
   New Value=%MAINDIR%\python.exe "%%1" %%*\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Python.CompiledFile\DefaultIcon\r
   New Value=%MAINDIR%\pyc.ico\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Python\PythonCore\CurrentVersion\r
   Root=130\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\r
   New Value=%MAINDIR%\r
   Root=2\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Python\PythonCore\%PY_VERSION%\InstallPath\InstallGroup\r
   New Value=%GROUP%\r
   Root=2\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Python\PythonCore\%PY_VERSION%\PythonPath\r
   New Value=%MAINDIR%\Lib\plat-win;%MAINDIR%\Lib;%MAINDIR%\DLLs;%MAINDIR%\Lib\lib-tk\r
   Root=2\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Python\PythonCore\%PY_VERSION%\Dll\r
   New Value=%SYS32%\Python15.dll\r
   Root=2\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Python\PythonCore\%PY_VERSION%\Modules\r
   Root=2\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Python.exe\r
   New Value=%MAINDIR%\Python.exe\r
   Root=2\r
@@ -1087,6 +1103,7 @@ item: If/While Statement
   Flags=00001010\r
 end\r
 item: Edit Registry\r
+  Total Keys=1\r
   Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation\r
   New Value=%MAINDIR%\Doc\index.html\r
   Root=2\r
@@ -1189,6 +1206,17 @@ item: If/While Statement
   Value=E\r
   Flags=00001010\r
 end\r
+item: Display Message\r
+  Title=Install Tcl/Tk?\r
+  Text=Python can now run the Tcl/Tk installer.\r
+  Text=\r
+  Text=This is needed if you want to use Tkinter or IDLE. If you don't want to install Tcl/Tk, or already have Tcl/Tk installed, simply hit No.\r
+  Text=\r
+  Text=After the Tcl/Tk installer is finished, you will be presented with the final panel of the Python installation.\r
+  Text=\r
+  Text=Do you want to install Tcl/Tk now?\r
+  Flags=00100001\r
+end\r
 item: Install File\r
   Source=D:\downloads\tcl804.exe\r
   Destination=%TEMP%\tcl804.exe\r
@@ -1203,6 +1231,8 @@ item: Execute Program
 end\r
 item: End Block\r
 end\r
+item: End Block\r
+end\r
 item: Wizard Block\r
   Direction Variable=DIRECTION\r
   Display Variable=DISPLAY\r