osgeo4w: switch to Python 2.7 and GRASS 6.4.2

qgis · Feb 20, 2012 · c126210 · c126210
1 parent ca1536a
commit c126210
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -1,5 +1,5 @@
 @echo off
-set GRASS_VERSION=6.4.2RC3
+set GRASS_VERSION=6.4.2
 set SVNVERSION=c:/cygwin/bin/svnversion
 
 set BUILDDIR=%CD%\build
@@ -95,9 +95,9 @@ cmake -G "Visual Studio 9 2008" ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
-	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python25/include ^
-	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python25/libs/python25.lib ^
-	-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python25/sip.exe ^
+	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
+	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
+	-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
 	-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION% ^
 	-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
 	-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -1,5 +1,5 @@
 @echo off
-set GRASS_VERSION=6.4.2RC3
+set GRASS_VERSION=6.4.2
 
 set BUILDDIR=%CD%\build
 REM set BUILDDIR=%TEMP%\qgis_unstable
@@ -96,9 +96,9 @@ cmake -G "Visual Studio 9 2008" ^
 	-D CMAKE_CONFIGURATION_TYPES=%BUILDCONF% ^
 	-D GEOS_LIBRARY=%OSGEO4W_ROOT%/lib/geos_c_i.lib ^
 	-D PYTHON_EXECUTABLE=%O4W_ROOT%/bin/python.exe ^
-	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python25/include ^
-	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python25/libs/python25.lib ^
-	-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python25/sip.exe ^
+	-D PYTHON_INCLUDE_PATH=%O4W_ROOT%/apps/Python27/include ^
+	-D PYTHON_LIBRARY=%O4W_ROOT%/apps/Python27/libs/python27.lib ^
+	-D SIP_BINARY_PATH=%O4W_ROOT%/apps/Python27/sip.exe ^
 	-D GRASS_PREFIX=%O4W_ROOT%/apps/grass/grass-%GRASS_VERSION% ^
 	-D QT_BINARY_DIR=%O4W_ROOT%/bin ^
 	-D QT_LIBRARY_DIR=%O4W_ROOT%/lib ^

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -323,8 +323,8 @@ ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC
 
 SET_TARGET_PROPERTIES(qgis_core PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
 
-# make sure to create qgssvnversion.h before compiling
-ADD_DEPENDENCIES(qgis_core svnversion)
+# make sure to create qgsversion.h before compiling
+ADD_DEPENDENCIES(qgis_core version)
 
 # because of htonl
 IF (WIN32)