+ Moved IDLE from the "tools" component to the main component.

+ Ditto pydoc.
  (IMO, both should have been done long ago -- simply didn't occur to
   me before)
+ Build the summary text into a vrbl instead of a temp file.  Doh!  Less
  fiddling, and should avoid another class of Win2K permission problems.
Bug:  the "auto vertical scrollbar" control on the summary page doesn't
work (never creates a scrollbar, no matter how much text).  So forced a
vertical scrollbar there.

1 files changed, 88 insertions, 99 deletions

diff --git a/PCbuild/python20.wse b/PCbuild/python20.wse
index 0d7ec09..439a94e 100644
--- a/PCbuild/python20.wse
+++ b/PCbuild/python20.wse
@@ -248,7 +248,7 @@ item: Remark
   Text=COMPONENTS values:
 end
 item: Remark
-  Text=A: interpreter, libraries and Tcl/Tk
+  Text=A: interpreter, libraries and IDLE
 end
 item: Remark
   Text=B: docs
@@ -280,20 +280,6 @@ item: Set Variable
 end
 item: End Block
 end
-item: Remark
-end
-item: Remark
-  Text=Get a temp file, into which we'll write the summary for the "Start Installation" screen.
-end
-item: Get Temporary Filename
-  Variable=TEMPFILE
-end
-item: Set Variable
-  Variable=TEMPFILE
-  Value=%TEMP%\%TEMPFILE%
-end
-item: Remark
-end
 item: Wizard Block
   Direction Variable=DIRECTION
   Display Variable=DISPLAY
@@ -762,7 +748,7 @@ item: Custom Dialog Set
       Variable=COMPONENTS
       Create Flags=01010000000000010000000000000011
       Flags=0000000000000110
-      Text=Python interpreter, library and Tcl/Tk
+      Text=Python interpreter, library and IDLE
       Text=Python HTML docs
       Text=Python utility scripts (Tools/)
       Text=Python test suite (Lib/test/)
@@ -1004,10 +990,10 @@ item: Custom Dialog Set
     end
     item: Editbox
       Rectangle=86 54 259 175
-      Value=%TEMPFILE%
       Help Context=16711681
       Enabled Color=00000000000000001111111111111111
       Create Flags=01010000101000000001100010000100
+      Text=%SUMMARY%
     end
   end
 end
@@ -1023,7 +1009,7 @@ item: Remark
   Text=ElseIf we just finished "Select Program Manager Group":
 end
 item: Remark
-  Text=    "Start Installation" is next, so write out the choices to a file for "Start Installation" to display.
+  Text=    "Start Installation" is next, so build a summary for "Start Installation" to display.
 end
 item: Remark
 end
@@ -1041,55 +1027,51 @@ item: ElseIf Statement
   Variable=DISPLAY
   Value=Select Program Manager Group
 end
-item: Delete File
-  Pathname=%TEMPFILE%
-end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=Installation directory%CRLF%    %MAINDIR%
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=Installation directory%CRLF%    %MAINDIR%%CRLF%
 end
 item: Remark
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=%CRLF%Make backups?
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=%CRLF%Make backups?%CRLF%
+  Flags=00000001
 end
 item: If/While Statement
   Variable=DOBACKUP
   Value=A
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=    Yes, into %BACKUP%
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=    Yes, into %BACKUP%%CRLF%
+  Flags=00000001
 end
 item: Else Statement
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=    No
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=    No%CRLF%
+  Flags=00000001
 end
 item: End Block
 end
 item: Remark
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=%CRLF%Components
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=%CRLF%Components%CRLF%
+  Flags=00000001
 end
 item: If/While Statement
   Variable=COMPONENTS
   Value=A
   Flags=00000010
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=    Python interpreter, libraries, and Tcl/Tk
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=    Python interpreter, libraries and IDLE%CRLF%
+  Flags=00000001
 end
 item: End Block
 end
@@ -1098,10 +1080,10 @@ item: If/While Statement
   Value=B
   Flags=00000010
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=    Python documentation
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=    Python documentation%CRLF%
+  Flags=00000001
 end
 item: End Block
 end
@@ -1110,10 +1092,10 @@ item: If/While Statement
   Value=C
   Flags=00000010
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=    Tool and utility scripts
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=    Tool and utility scripts%CRLF%
+  Flags=00000001
 end
 item: End Block
 end
