[GRASS-SVN] r50399 - in grass/branches/releasebranch_6_4/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-01-23 14:14:19 -0800 (Mon, 23 Jan 2012)
New Revision: 50399

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
   grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
   grass/branches/releasebranch_6_4/mswindows/env.bat
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
Log:
winGRASS: OSGeo4W switched from python 2.5 to 2.7
         http://trac.osgeo.org/osgeo4w/ticket/219#comment:19


Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2012-01-23 22:11:19 UTC (rev 50398)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2012-01-23 22:14:19 UTC (rev 50399)
@@ -732,9 +732,9 @@
 	FileWrite $0 'PATH="$$GISBASE/tcl-tk/bin:$$GISBASE/sqlite/bin:$$GISBASE/gpsbabel:$$PATH"$\r$\n'
 	FileWrite $0 'export PATH$\r$\n'
 	FileWrite $0 '# Set the PYTHONPATH variable$\r$\n'
-	FileWrite $0 'PYTHONPATH="$$GISBASE/etc/python:$$GISBASE/Python25:$$PYTHONPATH"$\r$\n'
+	FileWrite $0 'PYTHONPATH="$$GISBASE/etc/python:$$GISBASE/Python27:$$PYTHONPATH"$\r$\n'
 	FileWrite $0 'export PYTHONPATH$\r$\n'
-	FileWrite $0 'PYTHONHOME="$INSTALL_DIR\Python25"$\r$\n'
+	FileWrite $0 'PYTHONHOME="$INSTALL_DIR\Python27"$\r$\n'
 	FileWrite $0 'export PYTHONHOME$\r$\n'
 	FileWrite $0 'if [ -z "$$GRASS_PYTHON" ] ; then$\r$\n'
 	FileWrite $0 '   GRASS_PYTHON=python$\r$\n'

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat	2012-01-23 22:11:19 UTC (rev 50398)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat	2012-01-23 22:14:19 UTC (rev 50399)
@@ -199,19 +199,19 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy Python content to PACKAGE_DIR\Python25
+ at echo Copy Python content to PACKAGE_DIR\Python27
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
 
-mkdir %PACKAGE_DIR%\Python25
+mkdir %PACKAGE_DIR%\Python27
 
-copy %OSGEO4W_DIR%\apps\Python25\* %PACKAGE_DIR%\Python25
+copy %OSGEO4W_DIR%\apps\Python27\* %PACKAGE_DIR%\Python27
 
-xcopy %OSGEO4W_DIR%\apps\Python25\DLLs %PACKAGE_DIR%\Python25\DLLs /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python25\include %PACKAGE_DIR%\Python25\include /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python25\Lib %PACKAGE_DIR%\Python25\Lib /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python25\libs %PACKAGE_DIR%\Python25\libs /S/V/F/I
-xcopy %OSGEO4W_DIR%\apps\Python25\Scripts %PACKAGE_DIR%\Python25\Scripts /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python27\DLLs %PACKAGE_DIR%\Python27\DLLs /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python27\include %PACKAGE_DIR%\Python27\include /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python27\Lib %PACKAGE_DIR%\Python27\Lib /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python27\libs %PACKAGE_DIR%\Python27\libs /S/V/F/I
+xcopy %OSGEO4W_DIR%\apps\Python27\Scripts %PACKAGE_DIR%\Python27\Scripts /S/V/F/I
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------

Modified: grass/branches/releasebranch_6_4/mswindows/env.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/env.bat	2012-01-23 22:11:19 UTC (rev 50398)
+++ grass/branches/releasebranch_6_4/mswindows/env.bat	2012-01-23 22:14:19 UTC (rev 50399)
@@ -31,5 +31,5 @@
 set GEOTIFF_CSV=%GISBASE%\share\epsg_csv
 
 rem Path to the python directory
-set PYTHONHOME=%GISBASE%\Python25
+set PYTHONHOME=%GISBASE%\Python27
 if "x%GRASS_PYTHON%" == "x" set GRASS_PYTHON=python

Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl	2012-01-23 22:11:19 UTC (rev 50398)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.tmpl	2012-01-23 22:14:19 UTC (rev 50399)
@@ -5,7 +5,7 @@
 GRASS_SH=$OSGEO4W_ROOT_MSYS/apps/msys/bin/sh.exe
 GRASS_WISH=$OSGEO4W_ROOT_MSYS/bin/wish.exe
 GRASS_PYTHON=$OSGEO4W_ROOT_MSYS/bin/python.exe
-PYTHONHOME=$OSGEO4W_ROOT_MSYS/apps/Python25
+PYTHONHOME=$OSGEO4W_ROOT_MSYS/apps/Python27
 GRASS_PROJSHARE=$OSGEO4W_ROOT_MSYS/share/proj
 PATH=$OSGEO4W_ROOT_MSYS/apps/grass/grass- at VERSION@/bin:$PATH
 

Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-01-23 22:11:19 UTC (rev 50398)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-01-23 22:14:19 UTC (rev 50399)
@@ -74,7 +74,7 @@
 fi
 
 export GRASS_PYTHON="/c/OSGeo4W/bin/python.exe"
-export PYTHONHOME="/c/OSGeo4W/apps/Python25"
+export PYTHONHOME="/c/OSGeo4W/apps/Python27"
 
 if [ -f mswindows/osgeo4w/package.log ]; then 
     i=0