[QGIS Commit] r8140 - trunk/qgis/win_build

[svn_qgis at osgeo.org]

Author: gsherman
Date: 2008-02-11 20:49:05 -0500 (Mon, 11 Feb 2008)
New Revision: 8140

Modified:
   trunk/qgis/win_build/python.nsh
   trunk/qgis/win_build/qgis.nsi
Log:
WIMPY's window installer files from 0.9.2 release branch

Modified: trunk/qgis/win_build/python.nsh
===================================================================
--- trunk/qgis/win_build/python.nsh	2008-02-12 00:49:17 UTC (rev 8139)
+++ trunk/qgis/win_build/python.nsh	2008-02-12 01:49:05 UTC (rev 8140)
@@ -11,20 +11,39 @@
 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
 

Modified: trunk/qgis/win_build/qgis.nsi
===================================================================
--- trunk/qgis/win_build/qgis.nsi	2008-02-12 00:49:17 UTC (rev 8139)
+++ trunk/qgis/win_build/qgis.nsi	2008-02-12 01:49:05 UTC (rev 8140)
@@ -154,6 +154,8 @@
 SectionEnd
 
 Section "Python Extension" SEC03
+;this section is mandatory
+ SectionIn RO
  !insertmacro CHECK_PYTHON
  SetOutPath "$INSTDIR"
  File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\python"