[QGIS Commit] r11330 - trunk/qgis/ms-windows/osgeo4w

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-08-10 12:08:11 -0400 (Mon, 10 Aug 2009)
New Revision: 11330

Modified:
   trunk/qgis/ms-windows/osgeo4w/package.cmd
Log:
preset python include path correctly for osgeo4w build

Modified: trunk/qgis/ms-windows/osgeo4w/package.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package.cmd	2009-08-10 15:41:32 UTC (rev 11329)
+++ trunk/qgis/ms-windows/osgeo4w/package.cmd	2009-08-10 16:08:11 UTC (rev 11330)
@@ -17,6 +17,8 @@
 
 set VERSION=%1
 set PACKAGE=%2
+if %VERSION%=="" goto error
+if %PACKAGE%=="" goto error
 
 PROMPT qgis%VERSION%$g 
 
@@ -76,7 +78,8 @@
 	-D BISON_EXECUTABLE=%BISON% ^
 	-D GDAL_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\gdal-16\include -D GDAL_LIBRARY=%OSGEO4W_ROOT%\apps\gdal-16\lib\gdal_i.lib ^
 	-D PYTHON_EXECUTABLE=%OSGEO4W_ROOT%\bin\python.exe ^
-	-D PYTHON_INCLUDE_DIR=%OSGEO4W_ROOT%\apps\Python25\include -D PYTHON_LIBRARY=%OSGEO4W_ROOT%\apps\Python25\libs\python25.lib ^
+	-D PYTHON_INCLUDE_PATH=%OSGEO4W_ROOT%\apps\Python25\include ^
+	-D PYTHON_LIBRARY=%OSGEO4W_ROOT%\apps\Python25\libs\python25.lib ^
 	-D SIP_BINARY_PATH=%OSGEO4W_ROOT%\apps\Python25\sip.exe ^
 	-D GRASS_PREFIX=%OSGEO4W_ROOT%\apps\grass\grass-%GRASS_VERSION% ^
 	-D QT_BINARY_DIR=%OSGEO4W_ROOT%\bin -D QT_LIBRARY_DIR=%OSGEO4W_ROOT%\lib ^
@@ -87,6 +90,9 @@
 	../../..>>%LOG% 2>&1
 if errorlevel 1 goto error
 
+egrep -vq "^(Python not being built|Could not find GRASS)" %LOG%
+if errorlevel 1 goto error
+
 :skipcmake
 
 echo ZERO_CHECK: %DATE% %TIME%>>%LOG% 2>&1