Changes for Python 2.3.1 release.

- Install docs in one HTMLHelp file, no longer lots of html pages
- Can optionally compile Python library modules to .pyc
- Remove the thanks to Wise Solutions for InstallMaster 8.1, since it is
  no longer used to create the installer.

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 5ab12f1af19b5ab4fb48a5276fa75460d3f86fba..e78f3d62bfe4736f1b9ea1112ea6f858f62b618d 100644 (file)
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -1,7 +1,7 @@
 Document Type: WSE
 item: Global
-  Version=8.14
-  Title=Python 2.3
+  Version=9.0
+  Title=Python 2.3.1
   Flags=00010100
   Languages=65 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
   Japanese Font Name=MS Gothic
@@ -18,17 +18,19 @@ item: Global
   Patch Flags=0000000000001001
   Patch Threshold=85
   Patch Memory=4000
-  EXE Filename=Python-2.3.exe
+  MIF PDF Version=1.0
+  MIF SMS Version=2.0
+  EXE Filename=Python-2.3.1.exe
   Dialogs Version=8
-  Version File=2.3
+  Version File=2.3.1
   Version Description=Python Programming Language
   Version Copyright=©2001-2003 Python Software Foundation
   Version Company=PythonLabs at Zope Corporation
   Crystal Format=10111100101100000010001001001001
-  Step View=&All
+  Step View=&Properties
   Variable Name1=_WISE_
   Variable Description1=WISE root directory
-  Variable Default1=C:\PROGRAM FILES\WISE INSTALLMASTER 8.1
+  Variable Default1=C:\Programme\Wise Installation System
   Variable Flags1=00001000
   Variable Name2=_TCLDIR_
   Variable Description2=The directory in which the Tcl/Tk installation
@@ -38,14 +40,15 @@ item: Global
   Variable Flags2=00001000
   Variable Name3=_DOC_
   Variable Description3=The unpacked HTML doc directory.
-  Variable Default3=..\html
+  Variable Default3=..\chm
   Variable Flags3=00001001
   Variable Name4=_SYS_
   Variable Description4=System directory (where to find MSVCRT.DLL)
-  Variable Default4=C:\Windows\System
+  Variable Default4=C:\Windows\System32
   Variable Values4=C:\Windows\System
   Variable Values4=C:\WINNT\System32
   Variable Values4=C:\Code\MSDLLs
+  Variable Values4=C:\Windows\System32
   Variable Flags4=00000010
   Variable Name5=_PYMAJOR_
   Variable Description5=Python major version number; the 2 in 2.3.
@@ -64,10 +67,16 @@ item: Global
   Variable Values7=1
   Variable Values7=0
   Variable Flags7=00001010
+  Variable Name8=_ALIASNAME_
+  Variable Flags8=00001000
+  Variable Name9=_ALIASPATH_
+  Variable Flags9=00001000
+  Variable Name10=_ALIASTYPE_
+  Variable Flags10=00001000
 end
 item: Set Variable
   Variable=PYVER_STRING
-  Value=2.3
+  Value=2.3.1
 end
 item: Remark
 end
@@ -310,6 +319,9 @@ end
 item: Remark
   Text=B: Create Start Menu shortcuts
 end
+item: Remark
+  Text=C: Compile Python library files
+end
 item: Set Variable
   Variable=TASKS
   Value=AB
@@ -506,21 +518,33 @@ item: End Block
 end
 item: Remark
 end
+item: Set Variable
+  Variable=SUMMARY
+  Value=%CRLF%Start Menu group:  %GROUP%%CRLF%
+  Flags=00000001
+end
 item: If/While Statement
   Variable=TASKS
   Value=B
   Flags=00000010
 end
+item: Else Statement
+end
 item: Set Variable
   Variable=SUMMARY
-  Value=%CRLF%Start Menu group:  %GROUP%%CRLF%
+  Value=%CRLF%No Start Menu shortcuts.%CRLF%
   Flags=00000001
 end
-item: Else Statement
+item: End Block
+end
+item: If/While Statement
+  Variable=TASKS
+  Value=C
+  Flags=00000010
 end
 item: Set Variable
   Variable=SUMMARY
-  Value=%CRLF%No Start Menu shortcuts.%CRLF%
+  Value=%CRLF%Compile Python files%CRLF%
   Flags=00000001
 end
 item: End Block
