[GRASS-SVN] r45561 - grass/branches/develbranch_6/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-03-05 03:55:40 -0800 (Sat, 05 Mar 2011)
New Revision: 45561

Modified:
   grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl
   grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
Log:
osgeo4w: move env.bat to etc/ini/

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl	2011-03-04 22:46:40 UTC (rev 45560)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/grass.bat.tmpl	2011-03-05 11:55:40 UTC (rev 45561)
@@ -1,4 +1,4 @@
 @echo off
 call @OSGEO4W_ROOT@\bin\o4w_env.bat
-call @OSGEO4W_ROOT@\apps\grass\grass- at VERSION@\etc\env.bat
+call @OSGEO4W_ROOT@\etc\ini\grass at POSTFIX@.bat
 "%WINGISBASE%"\etc\init.bat %*

Modified: grass/branches/develbranch_6/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2011-03-04 22:46:40 UTC (rev 45560)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/package.sh	2011-03-05 11:55:40 UTC (rev 45561)
@@ -123,7 +123,7 @@
 fi
 
 log make 
-make -k || ( cat error.log >&3 && false ) 
+# make -k || ( cat error.log >&3 && false ) 
 
 log make install
 make install
@@ -133,10 +133,10 @@
     $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_ROOT@#$OSGEO4W_ROOT#g" \
+sed -e "s#@POSTFIX@#$MAJOR$MINOR#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
+    mswindows/osgeo4w/env.bat.tmpl >$OSGEO4W_ROOT_MSYS/etc/ini/grass$MAJOR$MINOR.bat
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
     mswindows/osgeo4w/postinstall.bat >$OSGEO4W_ROOT_MSYS/etc/postinstall/grass$MAJOR$MINOR.bat 
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \