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

Tim Peters tim_one@users.sourceforge.net
2001年8月04日 22:19:17 -0700

• Previous message: [Python-checkins] CVS: python/dist/src/PCbuild Uninstal.wse,1.3,1.4 python20.wse,1.70,1.71
• Next message: [Python-checkins] CVS: python/dist/src/PCbuild python20.wse,1.72,1.73
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

---

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv23786
Modified Files:
	python20.wse 
Log Message:
+ Redid file associations on Win2K in what I believe is "the right way".
 Can't test it until getting to a Win2K box, because the non-Admin way
 of setting file associations on Win2K doesn't work on any other flavor
 of Windows (and other flavors of Windows never need Admin privs to
 do it the old way).
+ Consequently got rid of the "Register file associations" Component and
 associated GUI.
+ Added a line to the summary saying whether or not this is an Admin-level
 install (I fear that will be an important clue someday).
+ Minor fiddling to the summary to reduce the # of lines. Added a
 horizontal scrollbar in case the install path is very long.
+ Reworked the way the Main and Tools components share pydoc.pyw; cleaner
 and simpler.
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** python20.wse	2001年08月05日 04:12:30	1.71
--- python20.wse	2001年08月05日 05:19:15	1.72
***************
*** 26,30 ****
 Version Company=PythonLabs at Zope Corporation
 Crystal Format=10111100101100000010001001001001
! Step View=&Properties
 Variable Name1=_WISE_
 Variable Description1=WISE root directory
--- 26,30 ----
 Version Company=PythonLabs at Zope Corporation
 Crystal Format=10111100101100000010001001001001
! Step View=&All
 Variable Name1=_WISE_
 Variable Description1=WISE root directory
***************
*** 281,286 ****
 Text=D: test suite
 end
 item: Remark
- Text=E: register file extensions (requires Admin privs)
 end
 item: If/While Statement
--- 281,306 ----
 Text=D: test suite
 end
+ item: Set Variable
+ Variable=COMPONENTS
+ Value=ABCD
+ end
+ item: Wizard Block
+ Direction Variable=DIRECTION
+ Display Variable=DISPLAY
+ Bitmap Pathname=%_WISE_%\Dialogs\Template\Wizard.bmp
+ X Position=9
+ Y Position=10
+ Filler Color=8421440
+ Flags=00000011
+ end
+ item: If/While Statement
+ Variable=DISPLAY
+ Value=Start Installation
+ end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=Install directory: %MAINDIR%%CRLF%
+ end
 item: Remark
 end
 item: If/While Statement
***************
*** 289,315 ****
 end
 item: Set Variable
! Variable=COMPONENTS
! Value=ABCDE
 end
 item: Else Statement
 end
 item: Remark
- Text=Lowercase E grays out the "register file extension" choice.
 end
 item: Set Variable
 Variable=COMPONENTS
! Value=ABCDe
 end
 item: End Block
 end
! item: Wizard Block
! Direction Variable=DIRECTION
! Display Variable=DISPLAY
! Bitmap Pathname=%_WISE_%\Dialogs\Template\Wizard.bmp
! X Position=9
! Y Position=10
! Filler Color=8421440
! Flags=00000011
 end
 item: Custom Dialog Set
 Name=Select Destination Directory
--- 309,411 ----
 end
 item: Set Variable
! Variable=SUMMARY
! Value=%CRLF%Doing admin install.%CRLF%
! Flags=00000001
 end
 item: Else Statement
 end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%Doing non-admin install.%CRLF%
+ Flags=00000001
+ end
+ item: End Block
+ end
 item: Remark
 end
+ item: If/While Statement
+ Variable=DOBACKUP
+ Value=A
+ end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%Make backups, into %BACKUP%%CRLF%
+ Flags=00000001
+ end
+ item: Else Statement
+ end
 item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%Don't make backups.%CRLF%
+ Flags=00000001
+ end
+ item: End Block
+ end
+ item: Remark
+ end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%Components:%CRLF%
+ Flags=00000001
+ end
+ item: If/While Statement
 Variable=COMPONENTS
! Value=A
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Python interpreter, libraries and IDLE%CRLF%
! Flags=00000001
 end
 item: End Block
 end
! item: If/While Statement
! Variable=COMPONENTS
! Value=B
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Python documentation%CRLF%
! Flags=00000001
! end
! item: End Block
! end
! item: If/While Statement
! Variable=COMPONENTS
! Value=C
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Tool and utility scripts%CRLF%
! Flags=00000001
! end
! item: End Block
! end
! item: If/While Statement
! Variable=COMPONENTS
! Value=D
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Python test suite%CRLF%
! Flags=00000001
 end
