[pywin32-checkins] pywin32/Wise win32all.wse,1.27,1.28
OLD project page for the Python extensions for Windows
Brought to you by:
mhammond
Menu
▾
▴
[pywin32-checkins] pywin32/Wise win32all.wse,1.27,1.28
|
From: <mha...@us...> - 2003-07-07 14:07:50
|
Update of /cvsroot/pywin32/pywin32/Wise
In directory sc8-pr-cvs1:/tmp/cvs-serv28886
Modified Files:
win32all.wse
Log Message:
Better support for non-Admin installs. Pythonwin now installed in
Python directory, and no attempt to compile all .pyc files is done.
Message also displayed for the user indicating Python COM wont work 100%
Index: win32all.wse
===================================================================
RCS file: /cvsroot/pywin32/pywin32/Wise/win32all.wse,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** win32all.wse 7 Jul 2003 10:18:41 -0000 1.27
--- win32all.wse 7 Jul 2003 14:07:47 -0000 1.28
***************
*** 18,22 ****
Patch Threshold=85
Patch Memory=4000
! EXE Filename=win32all-154.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-155.exe
Code Sign Name=Python Win32 combined extensions
Code Sign Info=skippinet.com.au
***************
*** 107,114 ****
item: Compiler Variable Else
end
item: Get Registry Key Value
Variable=PY_INST_PATH
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath
! Flags=00000100
end
item: Get Registry Key Value
--- 107,117 ----
item: Compiler Variable Else
end
+ item: Remark
+ Text=Check HKCU first - if it is there, the user probably has no admin anyway.
+ end
item: Get Registry Key Value
Variable=PY_INST_PATH
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath
! Flags=00000010
end
item: Get Registry Key Value
***************
*** 116,126 ****
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath\InstallGroup
Default=%GROUP%
! Flags=00000100
! end
! item: Compiler Variable End
end
item: Set Variable
Variable=USE_HKLM
! Value=1
end
item: If/While Statement
--- 119,129 ----
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath\InstallGroup
Default=%GROUP%
! Flags=00000010
end
item: Set Variable
Variable=USE_HKLM
! Value=0
! end
! item: Compiler Variable End
end
item: If/While Statement
***************
*** 131,143 ****
Text=Check HKEY_CURRENT_USER too.
end
- item: Compiler Variable If
- Variable=PY_DEV_BUILD
- Value=True
- Flags=00000001
- end
item: Get Registry Key Value
Variable=PY_INST_PATH
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath
! Flags=00000010
end
item: Get Registry Key Value
--- 134,141 ----
Text=Check HKEY_CURRENT_USER too.
end
item: Get Registry Key Value
Variable=PY_INST_PATH
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath
! Flags=00000100
end
item: Get Registry Key Value
***************
*** 145,169 ****
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath\InstallGroup
Default=%GROUP%
! Flags=00000010
end
item: Set Variable
Variable=USE_HKLM
! Value=0
! end
! item: Compiler Variable End
end
item: If/While Statement
Variable=PY_INST_PATH
end
- item: Compiler Variable If
- Variable=PY_DEV_BUILD
- Value=True
- end
- item: Set Variable
- Variable=CONTINUE
- Value=1
- end
- item: Compiler Variable Else
- end
item: Set Variable
Variable=CONTINUE
--- 143,155 ----
Key=Software\Python\PythonCore\%PY_REG_VERSION%\InstallPath\InstallGroup
Default=%GROUP%
! Flags=00000100
end
item: Set Variable
Variable=USE_HKLM
! Value=1
end
item: If/While Statement
Variable=PY_INST_PATH
end
item: Set Variable
Variable=CONTINUE
***************
*** 212,217 ****
end
end
- item: Compiler Variable End
- end
item: If/While Statement
Variable=CONTINUE
--- 198,201 ----
***************
*** 227,234 ****
Flags=00000010
end
- item: Compiler Variable If
- Variable=PY_DEV_BUILD
- Value=True
- end
item: Custom Dialog Set
Name=Select Destination Directory
--- 211,214 ----
***************
*** 365,386 ****
end
end
- item: Compiler Variable Else
- end
- item: Check if File/Dir Exists
- Pathname=PY_INST_PATH\Python%PYVER_NODOT%.dll
- Flags=00000101
- end
- item: Display Message
- Title=Cannot locate Python
- Text=Python can not be located in the specified directory. Please ensure that Python%PYVER_NODOT%.dll exists in the specified directory.
- Flags=00101000
- end
- item: Set Variable
- Variable=PY_INST_PATH
- end
- item: End Block
- end
- item: Compiler Variable End
- end
item: End Block
end
--- 345,348 ----
***************
*** 400,423 ****
Flags=00000001
end
item: Remark
Text=Python 2.2 and later have "site-packages" - install there.
end
item: Check if File/Dir Exists
! Pathname=%PY_INST_PATH%\lib\site-packages
Flags=00000100
end
item: Set Variable
! Variable=PY_INST_PATH
! Value=%PY_INST_PATH%\lib\site-packages
end
item: End Block
end
- item: Compiler Variable End
- end
- item: Set Variable
- Variable=MAINDIR
- Value=%PY_INST_PATH%
- Flags=00001100
- end
item: Set Variable
Variable=SYSDLL_PATH
--- 362,385 ----
Flags=00000001
end
+ item: Compiler Variable End
+ end
+ item: Set Variable
+ Variable=MAINDIR
+ Value=%PY_INST_PATH%
+ Flags=00001100
+ end
item: Remark
Text=Python 2.2 and later have "site-packages" - install there.
end
item: Check if File/Dir Exists
! Pathname=%MAINDIR%\lib\site-packages
Flags=00000100
end
item: Set Variable
! Variable=MAINDIR
! Value=%MAINDIR%\lib\site-packages
end
item: End Block
end
item: Set Variable
Variable=SYSDLL_PATH
***************
*** 699,703 ****
end
end
! item: Check Configuration
Message=This program must be installed by a user with Administrative rights.
Message=
--- 661,665 ----
end
end
! remarked item: Check Configuration
Message=This program must be installed by a user with Administrative rights.
Message=
***************
*** 1778,1784 ****
Flags=00000001
end
item: Install File
Source=e:\src\pythonex\pythonwin\Build\Pythonwin.exe
! Destination=%INSTDIR%\Pythonwin.exe
Description=Extension modules
Flags=0000000000000011
--- 1740,1749 ----
Flags=00000001
end
+ item: Remark
+ Text=Install Python in the main Python dir, so non-admin installs can find Python.dll
+ end
item: Install File
Source=e:\src\pythonex\pythonwin\Build\Pythonwin.exe
! Destination=%PY_INST_PATH%\Pythonwin.exe
Description=Extension modules
Flags=0000000000000011
***************
*** 1791,1795 ****
Total Keys=1
Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Pythonwin.exe
! New Value=%INSTDIR%\Pythonwin.exe
Root=2
end
--- 1756,1761 ----
Total Keys=1
Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Pythonwin.exe
! New Value=%PY_INST_PATH%\Pythonwin.exe
! New Value=
Root=2
end
***************
*** 1799,1803 ****
Total Keys=1
Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Pythonwin.exe
! New Value=%INSTDIR%\Pythonwin.exe
Root=1
end
--- 1765,1770 ----
Total Keys=1
Key=Software\Microsoft\Windows\CurrentVersion\App Paths\Pythonwin.exe
! New Value=%PY_INST_PATH%\Pythonwin.exe
! New Value=
Root=1
end
***************
*** 1811,1820 ****
Total Keys=1
Key=Python.File\shell\Edit\command
! New Value=%INSTDIR%\pythonwin.exe /edit "%%1"
end
item: Edit Registry
Total Keys=1
Key=Python.NoConFile\shell\Edit\command
! New Value=%INSTDIR%\pythonwin.exe /edit "%%1"
end
item: End Block
--- 1778,1789 ----
Total Keys=1
Key=Python.File\shell\Edit\command
! New Value=%PY_INST_PATH%\pythonwin.exe /edit "%%1"
! New Value=
end
item: Edit Registry
Total Keys=1
Key=Python.NoConFile\shell\Edit\command
! New Value=%PY_INST_PATH%\pythonwin.exe /edit "%%1"
! New Value=
end
item: End Block
***************
*** 1939,1943 ****
end
item: Create Shortcut
! Source=%INSTDIR%\Pythonwin.exe
Destination=%GROUP%\Pythonwin.lnk
Working Directory=%MAINDIR%
--- 1908,1912 ----
end
item: Create Shortcut
! Source=%PY_INST_PATH%\Pythonwin.exe
Destination=%GROUP%\Pythonwin.lnk
Working Directory=%MAINDIR%
***************
*** 1953,1961 ****
Flags=00000001
end
- item: Else Statement
- end
- item: Remark
- Text=We (Python core, and now me) Seem to be ignoring non Win95 (ie, win31 or NT3.5) interfaces.
- end
item: End Block
end
--- 1922,1925 ----
***************
*** 2026,2029 ****
--- 1990,2009 ----
Flags=00000001
end
+ item: If/While Statement
+ Variable=USE_HKLM
+ Value=1
+ Flags=00000001
+ end
+ item: Display Message
+ Title=Non-admin install
+ Text=As this is being installed as a non-admin user, certain COM features will not work correctly.
+ Text=
+ Text=You will not be able to implement COM objects in Python (but you should be able to use other COM objects).
+ Text=
+ Text=Active Scripting is also not supported
+ Flags=00100100
+ end
+ item: Else Statement
+ end
item: Install File
Source=e:\src\pythonex\Wise\Install Scripts\FinishInstall.py
***************
*** 2061,2064 ****
--- 2041,2046 ----
item: Delete File
Pathname=%MAINDIR%\PyWise%PYVER_NODOT%.dll
+ end
+ item: End Block
end
item: Compiler Variable End
|
