Преглед на файлове

winGRASS: remove ununsed shell startup script
(merge r66921:2, https://trac.osgeo.org/grass/changeset/66924, https://trac.osgeo.org/grass/changeset/66956, https://trac.osgeo.org/grass/changeset/66961 from trunk)


git-svn-id: https://svn.osgeo.org/grass/grass/branches/releasebranch_7_0@67018 15284696-431f-4ddb-bdfa-cd5b030d7da7

Martin Landa преди 9 години
родител
ревизия
46d903dc50
променени са 4 файла, в които са добавени 2 реда и са изтрити 34 реда
  1. 0 22
      mswindows/osgeo4w/grass.tmpl
  2. 0 7
      mswindows/osgeo4w/package.sh
  3. 2 4
      mswindows/osgeo4w/postinstall.bat
  4. 0 1
      mswindows/osgeo4w/preremove.bat

+ 0 - 22
mswindows/osgeo4w/grass.tmpl

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-#########################################################################
-#
-# GRASS initialization shell script (OSGeo4W)
-#
-#########################################################################
-
-OSGEO4W_ROOT_MSYS="@OSGEO4W_ROOT_MSYS@"
-GISBASE="$OSGEO4W_ROOT_MSYS/apps/grass/grass-@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-@VERSION@/bin:$PATH"
-
-export OSGEO4W_ROOT_MSYS GISBASE GRASS_SH GRASS_PYTHON PYTHONHOME GRASS_PROJSHARE
-export PATH
-
-"$GRASS_PYTHON" "$GISBASE/etc/grass@POSTFIX@.py" "$@"
-
-exit 0

+ 0 - 7
mswindows/osgeo4w/package.sh

@@ -158,8 +158,6 @@ cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/in
 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 @@ if [ -n "$PACKAGE" ]; then
 
     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 @@ if [ -n "$PACKAGE" ]; then
     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)

+ 2 - 4
mswindows/osgeo4w/postinstall.bat

@@ -1,8 +1,7 @@
 set ICON=%OSGEO4W_ROOT%\apps\grass\grass-@VERSION@\gui\icons\grass_osgeo.ico
 set ICON_CMD=%OSGEO4W_ROOT%\apps\grass\grass-@VERSION@\gui\icons\grass_cmd.ico
 set BATCH=%OSGEO4W_ROOT%\bin\@GRASS_EXECUTABLE@.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@.bat
-textreplace -std -t "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
+textreplace -std -t "%BATCH%"
 textreplace -std -t "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap
 
 mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@" 
@@ -29,5 +28,4 @@ set GISRC=dummy
 rem run g.mkfontcap outside a GRASS session
 "%GISBASE%\bin\g.mkfontcap.exe" -o
 
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@.bat.tmpl
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@.tmpl
+del "%BATCH%.tmpl

+ 0 - 1
mswindows/osgeo4w/preremove.bat

@@ -5,7 +5,6 @@ rmdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
 del "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION@.lnk"
 
 del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@.bat
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
 del "%OSGEO4W_ROOT%"\apps\grass\grass-@VERSION@\etc\fontcap
 del "%OSGEO4W_ROOT%"\apps\msys\bin\libintl3.dll
 del "%OSGEO4W_ROOT%"\apps\msys\bin\libiconv2.dll