[GRASS-SVN] r53569 - grass/branches/releasebranch_6_4/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-26 13:57:16 -0700 (Fri, 26 Oct 2012)
New Revision: 53569

Modified:
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
Log:
wingrass: use separate osgeo4w enviroment for G6 and G7

Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-10-26 19:21:04 UTC (rev 53568)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-10-26 20:57:16 UTC (rev 53569)
@@ -1,4 +1,4 @@
-#!/c/OSGeo4W/apps/msys/bin/sh
+#!/c/OSGeo4W_g6/apps/msys/bin/sh
 
 set -e
 
@@ -21,8 +21,8 @@
 # package name for osgeo4w
 # eg. 64-dev -> grass64-dev, empty for release
 export PACKAGE_NAME=$2
-export OSGEO4W_ROOT_MSYS="/c/OSGeo4W"
-export OSGEO4W_ROOT="C:\\\OSGeo4W"
+export OSGEO4W_ROOT_MSYS="/c/OSGeo4W_g6"
+export OSGEO4W_ROOT="C:\\\OSGeo4W_g6"
 export PATH=.:/c/mingw/bin:/usr/local/bin:/bin:$OSGEO4W_ROOT_MSYS/bin:/c/WINDOWS/system32:/c/WINDOWS:/c/WINDOWS/System32/Wbem:/c/Subversion:$PWD/mswindows/osgeo4w
 
 T0=$(date +%s) 
@@ -73,8 +73,8 @@
     GRASS_EXECUTABLE=grass${MAJOR}${MINOR}
 fi
 
-export GRASS_PYTHON="/c/OSGeo4W/bin/python.exe"
-export PYTHONHOME="/c/OSGeo4W/apps/Python27"
+export GRASS_PYTHON="$OSGEO4W_ROOT_MSYS/bin/python.exe"
+export PYTHONHOME="$OSGEO4W_ROOT_MSYS/apps/Python27"
 
 if [ -f mswindows/osgeo4w/package.log ]; then 
     i=0