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

svn_grass at osgeo.org svn_grass at osgeo.org
Wed Sep 7 12:46:35 EDT 2011


Author: martinl
Date: 2011-09-07 09:46:35 -0700 (Wed, 07 Sep 2011)
New Revision: 48188

Modified:
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
Log:
update wingrass for osgeo4w packaging
    (merge r48170 from trunk)


Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl	2011-09-07 16:21:32 UTC (rev 48187)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/grass.bat.tmpl	2011-09-07 16:46:35 UTC (rev 48188)
@@ -1,5 +1,5 @@
 @echo off
-SET OSGEO4W_ROOT=@osgeo4w@
+SET OSGEO4W_ROOT=@OSGEO4W_ROOT@
 call %OSGEO4W_ROOT%\bin\o4w_env.bat
 call %OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\env.bat
 "%WINGISBASE%"\etc\init.bat %*

Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2011-09-07 16:21:32 UTC (rev 48187)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2011-09-07 16:46:35 UTC (rev 48188)
@@ -92,6 +92,9 @@
 	    make distclean
 	fi
 
+	log remove old logs
+	rm mswindows/osgeo4w/package.log.[0-9][0-9][0-9]
+
 	log configure
 	./configure \
 		--with-libs="$OSGEO4W_ROOT_MSYS/lib $PWD/mswindows/osgeo4w/lib" \
@@ -132,7 +135,7 @@
     $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h.mingw
 cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h
 cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass
-sed -e "s#@VERSION@#$VERSION#g" -e "s#@osgeo4w@#$OSGEO4W_ROOT#g" \
+sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" \
     mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR.bat
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT_MSYS@#$OSGEO4W_ROOT#g" \
     mswindows/osgeo4w/env.bat.tmpl >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/env.bat
@@ -147,14 +150,7 @@
     cp /c/mingw/bin/libintl-8.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
 fi
 
-# P="$(pwd -W)"
-# P="${P//\//\\\\}\\\\dist.i686-pc-mingw32"
-
-# sed -e "s#$P#@osgeo4w@#g" $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap >$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap.tmpl
-# rm "$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap"
-
-if [ -n "$1" ]; then
-    PACKAGE="$1"
+if [ -n "$PACKAGE" ]; then
     log building vc libraries 
     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
@@ -169,11 +165,11 @@
     PDIR=$PWD/package
     SRC=$PWD
     cd $OSGEO4W_ROOT_MSYS 
-    
-    sed -e "s#GISBASE_VALUE#@osgeo4w@\\\apps\\\grass\\\grass-$VERSION#g" \
-	$SRC/lib/init/grass.src >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR.tmpl
-    sed -e "s#@VERSION@#$VERSION#g" \
+
+    sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
 	$SRC/mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR.bat.tmpl
+    sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT_MSYS@#@OSGEO4W_ROOT@#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
+	$SRC/mswindows/osgeo4w/grass.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR.tmpl
     
     tar -cjf $PDIR/grass$MAJOR$MINOR/grass-$VERSION-$PACKAGE.tar.bz2 \
     apps/grass/grass-$VERSION \
@@ -190,7 +186,7 @@
     
     cd $PDIR/.. 
     svn diff >/tmp/grass-$VERSION.diff
-    tar -C /tmp -cjf $PDIR/grass$MAJOR$MINOR/grass-$VERSION-$PACKAGE-src.tar.bz2 grass-$VERSION.diff 
+    tar -C /tmp -cjf $PDIR/grass$MAJOR$MINOR/grass-$VERSION-$PACKAGE-src.tar.bz2 grass-$VERSION.diff
 fi
 
 log 



More information about the grass-commit mailing list