@@ -973,7 +997,7 @@ item: Custom Dialog Set
       Flags=0000000000000110
       Text=Python interpreter and libraries
       Text=Tcl/Tk (Tkinter, IDLE, pydoc)
-      Text=Python HTML docs
+      Text=Python HTMLHelp file
       Text=Python utility scripts (Tools/)
       Text=Python test suite (Lib/test/)
       Text=
@@ -1163,6 +1187,7 @@ item: Custom Dialog Set
       Create Flags=01010000000000010000000000000011
       Text=Register file extensions (.py, .pyw, .pyc, .pyo)
       Text=Create Start Menu shortcuts
+      Text=Compile Python files to .pyc
       Text=
     end
     item: Static
@@ -2195,10 +2220,10 @@ item: If/While Statement
   Flags=00000010
 end
 item: Install File
-  Source=%_DOC_%\*.*
-  Destination=%MAINDIR%\Doc
-  Description=Python Documentation (HTML)
-  Flags=0000000100000010
+  Source=%_DOC_%\Python%_PYMAJOR_%%_PYMINOR_%.chm
+  Destination=%MAINDIR%\Doc\Python%_PYMAJOR_%%_PYMINOR_%.chm
+  Description=Python Documentation (HTMLHelp)
+  Flags=0000000000000010
 end
 item: End Block
 end
@@ -2794,7 +2819,8 @@ end
 item: Edit Registry
   Total Keys=1
   Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation
-  New Value=%MAINDIR%\Doc\index.html
+  New Value=%MAINDIR%\Doc\Python%_PYMAJOR_%%_PYMINOR_%.chm
+  New Value=
   Root=2
 end
 item: Else Statement
@@ -2802,7 +2828,8 @@ end
 item: Edit Registry
   Total Keys=1
   Key=Software\Python\PythonCore\%PY_VERSION%\Help\Main Python Documentation
-  New Value=%MAINDIR%\Doc\index.html
+  New Value=%MAINDIR%\Doc\Python%_PYMAJOR_%%_PYMINOR_%.chm
+  New Value=
   Root=1
 end
 item: End Block
@@ -2974,7 +3001,7 @@ item: If/While Statement
   Flags=00000010
 end
 item: Create Shortcut
-  Source=%MAINDIR%\Doc\index.html
+  Source=%MAINDIR%\Doc\Python%_PYMAJOR_%%_PYMINOR_%.chm
   Destination=%GROUP%\Python Manuals.lnk
   Working Directory=%MAINDIR%
   Key Type=1536
@@ -2994,6 +3021,43 @@ item: Self-Register OCXs/DLLs
 end
 item: Remark
 end
+item: Remark
+  Text=Compile to .pyc
+end
+item: If/While Statement
+  Variable=TASKS
+  Value=C
+  Flags=00000010
+end
+item: Custom Script Item
+  Filename=Display Progress Message.wse
+  Variable Name1=_CENTER_
+  Variable Value1=AB
+  Variable Name2=_WIDTH_
+  Variable Value2=320
+  Variable Name3=_MSG_TITLE_
+  Variable Value3=Compiling Python files
+  Variable Name4=HELPFILE
+  Variable Value4=C:\Programme\Wise for Windows Installer\HELP\Express.chm
+  Variable Name5=_OPTION_
+  Variable Value5=B
+  Variable Name6=_Y_POS_
+  Variable Name7=_MSG_TEXT_
+  Variable Value7=Please wait while Python modules are compiled
+  Variable Name8=_HEIGHT_
+  Variable Value8=80
+  Variable Name9=_X_POS_
+end
+item: Execute Program
+  Pathname=%MAINDIR%\Python.exe
+  Command Line=%MAINDIR%\Lib\compileall.py -f -x .*\\Lib\\test.* %MAINDIR%\Lib
+  Default Directory=%MAINDIR%\Lib
+  Flags=00000010
+end
+item: End Block
+end
+item: Remark
+end
 remarked item: Remark
   Text=Don't enable "Delete in-use files".  Here's what happens:
 end
@@ -3095,9 +3159,6 @@ item: Custom Dialog Set
       Create Flags=01010000000000000000000000000000
       Text=Special Windows thanks to:
       Text=
-      Text=Wise Solutions, for the use of InstallMaster 8.1.
-      Text=    http://www.wisesolutions.com/
-      Text=
       Text=
       Text=LettError, Erik van Blokland, for the Python for Windows graphic.
       Text=    http://www.letterror.com/