[Python-checkins] CVS: python/dist/src/PCbuild Uninstal.wse,1.1,1.2 python20.wse,1.59,1.60

[Tim Peters]

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

Modified Files:
	Uninstal.wse python20.wse 
Log Message:
I hope this irons out the Add/Remove kinks on Win2K for users w/o Admin
privs, but haven't tested that yet.  Doesn't hurt on Win98SE, anyway.


Index: Uninstal.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/Uninstal.wse,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Uninstal.wse	2001/07/30 23:06:21	1.1
--- Uninstal.wse	2001/07/31 03:24:55	1.2
***************
*** 1,5 ****
  Document Type: WSE
  item: Global
!   Version=8.11
    Flags=00000100
    Split=1420
--- 1,5 ----
  Document Type: WSE
  item: Global
!   Version=8.14
    Flags=00000100
    Split=1420
***************
*** 20,28 ****
    Per-User Version ID=1
    Crystal Format=10111100101100000010001001001001
!   File Checksum=2338111989
  end
  item: Remark
  end
  item: Remark
    Text=     Install Support for uninstalling the application.
  end
--- 20,37 ----
    Per-User Version ID=1
    Crystal Format=10111100101100000010001001001001
!   Step View=&Properties
  end
  item: Remark
+   Text=Note from Tim:  This is a verbatim copy of Wise's Uninstal.wse, altered at the end to write
  end
  item: Remark
+   Text=uninstall info under HKCU instead of HKLM if the user doesn't have Admin privs.
+ end
+ item: Remark
+   Text=Hmm!  Also changed it to use the 32-bit uninstaller!
+ end
+ item: Remark
+ end
+ item: Remark
    Text=     Install Support for uninstalling the application.
  end
***************
*** 432,436 ****
  end
  item: Remark
!   Text=Write under HKLM.
  end
  item: Edit Registry
--- 441,445 ----
  end
  item: Remark
!   Text=Write uninstall info under HKLM.  This if/else/end block added by Tim.
  end
  item: Edit Registry
***************
*** 452,456 ****
  end
  item: Remark
!   Text=Write under HKCU, but identical otherwise.
  end
  item: Edit Registry
--- 461,465 ----
  end
  item: Remark
!   Text=The same, but write under HKCU instead.
  end
  item: Edit Registry

Index: python20.wse
===================================================================
RCS file: /cvsroot/python/python/dist/src/PCbuild/python20.wse,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** python20.wse	2001/07/30 23:26:41	1.59
--- python20.wse	2001/07/31 03:24:55	1.60
***************
*** 1,5 ****
  Document Type: WSE
  item: Global
!   Version=8.12
    Title=Python 2.2 alpha 1
    Flags=00010100
--- 1,5 ----
  Document Type: WSE
  item: Global
!   Version=8.14
    Title=Python 2.2 alpha 1
    Flags=00010100
***************
*** 1847,1850 ****
--- 1847,1853 ----
    Flags=00001010
  end
+ item: Remark
+   Text=Registering file extensions requires Admin privs.
+ end
  item: If/While Statement
    Variable=COMPONENTS
***************
*** 2064,2070 ****
  end
  item: Check Configuration
-   Flags=11110010
- end
- item: Check Configuration
    Flags=10111111
  end
--- 2067,2070 ----
***************
*** 2090,2094 ****
    end
  end
! item: End Block
  end
  item: End Block
--- 2090,2133 ----
    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