[GRASS-SVN] r67090 - grass/branches/releasebranch_7_0/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-12 06:21:11 -0800 (Sat, 12 Dec 2015)
New Revision: 67090

Modified:
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
Log:
update mklib.sh for 64bit builds
       (merge r67089 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh	2015-12-12 14:20:06 UTC (rev 67089)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/mklibs.sh	2015-12-12 14:21:11 UTC (rev 67090)
@@ -2,12 +2,22 @@
 
 set -e
 
+if [ -z "$OSGEO4W_POSTFIX" ]; then
+    OSGEO4W_POSTFIX=""
+fi
+
+if [ "$OSGEO4W_POSTFIX" != "64" ]; then
+    MACHINE=x86
+else
+    MACHINE=x64
+fi
+
 PROGRAMFILES="/c/Program Files (x86)"
 VSDIR="$PROGRAMFILES/Microsoft Visual Studio 12.0"
 PATH="$VSDIR/Common7/IDE:$PATH"
 PATH="$VSDIR/VC/bin:$PATH"
 PATH="$VSDIR/Common7/Tools:$PATH"
-PATH="$PATH:/c/OSGeo4W/bin"
+PATH="$PATH:/c/OSGeo4W${OSGEO4W_POSTFIX}/bin"
 export PATH
 
 [ -d mswindows/osgeo4w/vc ] || mkdir mswindows/osgeo4w/vc
@@ -28,8 +38,7 @@
 		sed -nf mswindows/osgeo4w/mklibs.sed |
 		egrep -v "^[ 	]*(_IMPORT_DESCRIPTOR_.*|_NULL_IMPORT_DESCRIPTOR)$" >mswindows/osgeo4w/vc/${defname%$VERSION}
 
-	cd mswindows/osgeo4w/vc
-	lib -nologo -def:${defname} -subsystem:windows -machine:x86
-	lib -nologo $libname || exit
-	cd ../../..
+	(cd mswindows/osgeo4w/vc ;
+	    lib -nologo -def:${defname} -subsystem:windows -machine:x86 ;
+	    lib -nologo $libname || exit)
 done

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-12 14:20:06 UTC (rev 67089)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-12 14:21:11 UTC (rev 67090)
@@ -214,7 +214,8 @@
 
 if [ -n "$PACKAGE_PATCH" ]; then
     log building vc libraries 
-    sh mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.$VERSION.dll 
+    OSGEO4W_POSTFIX=$OSGEO4W_POSTFIX sh \
+        mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.$VERSION.dll 
     mv mswindows/osgeo4w/vc/grass*.lib $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib
     
     log creating package