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

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-10-28 03:21:21 -0700 (Sun, 28 Oct 2012)
New Revision: 53593

Modified:
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
Log:
wingrass: define osgeo4w dir postfix (use separate dirs for building
G6 a G7)
   (merge r53587 from trunk)


Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-10-28 10:20:43 UTC (rev 53592)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-10-28 10:21:21 UTC (rev 53593)
@@ -21,8 +21,16 @@
 # 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"
+# OSGeo4W directory postfix, separate OSGeo4W installations are used
+# for building GRASS 6.x and 7.x
+if test -z "$3" ; then
+    OSGEO4W_ROOT_POSTFIX=""
+else
+    OSGEO4W_ROOT_POSTFIX="$3"
+fi
+export OSGEO4W_ROOT_MSYS="/c/OSGeo4W${OSGEO4W_ROOT_POSTFIX}"
+export OSGEO4W_ROOT="C:\\\OSGeo4W${OSGEO4W_ROOT_POSTFIX}"
+
 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)