[pywin32-checkins] pywin32/Wise win32all.wse,1.30,1.31

[<mha...@us...>]

Update of /cvsroot/pywin32/pywin32/Wise
In directory sc8-pr-cvs1:/tmp/cvs-serv11346

Modified Files:
	win32all.wse 
Log Message:
Don't try and copy anything to system32 for non-admin installs.


Index: win32all.wse
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Wise/win32all.wse,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** win32all.wse	8 Jul 2003 02:08:51 -0000	1.30
--- win32all.wse	27 Jul 2003 23:04:27 -0000	1.31
***************
*** 18,22 ****
    Patch Threshold=85
    Patch Memory=4000
!   EXE Filename=win32all-155.exe
    Code Sign Name=Python Win32 combined extensions
    Code Sign Info=skippinet.com.au
--- 18,22 ----
    Patch Threshold=85
    Patch Memory=4000
!   EXE Filename=win32all-157.exe
    Code Sign Name=Python Win32 combined extensions
    Code Sign Info=skippinet.com.au
***************
*** 382,392 ****
  item: End Block
  end
  item: Set Variable
    Variable=SYSDLL_PATH
    Value=%SYS32%
  end
! remarked item: Set Variable
    Variable=SYSDLL_PATH
!   Value=%MAINDIR%
  end
  item: Set Variable
--- 382,400 ----
  item: End Block
  end
+ item: If/While Statement
+   Variable=USE_HKLM
+   Value=1
+ end
  item: Set Variable
    Variable=SYSDLL_PATH
    Value=%SYS32%
  end
! item: Else Statement
! end
! item: Set Variable
    Variable=SYSDLL_PATH
!   Value=%PY_INST_PATH%
! end
! item: End Block
  end
  item: Set Variable
***************
*** 509,513 ****
  item: Check if File/Dir Exists
    Pathname=%SYSDLL_PATH%\pywintypes%PYVER_NODOT%.dll
!   Message=The file %SYS32%\pywintypes%PYVER_NODOT%.dll
    Message=can not be deleted.  It is likely this file
    Message=is in use.  Please restart your system,
--- 517,521 ----
  item: Check if File/Dir Exists
    Pathname=%SYSDLL_PATH%\pywintypes%PYVER_NODOT%.dll
!   Message=The file %SYSDLL_PATH%\pywintypes%PYVER_NODOT%.dll
    Message=can not be deleted.  It is likely this file
    Message=is in use.  Please restart your system,
***************
*** 538,542 ****
  item: Check if File/Dir Exists
    Pathname=%SYSDLL_PATH%\pythoncom%PYVER_NODOT%.dll
!   Message=The file %SYS32%\pythoncom%PYVER_NODOT%.dll
    Message=can not be deleted.  It is likely this file
    Message=is in use.  Please restart your system,
--- 546,550 ----
  item: Check if File/Dir Exists
    Pathname=%SYSDLL_PATH%\pythoncom%PYVER_NODOT%.dll
!   Message=The file %SYSDLL_PATH%\pythoncom%PYVER_NODOT%.dll
    Message=can not be deleted.  It is likely this file
    Message=is in use.  Please restart your system,
***************
*** 1242,1246 ****
  item: Install File
    Source=e:\src\pythonex\SharedDlls\NT\pdh.dll
!   Destination=%SYS32%\pdh.dll
    Flags=0000001000010011
  end
--- 1250,1254 ----
  item: Install File
    Source=e:\src\pythonex\SharedDlls\NT\pdh.dll
!   Destination=%SYSDLL_PATH%\pdh.dll
    Flags=0000001000010011
  end
***************
*** 1255,1259 ****
  item: Install File
    Source=e:\src\pythonex\SharedDlls\MSVCIRT.DLL
!   Destination=%SYS32%\MSVCIRT.DLL
    Description=Visual C++ DLLs
    Flags=0000001000010011
--- 1263,1267 ----
  item: Install File
    Source=e:\src\pythonex\SharedDlls\MSVCIRT.DLL
!   Destination=%SYSDLL_PATH%\MSVCIRT.DLL
    Description=Visual C++ DLLs
    Flags=0000001000010011
***************
*** 1261,1265 ****
  item: Install File
    Source=e:\src\pythonex\SharedDlls\MSVCRT.DLL
!   Destination=%SYS32%\MSVCRT.DLL
    Description=Visual C++ DLLs
    Flags=0000001000010011
--- 1269,1273 ----
  item: Install File
    Source=e:\src\pythonex\SharedDlls\MSVCRT.DLL
!   Destination=%SYSDLL_PATH%\MSVCRT.DLL
    Description=Visual C++ DLLs
    Flags=0000001000010011
***************
*** 1370,1374 ****
  item: Set Variable
    Variable=PYTHONCOM_DLL
!   Value=%SYS32%\PythonCOM%PYVER_NODOT%.dll
  end
  item: Install File
--- 1378,1382 ----
  item: Set Variable
    Variable=PYTHONCOM_DLL
!   Value=%SYSDLL_PATH%\PythonCOM%PYVER_NODOT%.dll
  end
  item: Install File
***************
*** 1826,1830 ****
  item: Install File
    Source=e:\src\pythonex\SharedDlls\MFC42.DLL
!   Destination=%SYS32%\MFC42.DLL
    Flags=0000001000000011
  end
--- 1834,1838 ----
  item: Install File
    Source=e:\src\pythonex\SharedDlls\MFC42.DLL
!   Destination=%SYSDLL_PATH%\MFC42.DLL
    Flags=0000001000000011
  end