Skip to content
Permalink
Browse files
Merged with extended Python install support from 0.9.0 release branch.
git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0.9.2rc1@8103 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
what_nick committed Feb 5, 2008
1 parent 2cb4609 commit 26b9762778e41fe2f44fd38d0225518082151519
Showing with 25 additions and 6 deletions.
  1. +25 −6 win_build/python.nsh
@@ -11,20 +11,39 @@ ReadRegStr $9 HKEY_LOCAL_MACHINE "SOFTWARE\Python\PythonCore\2.5\InstallPath" ""
IfFileExists $9\python.exe ok ng

ng:
MessageBox MB_OK "Python is not installed on this system.$\nPlease install Python2.5 first."
goto pythonskip
MessageBox MB_OK "Python is not installed on this system.$\nUsing bundled python25.dll"
SetOutPath "$INSTDIR"
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\python25.dll"
goto sipng
ok:
MessageBox MB_OK "Python located $9"

IfFileExists $9\Lib\site-packages\PyQt4 pyqtok pyqtng
testsip:
IfFileExists $9\Lib\site-packages\sip.pyd sipok sipng
sipok:
goto testpyqt4

sipng:
#copy over included sip
SetOutPath "$INSTDIR\python"
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\sipconfig.py"
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\sip.pyd"
goto pyqtng

testpyqt4:
IfFileExists $9\Lib\site-packages\PyQt4 pyqtok pyqtng

pyqtng:
MessageBox MB_OK "PyQt4 is not installed.$\nPlease install PyQt4 first."
MessageBox MB_OK "PyQt4 is not installed.$\nInstalling Bundled PyQt4"
#copy over bundled pyqt4 instead of skipping
goto pythonskip
goto installpyqt4
pyqtok:
MessageBox MB_OK "PyQt4 located"
MessageBox MB_OK "PyQt4 located.$\nNote: Overwriting with included copy."

installpyqt4:
SetOutPath "$INSTDIR\python"
File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\PyQt4"
pymacroend:

!macroend

0 comments on commit 26b9762

Please sign in to comment.