update osgeo4w package scripts

      (merge https://trac.osgeo.org/grass/changeset/46122 from relbr64)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@46125 15284696-431f-4ddb-bdfa-cd5b030d7da7

mswindows/osgeo4w/grass.bat.tmpl

@@ -1,4 +1,5 @@
 @echo off
-call @OSGEO4W_ROOT@\bin\o4w_env.bat
-call @OSGEO4W_ROOT@\apps\grass\grass-@VERSION@\etc\env.bat
+SET OSGEO4W_ROOT=@osgeo4w@
+call %OSGEO4W_ROOT%\bin\o4w_env.bat
+call %OSGEO4W_ROOT%\apps\grass\grass-@VERSION@\etc\env.bat
 call %GRASS_PYTHON% @OSGEO4W_ROOT@\bin\grass@POSTFIX@.py

mswindows/osgeo4w/mklibs.sh

@@ -2,12 +2,12 @@
 
 set -e
 
-PROGRAMFILES="/c/Programme"
+PROGRAMFILES="/c/Program Files (x86)"
 VSDIR="$PROGRAMFILES/Microsoft Visual Studio 9.0"
 PATH="$VSDIR/Common7/IDE:$PATH"
 PATH="$VSDIR/VC/bin:$PATH"
 PATH="$VSDIR/Common7/Tools:$PATH"
-PATH="$PATH:/c/MinGW/bin"
+PATH="$PATH:/c/OSGeo4W/bin"
 export PATH
 
 [ -d mswindows/osgeo4w/vc ] || mkdir mswindows/osgeo4w/vc
@@ -32,4 +32,4 @@ for dllfile in "$@"; do
 	lib -nologo -def:${defname} -subsystem:windows -machine:x86
 	lib -nologo $libname || exit
 	cd ../../..
-done 
+done

mswindows/osgeo4w/package.sh

@@ -134,9 +134,7 @@ mv $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h \
     $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#@OSGEO4W_ROOT_MSYS@#$OSGEO4W_ROOT_MSYS#g" -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
-    mswindows/osgeo4w/grass.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR
-sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" \
+sed -e "s#@VERSION@#$VERSION#g" -e "s#@osgeo4w@#$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
@@ -158,9 +156,11 @@ fi
 # rm "$OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/etc/fontcap"
 
 if [ -n "$1" ]; then
+    PACKAGE="$1"
     log building vc libraries 
-    sh mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin/*.$VERSION.dll 
-    mv mswindows/osgeo4w/vc/grass*.lib $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib 
+    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
+    # rm $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.dll
     
     # log BUILDING GDAL GRASS plugins 
     # $COMSPEC /c "mswindows\\osgeo4w\\gdalplugins.cmd $VERSION" 
@@ -169,15 +169,27 @@ if [ -n "$1" ]; then
     mkdir -p package/grass$MAJOR$MINOR 
     
     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" \
+	$SRC/mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/grass$MAJOR$MINOR.bat.tmpl
+    
     tar -cjf $PDIR/grass$MAJOR$MINOR/grass-$VERSION-$PACKAGE.tar.bz2 \
     apps/grass/grass-$VERSION \
-    bin/grass$MAJOR$MINOR.bat \
-    bin/grass$MAJOR$MINOR \
+    bin/grass$MAJOR$MINOR.bat.tmpl \
+    bin/grass$MAJOR$MINOR.tmpl \
+    bin/libintl3.dll \
+    bin/libiconv2.dll \
+    bin/regex2.dll \
     etc/postinstall/grass$MAJOR$MINOR.bat \
     etc/preremove/grass$MAJOR$MINOR.bat
     
+    rm bin/grass$MAJOR$MINOR.tmpl
+    rm bin/grass$MAJOR$MINOR.bat.tmpl
+    
     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 

mswindows/osgeo4w/postinstall.bat

@@ -1,8 +1,6 @@
 set ICON=%OSGEO4W_ROOT%\apps\grass\grass-@VERSION@\etc\gui\icons\grass.ico
 set BATCH=%OSGEO4W_ROOT%\bin\grass@POSTFIX@.bat
-
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass@POSTFIX@-env.bat 
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass@POSTFIX@.bat 
+textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass@POSTFIX@.bat
 textreplace -std -t "%OSGEO4W_ROOT%"\bin\grass@POSTFIX@ 
 textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap 
 

mswindows/osgeo4w/preremove.bat

@@ -6,6 +6,5 @@ del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (wxPython).lnk"
 del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@ (Text).lnk"
 
 del "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap 
-del "%OSGEO4W_ROOT%"\apps\grass\bin\grass@POSTFIX@ 
-del "%OSGEO4W_ROOT%"\bin\grass@POSTFIX@-env.bat 
 del "%OSGEO4W_ROOT%"\bin\grass@POSTFIX@.bat
+del "%OSGEO4W_ROOT%"\bin\grass@POSTFIX@