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

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-05 03:34:56 -0800 (Sat, 05 Dec 2015)
New Revision: 67018

Removed:
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/grass.tmpl
Modified:
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/postinstall.bat
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat
Log:
winGRASS: remove ununsed shell startup script
          (merge r66921:2, r66924, r66956, r66961 from trunk)


Deleted: grass/branches/releasebranch_7_0/mswindows/osgeo4w/grass.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/grass.tmpl	2015-12-05 11:22:16 UTC (rev 67017)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/grass.tmpl	2015-12-05 11:34:56 UTC (rev 67018)
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-#########################################################################
-#
-# GRASS initialization shell script (OSGeo4W)
-#
-#########################################################################
-
-OSGEO4W_ROOT_MSYS="@OSGEO4W_ROOT_MSYS@"
-GISBASE="$OSGEO4W_ROOT_MSYS/apps/grass/grass- at VERSION@"
-GRASS_SH="$OSGEO4W_ROOT_MSYS/apps/msys/bin/sh.exe"
-GRASS_PYTHON="$OSGEO4W_ROOT_MSYS/bin/python.exe"
-PYTHONHOME="$OSGEO4W_ROOT_MSYS/apps/Python27"
-GRASS_PROJSHARE="$OSGEO4W_ROOT_MSYS/share/proj"
-PATH="$OSGEO4W_ROOT_MSYS/apps/grass/grass- at VERSION@/bin:$PATH"
-
-export OSGEO4W_ROOT_MSYS GISBASE GRASS_SH GRASS_PYTHON PYTHONHOME GRASS_PROJSHARE
-export PATH
-
-"$GRASS_PYTHON" "$GISBASE/etc/grass at POSTFIX@.py" "$@"
-
-exit 0

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-05 11:22:16 UTC (rev 67017)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-05 11:34:56 UTC (rev 67018)
@@ -158,8 +158,6 @@
 mkdir -p $OSGEO4W_ROOT_MSYS/etc/preremove $OSGEO4W_ROOT_MSYS/etc/postinstall
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
     mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/${GRASS_EXECUTABLE}.bat
-sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT_MSYS@#$OSGEO4W_ROOT_MSYS#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
-    mswindows/osgeo4w/grass.tmpl >$OSGEO4W_ROOT_MSYS/bin/${GRASS_EXECUTABLE}
 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
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
@@ -185,12 +183,9 @@
 
     sed -e "s#@VERSION@#$VERSION#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
 	$SRC/mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/${GRASS_EXECUTABLE}.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_EXECUTABLE}.tmpl
     
     # bat files - unix2dos
     unix2dos bin/${GRASS_EXECUTABLE}.bat.tmpl
-    unix2dos bin/${GRASS_EXECUTABLE}.tmpl
     unix2dos etc/postinstall/${GRASS_EXECUTABLE}.bat
     unix2dos etc/preremove/${GRASS_EXECUTABLE}.bat
     
@@ -198,11 +193,9 @@
     tar -cjf $PDIR/grass$PACKAGE_NAME-$VERSION-$PACKAGE.tar.bz2 \
 	apps/grass/grass-$VERSION \
 	bin/${GRASS_EXECUTABLE}.bat.tmpl \
-	bin/${GRASS_EXECUTABLE}.tmpl \
 	etc/postinstall/${GRASS_EXECUTABLE}.bat \
 	etc/preremove/${GRASS_EXECUTABLE}.bat
     
-    rm bin/${GRASS_EXECUTABLE}.tmpl
     rm bin/${GRASS_EXECUTABLE}.bat.tmpl
     
     # grass-devel package (obsolete)

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/postinstall.bat	2015-12-05 11:22:16 UTC (rev 67017)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/postinstall.bat	2015-12-05 11:34:56 UTC (rev 67018)
@@ -1,8 +1,7 @@
 set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\gui\icons\grass_osgeo.ico
 set ICON_CMD=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\gui\icons\grass_cmd.ico
 set BATCH=%OSGEO4W_ROOT%\bin\@GRASS_EXECUTABLE at .bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
+textreplace -std -t "%BATCH%"
 textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
 
 mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
@@ -29,5 +28,4 @@
 rem run g.mkfontcap outside a GRASS session
 "%GISBASE%\bin\g.mkfontcap.exe" -o
 
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat.tmpl
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .tmpl
+del "%BATCH%.tmpl

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat	2015-12-05 11:22:16 UTC (rev 67017)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat	2015-12-05 11:34:56 UTC (rev 67018)
@@ -5,7 +5,6 @@
 del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk"
 
 del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
 del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
 del "%OSGEO4W_ROOT%"\apps\msys\bin\libintl3.dll
 del "%OSGEO4W_ROOT%"\apps\msys\bin\libiconv2.dll