[Python-checkins] CVS: python/dist/src/PCbuild python20.wse,1.68,1.69

Tim Peters tim_one@users.sourceforge.net
Fri, 03 Aug 2001 12:04:15 -0700


Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv16830

Modified Files:
	python20.wse 
Log Message:
+ 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.


Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -d -r1.68 -r1.69
*** python20.wse	2001/08/03 11:11:35	1.68
--- python20.wse	2001/08/03 19:04:13	1.69
***************
*** 249,253 ****
  end
  item: Remark
!   Text=A: interpreter, libraries and Tcl/Tk
  end
  item: Remark
--- 249,253 ----
  end
  item: Remark
!   Text=A: interpreter, libraries and IDLE
  end
  item: Remark
***************
*** 281,298 ****
  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
--- 281,284 ----
***************
*** 763,767 ****
        Create Flags=01010000000000010000000000000011
        Flags=0000000000000110
!       Text=Python interpreter, library and Tcl/Tk
        Text=Python HTML docs
        Text=Python utility scripts (Tools/)
--- 749,753 ----
        Create Flags=01010000000000010000000000000011
        Flags=0000000000000110
!       Text=Python interpreter, library and IDLE
        Text=Python HTML docs
        Text=Python utility scripts (Tools/)
***************
*** 1005,1012 ****
      item: Editbox
        Rectangle=86 54 259 175
-       Value=%TEMPFILE%
        Help Context=16711681
        Enabled Color=00000000000000001111111111111111
        Create Flags=01010000101000000001100010000100
      end
    end
--- 991,998 ----
      item: Editbox
        Rectangle=86 54 259 175
        Help Context=16711681
        Enabled Color=00000000000000001111111111111111
        Create Flags=01010000101000000001100010000100
+       Text=%SUMMARY%
      end
    end
***************
*** 1024,1028 ****
  end
  item: Remark
!   Text=    "Start Installation" is next, so write out the choices to a file for "Start Installation" to display.
  end
  item: Remark
--- 1010,1014 ----
  end
  item: Remark
!   Text=    "Start Installation" is next, so build a summary for "Start Installation" to display.
  end
  item: Remark
***************
*** 1042,1059 ****
    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
  end
  item: Remark
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=%CRLF%Make backups?
!   Line Number=0
  end
  item: If/While Statement
--- 1028,1041 ----
    Value=Select Program Manager Group
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=Installation directory%CRLF%    %MAINDIR%%CRLF%
  end
  item: Remark
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=%CRLF%Make backups?%CRLF%
!   Flags=00000001
  end
  item: If/While Statement
***************
*** 1061,1075 ****
    Value=A
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=    Yes, into %BACKUP%
!   Line Number=0
  end
  item: Else Statement
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=    No
!   Line Number=0
  end
  item: End Block
--- 1043,1057 ----
    Value=A
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=    Yes, into %BACKUP%%CRLF%
!   Flags=00000001
  end
  item: Else Statement
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=    No%CRLF%
!   Flags=00000001
  end
  item: End Block
***************
*** 1077,1084 ****
  item: Remark
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=%CRLF%Components
!   Line Number=0
  end
  item: If/While Statement
--- 1059,1066 ----
  item: Remark
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=%CRLF%Components%CRLF%
!   Flags=00000001
  end
  item: If/While Statement
***************
*** 1087,1094 ****
    Flags=00000010
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=    Python interpreter, libraries, and Tcl/Tk
!   Line Number=0
  end
  item: End Block
--- 1069,1076 ----
    Flags=00000010
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=    Python interpreter, libraries and IDLE%CRLF%
!   Flags=00000001
  end
  item: End Block
***************
*** 1099,1106 ****
    Flags=00000010
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=    Python documentation
!   Line Number=0
  end
  item: End Block
--- 1081,1088 ----
    Flags=00000010
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=    Python documentation%CRLF%
!   Flags=00000001
  end
  item: End Block
***************
*** 1111,1118 ****
    Flags=00000010
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=    Tool and utility scripts
!   Line Number=0
  end
  item: End Block
--- 1093,1100 ----
    Flags=00000010
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=    Tool and utility scripts%CRLF%
!   Flags=00000001
  end
  item: End Block
***************
*** 1123,1130 ****
    Flags=00000010
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=    Python test suite
!   Line Number=0
  end
  item: End Block
--- 1105,1112 ----
    Flags=00000010
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=    Python test suite%CRLF%
!   Flags=00000001
  end
  item: End Block
***************
*** 1135,1142 ****
    Flags=00000010
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=    Register file extensions
!   Line Number=0
  end
  item: End Block
--- 1117,1124 ----
    Flags=00000010
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=    Register file extensions%CRLF%
!   Flags=00000001
  end
  item: End Block
***************
*** 1144,1151 ****
  item: Remark
  end
! item: Insert Line into Text File
!   Pathname=%TEMPFILE%
!   New Text=%CRLF%Start Menu group%CRLF%    %GROUP%
!   Line Number=0
  end
  item: End Block
--- 1126,1133 ----
  item: Remark
  end
! item: Set Variable
!   Variable=SUMMARY
!   Value=%CRLF%Start Menu group%CRLF%    %GROUP%%CRLF%
!   Flags=00000001
  end
  item: End Block
***************
*** 1374,1378 ****
  end
  item: Remark
!   Text=A: interpreter, libraries and Tcl/Tk
  end
  item: If/While Statement
--- 1356,1360 ----
  end
  item: Remark
!   Text=A: interpreter, libraries and IDLE
  end
  item: If/While Statement
***************
*** 1723,1726 ****
--- 1705,1748 ----
  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
***************
*** 1822,1851 ****
  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
--- 1844,1847 ----
***************
*** 2284,2292 ****
    Flags=00000001
  end
- item: If/While Statement
-   Variable=COMPONENTS
-   Value=C
-   Flags=00001010
- end
  item: Create Shortcut
    Source=%MAINDIR%\pythonw.exe
--- 2280,2283 ----
***************
*** 2304,2309 ****
    Key Type=1536
    Flags=00000001
- end
- item: End Block
  end
  item: End Block
--- 2295,2298 ----