[Python-checkins] CVS: python/dist/src/PCbuild python20.wse,1.69,1.70
Tim Peters
tim_one@users.sourceforge.net
2001年8月04日 16:23:29 -0700
Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv32574
Modified Files:
python20.wse
Log Message:
+ Add version info to Win2K add/remove.
+ Fiddle vrbls so Win2K add/remove can display version w/o future manual
script fiddling.
+ Break apart the mysterious wizard-generated Win2K "Edit 3 Registry Keys"
script items by hand into 3 separate items, so you can see what the heck
they're doing in the script view.
+ pydoc.pyw was a problem: it's installed by both the Main and Tools
components. So when both were selected, the second time it got
installed Wise figured it was overwriting a pre-existing version, and
made a backup copy in BACKUP. A rollback-uninstall then restored that,
leaving the Tools/Scripts/ directory non-empty, and so Wise couldn't
remove that directory (or any above it). Fixed by installing pydoc.pyw
at most once.
+ Rearranged and commented the "register file extensions" section, because
it was confusing and needs more work: turns out it's not true that
Win2K requires Admin privs to register file extensions, BUT, if you
don't have Admin privs, Win2K requires a new way to register file
extensions, and a way that doesn't blow up but doesn't do any good either
on earlier Windows flavors. I think I know how to get this done, but am
too depressed to do it right now <0.7 wink>.
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** python20.wse 2001年08月03日 19:04:13 1.69
--- python20.wse 2001年08月04日 23:23:27 1.70
***************
*** 13,17 ****
Message Font=MS Sans Serif
Font Size=8
! Pages Modified=00010000011101000000000100000010
Extra Pages=00000000000000000000000010110010
Disk Filename=SETUP
--- 13,17 ----
Message Font=MS Sans Serif
Font Size=8
! Pages Modified=00010000011101000000000100000011
Extra Pages=00000000000000000000000010110010
Disk Filename=SETUP
***************
*** 55,60 ****
end
item: Set Variable
! Variable=APPTITLE
! Value=Python 2.2a1
end
item: Remark
--- 55,60 ----
end
item: Set Variable
! Variable=PYVER_STRING
! Value=2.2a1
end
item: Remark
***************
*** 73,77 ****
end
item: Remark
! Text= The APPTITLE setting above.
end
item: Remark
--- 73,77 ----
end
item: Remark
! Text= PYVER_STRING above.
end
item: Remark
***************
*** 86,89 ****
--- 86,93 ----
item: Remark
end
+ item: Set Variable
+ Variable=APPTITLE
+ Value=Python %PYVER_STRING%
+ end
item: Remark
Text=PY_VERSION should be major.minor only; used to create the registry key; must match MS_DLL_ID in python_nt.rc
***************
*** 755,759 ****
Text=Register file extensons (requires Admin privs)
Text=
! Text French=Python interpreter, library and Tcl/Tk
Text French=Python HTML docs
Text French=Python utility scripts (Tools/)
--- 759,763 ----
Text=Register file extensons (requires Admin privs)
Text=
! Text French=Python interpreter, library and IDLE
Text French=Python HTML docs
Text French=Python utility scripts (Tools/)
***************
*** 761,765 ****
Text French=Register file extensons (requires Admin privs)
Text French=
! Text German=Python interpreter, library and Tcl/Tk
Text German=Python HTML docs
Text German=Python utility scripts (Tools/)
--- 765,769 ----
Text French=Register file extensons (requires Admin privs)
Text French=
! Text German=Python interpreter, library and IDLE
Text German=Python HTML docs
Text German=Python utility scripts (Tools/)
***************
*** 767,771 ****
Text German=Register file extensons (requires Admin privs)
Text German=
! Text Spanish=Python interpreter, library and Tcl/Tk
Text Spanish=Python HTML docs
Text Spanish=Python utility scripts (Tools/)
--- 771,775 ----
Text German=Register file extensons (requires Admin privs)
Text German=
! Text Spanish=Python interpreter, library and IDLE
Text Spanish=Python HTML docs
Text Spanish=Python utility scripts (Tools/)
***************
*** 773,777 ****
Text Spanish=Register file extensons (requires Admin privs)
Text Spanish=
! Text Italian=Python interpreter, library and Tcl/Tk
Text Italian=Python HTML docs
Text Italian=Python utility scripts (Tools/)
--- 777,781 ----
Text Spanish=Register file extensons (requires Admin privs)
Text Spanish=
! Text Italian=Python interpreter, library and IDLE
Text Italian=Python HTML docs
Text Italian=Python utility scripts (Tools/)
***************
*** 1737,1742 ****
end
item: Install File
! Source=..\tools\scripts\pydoc.pyw
! Destination=%MAINDIR%\Tools\Scripts\pydoc.pyw
Description=Windows pydoc driver
Flags=0000000000000010
--- 1741,1746 ----
end
item: Install File
! Source=..\tools\scripts\*.pyw
! Destination=%MAINDIR%\Tools\Scripts
Description=Windows pydoc driver
Flags=0000000000000010
***************
*** 1796,1800 ****
end
item: Install File
! Source=..\tools\scripts\*.pyw
Destination=%MAINDIR%\Tools\Scripts
Description=Utility Scripts
--- 1800,1804 ----
end
item: Install File
! Source=..\tools\scripts\*.doc
Destination=%MAINDIR%\Tools\Scripts
Description=Utility Scripts
***************
*** 1802,1816 ****
end
item: Install File
! Source=..\tools\scripts\*.doc
! Destination=%MAINDIR%\Tools\Scripts
Description=Utility Scripts
Flags=0000000000000010
end
item: Install File
! Source=..\tools\scripts\readme
! Destination=%MAINDIR%\Tools\Scripts\README.txt
Description=Utility Scripts
Flags=0000000000000010
end
item: Remark
end
--- 1806,1832 ----
end
item: Install File
! Source=..\tools\scripts\readme
! Destination=%MAINDIR%\Tools\Scripts\README.txt
Description=Utility Scripts
Flags=0000000000000010
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
***************
*** 1951,1955 ****
end
item: Remark
! Text=The rest is Start menu and registry fiddling.
end
item: Remark
--- 1967,1971 ----
end
item: Remark
! Text=The rest is registry and Start Menu fiddling.
end
item: Remark
***************
*** 1961,1964 ****
--- 1977,1983 ----
end
item: Remark
+ Text=Register file extensions.
+ end
+ item: Remark
Text=Registering file extensions requires Admin privs.
end
***************
*** 1969,1984 ****
end
item: Remark
! Text=Register file extensions.
! end
! item: Edit Registry
! Total Keys=1
! Key=.py
! New Value=Python.File
! end
! item: Edit Registry
! Total Keys=1
! Key=.py
! New Value=text/plain
! Value Name=Content Type
end
item: Edit Registry
--- 1988,1992 ----
end
item: Remark
! Text=File types.
end
item: Edit Registry
***************
*** 1996,2010 ****
Key=Python.File\DefaultIcon
New Value=%MAINDIR%\Py.ico
- end
- item: Edit Registry
- Total Keys=1
- Key=.pyw
- New Value=Python.NoConFile
end
! item: Edit Registry
! Total Keys=1
! Key=.pyw
! New Value=text/plain
! Value Name=Content Type
end
item: Edit Registry
--- 2004,2009 ----
Key=Python.File\DefaultIcon
New Value=%MAINDIR%\Py.ico
end
! item: Remark
end
item: Edit Registry
***************
*** 2023,2035 ****
New Value=%MAINDIR%\Py.ico
end
! item: Edit Registry
! Total Keys=1
! Key=.pyc
! New Value=Python.CompiledFile
! end
! item: Edit Registry
! Total Keys=1
! Key=.pyo
! New Value=Python.CompiledFile
end
item: Edit Registry
--- 2022,2026 ----
New Value=%MAINDIR%\Py.ico
end
! item: Remark
end
item: Edit Registry
***************
*** 2048,2051 ****
--- 2039,2083 ----
New Value=%MAINDIR%\pyc.ico
end
+ item: Remark
+ end
+ item: Remark
+ Text=File extensions.
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=.py
+ New Value=Python.File
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=.py
+ New Value=text/plain
+ Value Name=Content Type
+ end
+ item: Remark
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=.pyw
+ New Value=Python.NoConFile
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=.pyw
+ New Value=text/plain
+ Value Name=Content Type
+ end
+ item: Remark
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=.pyc
+ New Value=Python.CompiledFile
+ end
+ item: Edit Registry
+ Total Keys=1
+ Key=.pyo
+ New Value=Python.CompiledFile
+ end
item: End Block
end
***************
*** 2142,2145 ****
--- 2174,2180 ----
Text=Registry fiddling for docs.
end
+ item: Remark
+ Text=Write to HKLM for admin, else HKCU. Keep these blocks otherwise identical!
+ end
item: If/While Statement
Variable=COMPONENTS
***************
*** 2147,2153 ****
Flags=00001010
end
- item: Remark
- Text=Write to HKLM for admin, else HKCU. Keep these blocks otherwise identical!
- end
item: Check Configuration
Flags=10111111
--- 2182,2185 ----
***************
*** 2174,2246 ****
end
item: Remark
! Text=Well, *this* is cryptic! It's setting up the app publisher and URL entries for Win2K add/remove.
end
item: Remark
! Text=Ack, and "Win2K" isn't enough either -- you can't actually do this without Admin privs too.
end
item: Check Configuration
Flags=10111111
end
item: Edit Registry
! Total Keys=3
! item: Key
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=HelpLink
! Root=2
! end
! item: Key
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=PythonLabs at Zope Corporation
! Value Name=Publisher
! Root=2
! end
! item: Key
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=URLInfoAbout
! Root=2
! end
end
! item: Else Statement
end
! item: Remark
! Text=Same thing, except write to HKCU instead.
end
! item: Remark
! Text=Damn -- this "edit keys" cmd was created by the Installation Expert view, and I duplicated and
end
! item: Remark
! Text=edited it by hand. The info comes from the "Windows 2000" section of the Properties view,
end
! item: Remark
! Text=and if you change it there it will only show up in the "if" block above.
end
! item: Remark
! Text=Easiest to make corresponding changes in *this* block by editing this script in
end
! item: Remark
! Text=a plain text editor.
end
item: Edit Registry
! Total Keys=3
! item: Key
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=HelpLink
! Root=1
! end
! item: Key
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=PythonLabs at Zope Corporation
! Value Name=Publisher
! Root=1
! end
! item: Key
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=URLInfoAbout
! Root=1
! end
end
item: End Block
--- 2206,2283 ----
end
item: Remark
! Text=Set the app publisher and URL entries for Win2K add/remove.
end
item: Remark
! Text=It doesn't hurt on other systems.
! end
! item: Remark
! Text=As usual, write to HKLM or HKCU depending on Admin privs.
end
+ item: Remark
+ Text=CAUTION: If you set this info on the "Windows 2000" page (step 6) of the
+ end
+ item: Remark
+ Text=Installation Expert, it only shows up in the "If" block below. Keep in synch!
+ end
item: Check Configuration
Flags=10111111
end
item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=HelpLink
! Root=2
end
! item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=PythonLabs at Zope Corporation
! Value Name=Publisher
! Root=2
end
! item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=URLInfoAbout
! Root=2
end
! item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=%PYVER_STRING%
! Value Name=DisplayVersion
! Root=2
end
! item: Else Statement
end
! item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=HelpLink
! Root=1
end
! item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=PythonLabs at Zope Corporation
! Value Name=Publisher
! Root=1
end
! item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=http://www.python.org/
! Value Name=URLInfoAbout
! Root=1
end
item: Edit Registry
! Total Keys=1
! Key=Software\Microsoft\Windows\CurrentVersion\Uninstall\%APPTITLE%
! New Value=%PYVER_STRING%
! Value Name=DisplayVersion
! Root=1
end
item: End Block
***************
*** 2250,2253 ****
--- 2287,2292 ----
item: Remark
Text=Populate Start Menu
+ end
+ item: Remark
end
item: If/While Statement