[Python-checkins] CVS: python/dist/src/PCbuild python20.wse,1.73,1.74
Tim Peters
tim_one@users.sourceforge.net
2001年8月05日 06:58:51 -0700
Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv6871
Modified Files:
python20.wse
Log Message:
+ Made installer more reluctant to overwrite MS C runtime DLLs -- it's
been overwriting them even if they have the same version, not just if
they're an older version (and our installers have always done this).
+ Added an "Advanced Options" subdialog to "Select Components". Allows
to do a non-admin install even if you have Administrator rights, and
to skip registering file extensions and/or creating Start Menu
shortcuts. Since so far these installers have been tested only by me,
and Win2K has been full of surprises, I want those options available
out in the field.
Lots of web searching turned up what should have been obvious: Because
Windows Installer is a native Win2K service, it can run at a higher
privilege level than the user invoking it. So MSI installs don't bash
into these permission gotchas on Win2K, but Wise 8.1 does (it's just
another app to Win2K, and we're not alone in wrestling with this; but,
like changing int division in Python, Win2K is doing a right thing <wink>).
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** python20.wse 2001年08月05日 05:43:20 1.73
--- python20.wse 2001年08月05日 13:58:48 1.74
***************
*** 26,30 ****
Version Company=PythonLabs at Zope Corporation
Crystal Format=10111100101100000010001001001001
! Step View=&All
Variable Name1=_WISE_
Variable Description1=WISE root directory
--- 26,30 ----
Version Company=PythonLabs at Zope Corporation
Crystal Format=10111100101100000010001001001001
! Step View=&Properties
Variable Name1=_WISE_
Variable Description1=WISE root directory
***************
*** 264,270 ****
end
item: Remark
! Text=March thru the user GUI.
end
item: Remark
Text=COMPONENTS values:
end
--- 264,301 ----
end
item: Remark
! Text=Set vrbls for the "Advanced Options" subdialog of Components.
! end
! item: Set Variable
! Variable=SELECT_ADMIN
! Value=A
! end
! item: If/While Statement
! Variable=DOADMIN
! Value=0
! end
! item: Set Variable
! Variable=SELECT_ADMIN
! Value=B
! end
! item: End Block
! end
! item: Remark
end
item: Remark
+ Text=TASKS values:
+ end
+ item: Remark
+ Text=A: Register file extensions
+ end
+ item: Remark
+ Text=B: Create Start Menu shortcuts
+ end
+ item: Set Variable
+ Variable=TASKS
+ Value=AB
+ end
+ item: Remark
+ end
+ item: Remark
Text=COMPONENTS values:
end
***************
*** 285,288 ****
--- 316,324 ----
Value=ABCD
end
+ item: Remark
+ end
+ item: Remark
+ Text=March thru the user GUI.
+ end
item: Wizard Block
Direction Variable=DIRECTION
***************
*** 292,295 ****
--- 328,347 ----
Y Position=10
Filler Color=8421440
+ Dialog=Select Destination Directory
+ Dialog=Backup Replaced Files
+ Dialog=Select Components
+ Dialog=Select Program Manager Group
+ Variable=
+ Variable=
+ Variable=
+ Variable=TASKS
+ Value=
+ Value=
+ Value=
+ Value=B
+ Compare=0
+ Compare=0
+ Compare=0
+ Compare=3
Flags=00000011
end
***************
*** 305,310 ****
end
item: If/While Statement
! Variable=DOADMIN
! Value=1
end
item: Set Variable
--- 357,362 ----
end
item: If/While Statement
! Variable=SELECT_ADMIN
! Value=A
end
item: Set Variable
***************
*** 399,402 ****
--- 451,480 ----
item: Remark
end
+ item: If/While Statement
+ Variable=TASKS
+ Value=A
+ Flags=00000010
+ end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%Register file extensions.%CRLF%
+ Flags=00000001
+ end
+ item: Else Statement
+ end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%Don't register file extensions.%CRLF%
+ Flags=00000001
+ end
+ item: End Block
+ end
+ item: Remark
+ end
+ item: If/While Statement
+ Variable=TASKS
+ Value=B
+ Flags=00000010
+ end
item: Set Variable
Variable=SUMMARY
***************
*** 404,407 ****
--- 482,494 ----
Flags=00000001
end
+ item: Else Statement
+ end
+ item: Set Variable
+ Variable=SUMMARY
+ Value=%CRLF%No Start Menu shortcuts.%CRLF%
+ Flags=00000001
+ end
+ item: End Block
+ end
item: End Block
end
***************
*** 845,867 ****
Text Italian=&Annulla
end
- item: Static
- Rectangle=8 180 256 181
- Action=3
- Create Flags=01010000000000000000000000000111
- end
- item: Static
- Rectangle=86 8 258 42
- Create Flags=01010000000000000000000000000000
- Flags=0000000000000001
- Name=Times New Roman
- Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
- Text=Select Components
- Text French=S駘ectionner les composants
- Text German=Komponenten ausw臧len
- Text Spanish=Seleccione componentes
- Text Italian=Selezionare i componenti
- end
item: Checkbox
! Rectangle=86 62 256 134
Variable=COMPONENTS
Create Flags=01010000000000010000000000000011
--- 932,937 ----
Text Italian=&Annulla
end
item: Checkbox
! Rectangle=86 55 250 127
Variable=COMPONENTS
Create Flags=01010000000000010000000000000011
***************
*** 898,902 ****
end
item: Static
! Rectangle=194 162 242 172
Variable=COMPONENTS
Value=MAINDIR
--- 968,1006 ----
end
item: Static
! Rectangle=86 36 256 53
! Create Flags=01010000000000000000000000000000
! Text=Choose which components to install by checking the boxes below.
! Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.
! Text German=W臧len Sie die zu installierenden Komponenten, indem Sie in die entsprechenden K舖tchen klicken.
! Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.
! Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.
! end
! item: Push Button
! Rectangle=150 162 215 176
! Destination Dialog=1
! Action=2
! Enabled Color=00000000000000000000000011111111
! Create Flags=01010000000000010000000000000000
! Text=Advanced Options ...
! end
! item: Static
! Rectangle=8 180 256 181
! Action=3
! Create Flags=01010000000000000000000000000111
! end
! item: Static
! Rectangle=86 8 258 34
! Create Flags=01010000000000000000000000000000
! Flags=0000000000000001
! Name=Times New Roman
! Font Style=-24 0 0 0 700 255 0 0 0 3 2 1 18
! Text=Select Components
! Text French=S駘ectionner les composants
! Text German=Komponenten ausw臧len
! Text Spanish=Seleccione componentes
! Text Italian=Selezionare i componenti
! end
! item: Static
! Rectangle=201 144 249 154
Variable=COMPONENTS
Value=MAINDIR
***************
*** 904,913 ****
end
item: Static
! Rectangle=194 153 242 162
Variable=COMPONENTS
Create Flags=01010000000000000000000000000010
end
item: Static
! Rectangle=107 153 196 164
Create Flags=01010000000000000000000000000000
Text=Disk Space Required:
--- 1008,1017 ----
end
item: Static
! Rectangle=201 134 249 143
Variable=COMPONENTS
Create Flags=01010000000000000000000000000010
end
item: Static
! Rectangle=98 134 187 145
Create Flags=01010000000000000000000000000000
Text=Disk Space Required:
***************
*** 918,922 ****
end
item: Static
! Rectangle=107 162 196 172
Create Flags=01010000000000000000000000000000
Text=Disk Space Remaining:
--- 1022,1026 ----
end
item: Static
! Rectangle=98 144 187 154
Create Flags=01010000000000000000000000000000
Text=Disk Space Remaining:
***************
*** 927,943 ****
end
item: Static
! Rectangle=86 145 256 175
Action=1
Create Flags=01010000000000000000000000000111
end
item: Static
! Rectangle=86 38 256 57
Create Flags=01010000000000000000000000000000
! Text=Choose which components to install by checking the boxes below.
! Text French=Choisissez les composants que vous voulez installer en cochant les cases ci-dessous.
! Text German=W臧len Sie die zu installierenden Komponenten, indem Sie in die entsprechenden K舖tchen klicken.
! Text Spanish=Elija los componentes que desee instalar marcando los cuadros de abajo.
! Text Italian=Scegliere quali componenti installare selezionando le caselle sottostanti.
end
end
end
--- 1031,1125 ----
end
item: Static
! Rectangle=86 126 256 157
Action=1
Create Flags=01010000000000000000000000000111
end
+ end
+ item: Dialog
+ Title=Advanced Options
+ Width=271
+ Height=186
+ Font Name=Helv
+ Font Size=8
+ item: Radio Button
+ Control Name=ADMIN2
+ Rectangle=9 47 72 73
+ Variable=SELECT_ADMIN
+ Enabled Color=00000000000000001111111111111111
+ Create Flags=01010000000000010000000000001001
+ Text=Admin install
+ Text=Non-Admin installl
+ Text=
+ end
+ item: Push Button
+ Rectangle=150 152 195 167
+ Variable=DIRECTION
+ Value=N
+ Create Flags=01010000000000010000000000000001
+ Text=OK
+ Text French=&Suite >
+ Text German=&Weiter >
+ Text Spanish=&Siguiente >
+ Text Italian=&Avanti >
+ end
item: Static
! Rectangle=4 2 261 76
! Action=1
! Enabled Color=00000000000000001111111111111111
! Create Flags=01010000000000000000000000000111
! end
! item: Static
! Control Name=ADMIN1
! Rectangle=9 9 257 42
! Enabled Color=00000000000000001111111111111111
Create Flags=01010000000000000000000000000000
! Text=By default, the install records settings in the per-machine area of the registry (HKLM), and installs the Python and C runtime DLLs to the system directory. Choose "Non-Admin install" if you would prefer settings made in the per-user registry (HKCU), and DLLs installed in %MAINDIR%.
! end
! item: Static
! Rectangle=4 82 261 144
! Action=1
! Enabled Color=00000000000000001111111111111111
! Create Flags=01010000000000000000000000000111
end
+ item: Checkbox
+ Rectangle=9 105 194 134
+ Variable=TASKS
+ Enabled Color=00000000000000001111111111111111
+ Create Flags=01010000000000010000000000000011
+ Text=Register file extensions (.py, .pyw, .pyo, .pyc)
+ Text=Create Start Menu shortcuts
+ Text=
+ end
+ item: Static
+ Rectangle=9 90 256 105
+ Enabled Color=00000000000000001111111111111111
+ Create Flags=01010000000000000000000000000000
+ Text=Choose tasks to perform by checking the boxes below.
+ end
+ item: If/While Statement
+ Variable=DLG_EVENT_TYPE
+ Value=INIT
+ end
+ item: If/While Statement
+ Variable=DOADMIN
+ Value=1
+ end
+ item: Set Control Attribute
+ Control Name=ADMIN2
+ end
+ item: Else Statement
+ end
+ item: Set Control Text
+ Control Name=ADMIN1
+ Control Text=This section is available only if logged in to an account with Administrator privileges.
+ end
+ item: Set Control Attribute
+ Control Name=ADMIN2
+ Operation=1
+ end
+ item: End Block
+ end
+ item: End Block
+ end
end
end
***************
*** 1298,1301 ****
--- 1480,1516 ----
item: Remark
end
+ item: If/While Statement
+ Variable=SELECT_ADMIN
+ Value=B
+ end
+ item: Remark
+ Text=The user chose a non-admin install in "Advanced Options".
+ end
+ item: Remark
+ Text=This should come after the include of Uninstal.wse above, because
+ end
+ item: Remark
+ Text=writing uninstall info to HKCU is ineffective except under Win2K.
+ end
+ item: Set Variable
+ Variable=DOADMIN
+ Value=0
+ end
+ item: End Block
+ end
+ item: Remark
+ end
+ item: If/While Statement
+ Variable=TASKS
+ Value=B
+ Flags=00000011
+ end
+ item: Set Variable
+ Variable=GROUP
+ end
+ item: End Block
+ end
+ item: Remark
+ end
item: Remark
Text=Long section to install files.
***************
*** 1361,1365 ****
Variable=COMPONENTS
Value=A
! Flags=00001010
end
item: Remark
--- 1576,1580 ----
Variable=COMPONENTS
Value=A
! Flags=00000010
end
item: Remark
***************
*** 1740,1744 ****
Destination=%DLLDEST%\MSVCIRT.DLL
Description=Visual C++ Runtime DLLs
! Flags=0000001000000011
end
item: Install File
--- 1955,1959 ----
Destination=%DLLDEST%\MSVCIRT.DLL
Description=Visual C++ Runtime DLLs
! Flags=0000011000010011
end
item: Install File
***************
*** 1746,1750 ****
Destination=%DLLDEST%\MSVCRT.DLL
Description=Visual C++ Runtime DLLs
! Flags=0000001000000011
end
item: End Block
--- 1961,1965 ----
Destination=%DLLDEST%\MSVCRT.DLL
Description=Visual C++ Runtime DLLs
! Flags=0000011000010011
end
item: End Block
***************
*** 1758,1762 ****
Variable=COMPONENTS
Value=B
! Flags=00001010
end
item: Install File
--- 1973,1977 ----
Variable=COMPONENTS
Value=B
! Flags=00000010
end
item: Install File
***************
*** 1776,1780 ****
Variable=COMPONENTS
Value=C
! Flags=00001010
end
item: Install File
--- 1991,1995 ----
Variable=COMPONENTS
Value=C
! Flags=00000010
end
item: Install File
***************
*** 1886,1890 ****
Variable=COMPONENTS
Value=D
! Flags=00001010
end
item: Install File
--- 2101,2105 ----
Variable=COMPONENTS
Value=D
! Flags=00000010
end
item: Install File
***************
*** 1959,1964 ****
Variable=COMPONENTS
Value=A
! Flags=00001010
end
item: Remark
Text=Register file extensions. As usual, Admin privs get in the way, but with a twist:
--- 2174,2184 ----
Variable=COMPONENTS
Value=A
! Flags=00000010
end
+ item: If/While Statement
+ Variable=TASKS
+ Value=A
+ Flags=00000010
+ end
item: Remark
Text=Register file extensions. As usual, Admin privs get in the way, but with a twist:
***************
*** 2201,2204 ****
--- 2421,2426 ----
item: End Block
end
+ item: End Block
+ end
item: Remark
end
***************
*** 2300,2304 ****
Variable=COMPONENTS
Value=B
! Flags=00001010
end
item: If/While Statement
--- 2522,2526 ----
Variable=COMPONENTS
Value=B
! Flags=00000010
end
item: If/While Statement
***************
*** 2410,2419 ****
Text=Populate Start Menu group
end
! item: Remark
end
item: If/While Statement
Variable=COMPONENTS
Value=B
! Flags=00001010
end
item: Create Shortcut
--- 2632,2644 ----
Text=Populate Start Menu group
end
! item: If/While Statement
! Variable=TASKS
! Value=B
! Flags=00000010
end
item: If/While Statement
Variable=COMPONENTS
Value=B
! Flags=00000010
end
item: Create Shortcut
***************
*** 2431,2435 ****
Variable=COMPONENTS
Value=A
! Flags=00001010
end
item: Create Shortcut
--- 2656,2660 ----
Variable=COMPONENTS
Value=A
! Flags=00000010
end
item: Create Shortcut
***************
*** 2467,2470 ****
--- 2692,2697 ----
Key Type=1536
Flags=00000001
+ end
+ item: End Block
end
item: Remark