File tree 1 file changed +26
-7
lines changed
1 file changed +26
-7
lines changed Original file line number Diff line number Diff line change @@ -11,21 +11,40 @@ ReadRegStr $9 HKEY_LOCAL_MACHINE "SOFTWARE\Python\PythonCore\2.5\InstallPath" ""
11
11
IfFileExists $9 \python.exe ok ng
12
12
13
13
ng:
14
- MessageBox MB_OK " Python is not installed on this system.$\n Please install Python2.5 first."
15
- goto pythonskip
14
+ MessageBox MB_OK " Python is not installed on this system.$\n Using bundled python25.dll"
15
+ SetOutPath " $INSTDIR"
16
+ File " C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\python25.dll"
17
+ goto sipng
16
18
ok:
17
19
MessageBox MB_OK " Python located $9"
18
20
19
- IfFileExists $9 \Lib\site-packages\PyQt4 pyqtok pyqtng
21
+ testsip:
22
+ IfFileExists $9 \Lib\site-packages\sip.pyd sipok sipng
23
+ sipok:
24
+ goto testpyqt4
25
+
26
+ sipng:
27
+ # copy over included sip
28
+ SetOutPath " $INSTDIR\python"
29
+ File " C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\sipconfig.py"
30
+ File " C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\sip.pyd"
31
+ goto pyqtng
32
+
33
+ testpyqt4:
34
+ IfFileExists $9 \Lib\site-packages\PyQt4 pyqtok pyqtng
20
35
21
36
pyqtng:
22
- MessageBox MB_OK " PyQt4 is not installed.$\n Please install PyQt4 first. "
37
+ MessageBox MB_OK " PyQt4 is not installed.$\n Installing Bundled PyQt4"
23
38
# copy over bundled pyqt4 instead of skipping
24
- goto pythonskip
39
+ goto installpyqt4
25
40
pyqtok:
26
41
MessageBox MB_OK " PyQt4 located.$\n Note: Overwriting with included copy."
27
- SetOutPath " $9\Lib\site-packages\"
28
- File /r " C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\PyQt4"
42
+
43
+ installpyqt4:
44
+ SetOutPath " $INSTDIR\python"
45
+ File /r " C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\pydep\PyQt4"
46
+ pymacroend:
47
+
29
48
!macroend
30
49
31
50
!endif
You can’t perform that action at this time.
0 commit comments