+ item: End Block
+ end
+ item: Remark
+ end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%Start Menu group: %GROUP%%CRLF%
+ Flags=00000001
+ end
+ item: End Block
+ end
+ item: Remark
+ end
 item: Custom Dialog Set
 Name=Select Destination Directory
***************
*** 775,779 ****
 Text=Python utility scripts (Tools/)
 Text=Python test suite (Lib/test/)
- Text=Register file extensons (requires Admin privs)
 Text=
 Text French=Python interpreter, library and IDLE
--- 871,874 ----
***************
*** 1015,1019 ****
 Help Context=16711681
 Enabled Color=00000000000000001111111111111111
! Create Flags=01010000101000000001100010000100
 Text=%SUMMARY%
 end
--- 1110,1114 ----
 Help Context=16711681
 Enabled Color=00000000000000001111111111111111
! Create Flags=01010000101100000001100000000100
 Text=%SUMMARY%
 end
***************
*** 1022,1146 ****
 item: Remark
 end
- item: Remark
- Text=If we just finished "Select Destination Directory":
- end
- item: Remark
- Text= %MAINDIR% is set, so reinitialize %BACKUP% to match.
- end
- item: Remark
- Text=ElseIf we just finished "Select Program Manager Group":
- end
- item: Remark
- Text= "Start Installation" is next, so build a summary for "Start Installation" to display.
- end
- item: Remark
- end
 item: If/While Statement
 Variable=DISPLAY
 Value=Select Destination Directory
 end
- item: Set Variable
- Variable=BACKUP
- Value=%MAINDIR%\BACKUP
- end
- item: Remark
- end
- item: ElseIf Statement
- Variable=DISPLAY
- 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
- Variable=DOBACKUP
- 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
- end
 item: Remark
! end
! item: Set Variable
! Variable=SUMMARY
! Value=%CRLF%Components%CRLF%
! Flags=00000001
! end
! item: If/While Statement
! Variable=COMPONENTS
! Value=A
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Python interpreter, libraries and IDLE%CRLF%
! Flags=00000001
! end
! item: End Block
! end
! item: If/While Statement
! Variable=COMPONENTS
! Value=B
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Python documentation%CRLF%
! Flags=00000001
! end
! item: End Block
! end
! item: If/While Statement
! Variable=COMPONENTS
! Value=C
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Tool and utility scripts%CRLF%
! Flags=00000001
! end
! item: End Block
! end
! item: If/While Statement
! Variable=COMPONENTS
! Value=D
! Flags=00000010
! end
! item: Set Variable
! Variable=SUMMARY
! Value= Python test suite%CRLF%
! Flags=00000001
! end
! item: End Block
! end
! item: If/While Statement
! Variable=COMPONENTS
! Value=E
! Flags=00000010
 end
 item: Set Variable
! Variable=SUMMARY
! Value= Register file extensions%CRLF%
! Flags=00000001
 end
 item: End Block
--- 1117,1130 ----
 item: Remark
 end
 item: If/While Statement
 Variable=DISPLAY
 Value=Select Destination Directory
 end
 item: Remark
! Text=User may have changed MAINDIR, so reset BACKUP to match.
 end
 item: Set Variable
! Variable=BACKUP
! Value=%MAINDIR%\BACKUP
 end
 item: End Block
***************
*** 1148,1160 ****
 item: Remark
 end
- item: Set Variable
- Variable=SUMMARY
- Value=%CRLF%Start Menu group%CRLF% %GROUP%%CRLF%
- Flags=00000001
- end
 item: End Block
 end
- item: End Block
- end
 item: Remark
 end
--- 1132,1137 ----
***************
*** 1757,1771 ****
 end
 item: Remark
- Text=Windows pydoc driver
- end
- item: Install File
- Source=..\tools\scripts\*.pyw
- Destination=%MAINDIR%\Tools\Scripts
- Description=Windows pydoc driver
- Flags=0000000000000010
- end
- item: Remark
- end
- item: Remark
 Text=Microsoft C runtime libraries
 end
--- 1734,1737 ----
***************
*** 1831,1854 ****
 end
 item: Remark
