[Python-checkins] CVS: python/dist/src/PCbuild Uninstal.wse,1.3,1.4 python20.wse,1.70,1.71

2001年8月04日 21:12:32 -0700

Update of /cvsroot/python/python/dist/src/PCbuild
In directory usw-pr-cvs1:/tmp/cvs-serv14318
Modified Files:
	Uninstal.wse python20.wse 
Log Message:
New runtime vrbl DOADMIN. When false, we never try to write under HKLM,
and install the Python and MS runtime DLLs into the Python dir instead of
a system dir.
Initial value is taken from new compiler vrbl _DOADMIN_ (default true),
and forced to false if the user doesn't have admin privs.
This makes it possible to *test* non-admin installs on machines where the
distinction doesn't exist (like my home box), via just changing _DOADMIN_.
It may also be useful for users who don't *want* an installer to
scribble into their system dir (for example, me(! most days)), but that
would require adding more GUI to let them get at it.
Index: Uninstal.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/Uninstal.wse,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Uninstal.wse	2001年08月01日 18:42:54	1.3
--- Uninstal.wse	2001年08月05日 04:12:30	1.4
***************
*** 26,30 ****
 end
 item: Remark
! Text=uninstall info under HKCU instead of HKLM if the user doesn't have Admin privs.
 end
 item: Remark
--- 26,30 ----
 end
 item: Remark
! Text=uninstall info under HKCU instead of HKLM if our DOADMIN var is false.
 end
 item: Remark
***************
*** 434,439 ****
 Flags=10111011
 end
! item: Check Configuration
! Flags=10111111
 end
 item: Remark
--- 434,440 ----
 Flags=10111011
 end
! item: If/While Statement
! Variable=DOADMIN
! Value=1
 end
 item: Remark
Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** python20.wse	2001年08月04日 23:23:27	1.70
--- python20.wse	2001年08月05日 04:12:30	1.71
***************
*** 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
***************
*** 53,56 ****
--- 53,65 ----
 Variable Default6=2
 Variable Flags6=00001000
+ Variable Name7=_DOADMIN_
+ Variable Description7=The initial value for %DOADMIN%.
+ Variable Description7=When 0, we never try to write under HKLM,
+ Variable Description7=and install the Python + MS runtime DLLs in
+ Variable Description7=the Python directory instead of the system dir.
+ Variable Default7=1
+ Variable Values7=1
+ Variable Values7=0
+ Variable Flags7=00001010
 end
 item: Set Variable
***************
*** 114,117 ****
--- 123,130 ----
 item: Remark
 end
+ item: Set Variable
+ Variable=DOADMIN
+ Value=%_DOADMIN_%
+ end
 item: Remark
 Text=Give non-admin users a chance to abort.
***************
*** 120,123 ****
--- 133,140 ----
 Flags=10011111
 end
+ item: Set Variable
+ Variable=DOADMIN
+ Value=0
+ end
 item: Display Message
 Title=Doing non-admin install
***************
*** 267,272 ****
 Text=E: register file extensions (requires Admin privs)
 end
! item: Check Configuration
! Flags=10111111
 end
 item: Set Variable
--- 284,290 ----
 Text=E: register file extensions (requires Admin privs)
 end
! item: If/While Statement
! Variable=DOADMIN
! Value=1
 end
 item: Set Variable
***************
*** 1308,1313 ****
 item: Remark
 end
! item: Check Configuration
! Flags=10111111
 end
 item: Set Variable
--- 1326,1332 ----
 item: Remark
 end
! item: If/While Statement
! Variable=DOADMIN
! Value=1
 end
 item: Set Variable
***************
*** 2090,2095 ****
 Text=Write to HKLM for admin, else HKCU. Keep these blocks otherwise identical!
 end
! item: Check Configuration
! Flags=10111111
 end
 item: Edit Registry
--- 2109,2115 ----
 Text=Write to HKLM for admin, else HKCU. Keep these blocks otherwise identical!
 end
! item: If/While Statement
! Variable=DOADMIN
! Value=1
 end
 item: Edit Registry
***************
*** 2182,2187 ****
 Flags=00001010
 end
! item: Check Configuration
! Flags=10111111
 end
 item: Edit Registry
--- 2202,2208 ----
 Flags=00001010
 end
! item: If/While Statement
! Variable=DOADMIN
! Value=1
 end
 item: Edit Registry
***************
*** 2220,2225 ****
 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
--- 2241,2247 ----
 Text=Installation Expert, it only shows up in the "If" block below. Keep in synch!
 end
! item: If/While Statement
! Variable=DOADMIN
! Value=1
 end
 item: Edit Registry
***************
*** 2286,2290 ****
 end
 item: Remark
! Text=Populate Start Menu
 end
 item: Remark
--- 2308,2312 ----
 end
 item: Remark
! Text=Populate Start Menu group
 end
 item: Remark