@@ -1122,10 +1104,10 @@ item: If/While Statement
   Value=D
   Flags=00000010
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=    Python test suite
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=    Python test suite%CRLF%
+  Flags=00000001
 end
 item: End Block
 end
@@ -1134,19 +1116,19 @@ item: If/While Statement
   Value=E
   Flags=00000010
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=    Register file extensions
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=    Register file extensions%CRLF%
+  Flags=00000001
 end
 item: End Block
 end
 item: Remark
 end
-item: Insert Line into Text File
-  Pathname=%TEMPFILE%
-  New Text=%CRLF%Start Menu group%CRLF%    %GROUP%
-  Line Number=0
+item: Set Variable
+  Variable=SUMMARY
+  Value=%CRLF%Start Menu group%CRLF%    %GROUP%%CRLF%
+  Flags=00000001
 end
 item: End Block
 end
@@ -1373,7 +1355,7 @@ end
 item: Remark
 end
 item: Remark
-  Text=A: interpreter, libraries and Tcl/Tk
+  Text=A: interpreter, libraries and IDLE
 end
 item: If/While Statement
   Variable=COMPONENTS
@@ -1722,6 +1704,46 @@ end
 item: Remark
 end
 item: Remark
+  Text=IDLE
+end
+item: Install File
+  Source=..\tools\idle\*.py
+  Destination=%MAINDIR%\Tools\idle
+  Description=Integrated DeveLopment Environment for Python
+  Flags=0000000000000010
+end
+item: Install File
+  Source=..\tools\idle\*.txt
+  Destination=%MAINDIR%\Tools\idle
+  Description=Integrated DeveLopment Environment for Python
+  Flags=0000000000000010
+end
+item: Install File
+  Source=..\tools\idle\icons\*
+  Destination=%MAINDIR%\Tools\idle\Icons
+  Description=Integrated DeveLopment Environment for Python
+  Flags=0000000000000010
+end
+item: Install File
+  Source=..\tools\idle\idle.pyw
+  Destination=%MAINDIR%\Tools\idle\idle.pyw
+  Description=IDLE bootstrap script
+  Flags=0000000000000010
+end
+item: Remark
+end
+item: Remark
+  Text=Windows pydoc driver
+end
+item: Install File
+  Source=..\tools\scripts\pydoc.pyw
+  Destination=%MAINDIR%\Tools\Scripts\pydoc.pyw
+  Description=Windows pydoc driver
+  Flags=0000000000000010
+end
+item: Remark
+end
+item: Remark
   Text=Microsoft C runtime libraries
 end
 item: Install File
@@ -1821,32 +1843,6 @@ end
 item: Remark
 end
 item: Install File
-  Source=..\tools\idle\*.py
-  Destination=%MAINDIR%\Tools\idle
-  Description=Integrated DeveLopment Environment for Python
-  Flags=0000000000000010
-end
-item: Install File
-  Source=..\tools\idle\*.txt
-  Destination=%MAINDIR%\Tools\idle
-  Description=Integrated DeveLopment Environment for Python
-  Flags=0000000000000010
-end
-item: Install File
-  Source=..\tools\idle\icons\*
-  Destination=%MAINDIR%\Tools\idle\Icons
-  Description=Integrated DeveLopment Environment for Python
-  Flags=0000000000000010
-end
-item: Install File
-  Source=..\tools\idle\idle.pyw
-  Destination=%MAINDIR%\Tools\idle\idle.pyw
-  Description=IDLE bootstrap script
-  Flags=0000000000000010
-end
-item: Remark
-end
-item: Install File
   Source=..\tools\compiler\*.py
   Destination=%MAINDIR%\Tools\compiler
   Description=Python compiler written in Python
@@ -2283,11 +2279,6 @@ item: Create Shortcut
   Key Type=1536
   Flags=00000001
 end
-item: If/While Statement
-  Variable=COMPONENTS
-  Value=C
-  Flags=00001010
-end
 item: Create Shortcut
   Source=%MAINDIR%\pythonw.exe
   Destination=%GROUP%\IDLE (Python GUI).lnk
@@ -2306,8 +2297,6 @@ item: Create Shortcut
 end
 item: End Block
 end
-item: End Block
-end
 item: Remark
 end
 item: Create Shortcut