- Text=*.pyw is installed by the main component; if we install it twice, a copy gets made
- end
- item: Remark
- Text= in BACKUP, and then a rollback-uninstall will copy back the first one.
- end
- item: Check if File/Dir Exists
- Pathname=%MAINDIR%\Tools\Scripts\pydoc.pyw
- Flags=00000101
 end
 item: Install File
- Source=..\tools\scripts\*.pyw
- Destination=%MAINDIR%\Tools\Scripts
- Description=Utility Scripts
- Flags=0000000000000010
- end
- item: End Block
- end
- item: Remark
- end
- item: Install File
 Source=..\tools\webchecker\*.py
 Destination=%MAINDIR%\Tools\webchecker
--- 1797,1802 ----
***************
*** 1983,1986 ****
--- 1931,1952 ----
 end
 item: Remark
+ Text=Windows pydoc driver
+ end
+ item: If/While Statement
+ Variable=COMPONENTS
+ Value=AC
+ Flags=00001010
+ end
+ item: Install File
+ Source=..\tools\scripts\*.pyw
+ Destination=%MAINDIR%\Tools\Scripts
+ Description=Windows pydoc driver
+ Flags=0000000000000010
+ end
+ item: End Block
+ end
+ item: Remark
+ end
+ item: Remark
 Text=DONE with file copying.
 end
***************
*** 1996,2008 ****
 end
 item: Remark
! Text=Register file extensions.
 end
 item: Remark
! Text=Registering file extensions requires Admin privs.
 end
 item: If/While Statement
! Variable=COMPONENTS
! Value=E
! Flags=00001010
 end
 item: Remark
--- 1962,1998 ----
 end
 item: Remark
! Text=Register file extensions. As usual, Admin privs get in the way, but with a twist:
 end
 item: Remark
! Text=You don't need admin privs to write to HKEY_CLASSES_ROOT *except* under Win2K.
! end
! item: Remark
! Text=On Win2K, a user without Admin privs has to register extensions under HKCU\Software\CLASSES instead.
 end
+ item: Remark
+ Text=But while you can *do* that under other flavors of Windows too, it has no useful effect except in Win2K.
+ end
+ item: Set Variable
+ Variable=USE_HKCR
+ Value=1
+ end
+ item: Check Configuration
+ Flags=11110010
+ end
 item: If/While Statement
! Variable=DOADMIN
! Value=0
! end
! item: Set Variable
! Variable=USE_HKCR
! Value=0
! end
! item: End Block
! end
! item: End Block
! end
! item: If/While Statement
! Variable=USE_HKCR
! Value=1
 end
 item: Remark
***************
*** 2098,2101 ****
--- 2088,2201 ----
 Key=.pyo
 New Value=Python.CompiledFile
+ end
+ item: Else Statement
+ end
+ item: Remark
+ Text=File types.
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.File
+ New Value=Python File
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.File\shell\open\command
+ New Value=%MAINDIR%\python.exe "%%1" %%*
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.File\DefaultIcon
+ New Value=%MAINDIR%\Py.ico
+ Root=1
+ end
+ item: Remark
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.NoConFile
+ New Value=Python File (no console)
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.NoConFile\shell\open\command
+ New Value=%MAINDIR%\pythonw.exe "%%1" %%*
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.NoConFile\DefaultIcon
+ New Value=%MAINDIR%\Py.ico
+ Root=1
+ end
+ item: Remark
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.CompiledFile
+ New Value=Compiled Python File
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.CompiledFile\shell\open\command
+ New Value=%MAINDIR%\python.exe "%%1" %%*
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\Python.CompiledFile\DefaultIcon
+ New Value=%MAINDIR%\pyc.ico
+ Root=1
+ end
+ item: Remark
+ end
+ item: Remark
+ Text=File extensions.
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\.py
+ New Value=Python.File
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\.py
+ New Value=text/plain
+ Value Name=Content Type
+ Root=1
+ end
+ item: Remark
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\.pyw
+ New Value=Python.NoConFile
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\.pyw
+ New Value=text/plain
+ Value Name=Content Type
+ Root=1
+ end
+ item: Remark
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\.pyc
+ New Value=Python.CompiledFile
+ Root=1
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=Software\CLASSES\.pyo
+ New Value=Python.CompiledFile
+ Root=1
 end
 item: End Block

---

• Previous message: [Python-checkins] CVS: python/dist/src/PCbuild Uninstal.wse,1.3,1.4 python20.wse,1.70,1.71
• Next message: [Python-checkins] CVS: python/dist/src/PCbuild python20.wse,1.72,1.73
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]