[GRASS-SVN] r55156 - in grass/branches/releasebranch_6_4: gui/scripts gui/tcltk/gis.m lib/init mswindows mswindows/osgeo4w scripts visualization/nviz/scripts
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Feb 21 18:53:46 PST 2013
Author: hamish
Date: 2013-02-21 18:53:45 -0800 (Thu, 21 Feb 2013)
New Revision: 55156
Modified:
grass/branches/releasebranch_6_4/gui/scripts/windows_launch.bat
grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gis.m.bat
grass/branches/releasebranch_6_4/lib/init/grass-run.bat
grass/branches/releasebranch_6_4/lib/init/init.bat
grass/branches/releasebranch_6_4/mswindows/env.bat
grass/branches/releasebranch_6_4/mswindows/osgeo4w/msys.bat
grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat
grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat
grass/branches/releasebranch_6_4/scripts/windows_launch.bat
grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz.bat
Log:
svn props using module_svn_propset.sh, especially eol-style=CRLF (#1803)
Modified: grass/branches/releasebranch_6_4/gui/scripts/windows_launch.bat
===================================================================
--- grass/branches/releasebranch_6_4/gui/scripts/windows_launch.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/gui/scripts/windows_launch.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1 +1 @@
-@"%GRASS_SH%" -c '"%GISBASE%/etc/gui/scripts/SCRIPT_NAME" %*'
+@"%GRASS_SH%" -c '"%GISBASE%/etc/gui/scripts/SCRIPT_NAME" %*'
Property changes on: grass/branches/releasebranch_6_4/gui/scripts/windows_launch.bat
___________________________________________________________________
Deleted: svn:executable
- *
Modified: svn:eol-style
- native
+ CRLF
Modified: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gis.m.bat
===================================================================
--- grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gis.m.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gis.m.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1 +1 @@
- at start "gis.m" "%GRASS_WISH%" "%GISBASE%/etc/gm/gm.tcl"
+ at start "gis.m" "%GRASS_WISH%" "%GISBASE%/etc/gm/gm.tcl"
Property changes on: grass/branches/releasebranch_6_4/gui/tcltk/gis.m/gis.m.bat
___________________________________________________________________
Added: svn:mime-type
+ text/x-bat
Added: svn:eol-style
+ CRLF
Modified: grass/branches/releasebranch_6_4/lib/init/grass-run.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/grass-run.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/lib/init/grass-run.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1,30 +1,30 @@
- at echo off
-rem Batch file to launch GRASS commands
-
-rem Change console title to name of module
-title GRASS: %1
-
-rem Force command line startup mode
-set GRASS_UI_TERM=1
-
-rem Run command
-%*
-
-if not %errorlevel% == 0 goto error
-
-title GRASS: %1 Done.
-echo.
-echo %1 complete.
-pause
-
-:end
-exit %errorlevel%
-
-:error
-title GRASS: %1 Done. (error %errorlevel%)
-echo.
-echo -----
-echo ERROR: %1 exited abnormally.
-echo -----
-pause
-goto end
+ at echo off
+rem Batch file to launch GRASS commands
+
+rem Change console title to name of module
+title GRASS: %1
+
+rem Force command line startup mode
+set GRASS_UI_TERM=1
+
+rem Run command
+%*
+
+if not %errorlevel% == 0 goto error
+
+title GRASS: %1 Done.
+echo.
+echo %1 complete.
+pause
+
+:end
+exit %errorlevel%
+
+:error
+title GRASS: %1 Done. (error %errorlevel%)
+echo.
+echo -----
+echo ERROR: %1 exited abnormally.
+echo -----
+pause
+goto end
Property changes on: grass/branches/releasebranch_6_4/lib/init/grass-run.bat
___________________________________________________________________
Deleted: svn:executable
- *
Modified: svn:eol-style
- native
+ CRLF
Modified: grass/branches/releasebranch_6_4/lib/init/init.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/lib/init/init.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1,208 +1,208 @@
- at echo off
-rem #########################################################################
-rem
-rem MODULE: GRASS Initialization
-rem AUTHOR(S): Paul Kelly
-rem
-rem PURPOSE: The source file for this batch script is lib/init/init.bat.
-rem It sets up some environment variables, default GISRC file
-rem if necessary, etc. prior to starting GRASS proper.
-rem It is intended to be a native Windows replacement for Init.bat,
-rem but does not (yet) contain all the same functionality.
-rem
-rem In particular also, GUI mode prints nothing to the terminal
-rem and does not expect or provide an interactive terminal
-rem running in addition to the GUI display.
-rem
-rem COPYRIGHT: (C) 2006, 2011 by the GRASS Development Team
-rem
-rem This program is free software under the GNU General Public
-rem License (>=v2). Read the file COPYING that comes with GRASS
-rem for details.
-rem
-rem #########################################################################
-
-set SAVEPATH=%PATH%
-rem DON'T include scripts directory in PATH - .bat files in bin directory
-rem are used to run scripts on Windows
-
-if exist "%APPDATA%\GRASS6\env.bat" (
- call %APPDATA%\GRASS6\env.bat
-)
-if "%GRASS_ADDON_PATH%"=="" set GRASS_ADDON_PATH=%APPDATA%\GRASS6\addons
-PATH=%GISBASE%\bin;%GISBASE%\lib;%GRASS_ADDON_PATH%;%PATH%
-
-set GIS_LOCK=1
-set GRASS_VERSION=GRASS_VERSION_NUMBER
-if "%HOME%"=="" set HOME=%USERPROFILE%
-set WINGISRC=%APPDATA%\GRASS6\grassrc6
-rem Create missing folder
-if not exist "%APPDATA%\GRASS6" (
- md "%APPDATA%\GRASS6"
-)
-rem Make sure %GISRC% is set so g.dirseps will work
-rem (not actually used)
-set GISRC=junk
-
-rem Generate GISBASE by converting dirsep characters from \ to /
-FOR /F "usebackq delims==" %%i IN (`g.dirseps -g "%GISBASE%"`) DO @set GISBASE=%%i
-
-if not "%LANG%"=="" goto langset
-FOR /F "usebackq delims==" %%i IN (`"%GISBASE%\etc\winlocale"`) DO @set LANG=%%i
-:langset
-
-set GRASS_PAGER=more
-if "%GRASS_WISH%"=="" set GRASS_WISH=wish.exe
-if "%GRASS_SH%"=="" set GRASS_SH=c:\msys\1.0\bin\sh.exe
-
-rem Should do something with "assoc .html" and ftype here but would require
-rem a new g.manual.bat too so leaving it like this for now...
-if "%GRASS_HTML_BROWSER%"=="" set GRASS_HTML_BROWSER=explorer
-
-if "%GRASS_PROJSHARE%"=="" set GRASS_PROJSHARE=CONFIG_PROJSHARE
-
-rem Add python scripts to the PATHEXT variable
-set PATHEXT=%PATHEXT%;.PY
-
-if "%1" == "-version" goto displaylicence
-if "%1" == "-v" goto displaylicence
-
-if "%1" == "-text" goto settextmode
-:aftertextcheck
-
-if "%1" == "-tcltk" goto setguimode
-if "%1" == "-wxpython" goto setwxmode
-if "%1" == "-wx" goto setwxmode
-if "%1" == "-gui" goto setguimode
-
-:afterguicheck
-
-if exist "%WINGISRC%" (
- set HAVE_GISRC=true
- goto aftercreategisrc
-)
-
-set HAVE_GISRC=false
-rem Create an initial GISRC file based on current directory
-"%GISBASE%\etc\echo" "GISDBASE: %USERPROFILE%" | g.dirseps -g > "%WINGISRC%"
-"%GISBASE%\etc\echo" "LOCATION_NAME: <UNKNOWN>" >> "%WINGISRC%"
-"%GISBASE%\etc\echo" "MAPSET: <UNKNOWN>" >> "%WINGISRC%"
-
-:aftercreategisrc
-
-rem Now set the real GISRC
-FOR /F "usebackq delims==" %%i IN (`g.dirseps -g "%WINGISRC%"`) DO @set GISRC=%%i
-
-rem Fetch the language setting from user's prefs
-FOR /F "usebackq delims==" %%i IN (`g.gisenv "get=LANG"`) DO @set LANG=%%i
-
-rem Set GRASS_GUI
-
-if "%GRASS_GUI%" == "" (
- FOR /F "usebackq delims==" %%i IN (`g.gisenv "get=GRASS_GUI"`) DO @set GRASS_GUI=%%i
-) else (
- g.gisenv "set=GRASS_GUI=%GRASS_GUI%"
-)
-
-rem Set wxGUI as default if not specified elsewhere
-if "%GRASS_GUI%"=="" set GRASS_GUI=wxpython
-
-rem Clean out old .tmp files from the mapset
-if "%HAVE_GISRC%"=="true" (
- "%GISBASE%\etc\clean_temp" > NUL:
-)
-set HAVE_GISRC=
-
-if "%GRASS_GUI%"=="text" goto text
-if "%GRASS_GUI%"=="wxpython" goto wxpython
-
-if not "%GRASS_WISH%"=="" (
- "%GRASS_WISH%" "%GISBASE%\etc\gis_set.tcl"
-) else (
- "%GISBASE%\etc\gis_set.tcl"
-)
-
-rem This doesn't seem to work; don't understand return codes from gis_set.tcl PK
-rem if return ok, gis.m start:
-if %errorlevel% == 2 goto exitinit
-
-rem Does line 42 above mean that GRASS_WISH will always be set?
-if not "%GRASS_WISH%"=="" (
- start /b "GRASS Tcl/Tk" "%GRASS_WISH%" "%GISBASE%\etc\gm\gm.tcl"
-) else (
- start /b "GRASS Tcl/Tk" "%GISBASE%\etc\gm\gm.tcl"
-)
-
-rem Will redirecting output to NUL hide legitamite error messages, harming debugging?
-"%GISBASE%\etc\clean_temp" > NUL:
-
-goto exitinit
-
-:wxpython
-
-set PYTHONPATH=%PYTHONPATH%;%GISBASE%\etc\python;%GISBASE%\etc\wxpython
-
-python "%GISBASE%/etc/wxpython/gis_set.py"
-if %errorlevel% == 2 goto exitinit
-python "%GISBASE%/etc/wxpython/wxgui.py"
-
-goto exitinit
-
-:text
-
-"%GISBASE%\etc\set_data"
-
-if %errorlevel% == 1 goto exitinit
-
-rem Get LOCATION_NAME to use in prompt
-FOR /F "usebackq delims==" %%i IN (`g.gisenv "get=LOCATION_NAME"`) DO @set LOCATION_NAME=%%i
-
-type "%GISBASE%\etc\welcome"
-
-"%GISBASE%\etc\echo" ""
-"%GISBASE%\etc\echo" "GRASS homepage: http://grass.osgeo.org/"
-"%GISBASE%\etc\echo" "This version running thru: Windows Command Shell (cmd.exe)"
-"%GISBASE%\etc\echo" "When ready to quit enter: exit"
-"%GISBASE%\etc\echo" "Help is available with the command: g.manual -i"
-"%GISBASE%\etc\echo" "See the licence terms with: g.version -c"
-"%GISBASE%\etc\echo" ""
-
-prompt GRASS %GRASS_VERSION% $C%LOCATION_NAME%$F$G
-
-cmd.exe
-
-prompt
-goto exitinit
-
-:displaylicence
-
-type "%GISBASE%\etc\license"
-goto exitinit
-
-:settextmode
-
-set GRASS_GUI=text
-shift
-
-goto aftertextcheck
-
-:setguimode
-set GRASS_GUI=tcltk
-shift
-
-goto afterguicheck
-
-:setwxmode
-set GRASS_GUI=wxpython
-shift
-
-goto afterguicheck
-
-:exitinit
-
-rem Clean out old .tmp files from the mapset
-"%GISBASE%\etc\clean_temp" > NUL:
-
-set PATH=%SAVEPATH%
-set SAVEPATH=
-exit /b
+ at echo off
+rem #########################################################################
+rem
+rem MODULE: GRASS Initialization
+rem AUTHOR(S): Paul Kelly
+rem
+rem PURPOSE: The source file for this batch script is lib/init/init.bat.
+rem It sets up some environment variables, default GISRC file
+rem if necessary, etc. prior to starting GRASS proper.
+rem It is intended to be a native Windows replacement for Init.bat,
+rem but does not (yet) contain all the same functionality.
+rem
+rem In particular also, GUI mode prints nothing to the terminal
+rem and does not expect or provide an interactive terminal
+rem running in addition to the GUI display.
+rem
+rem COPYRIGHT: (C) 2006, 2011 by the GRASS Development Team
+rem
+rem This program is free software under the GNU General Public
+rem License (>=v2). Read the file COPYING that comes with GRASS
+rem for details.
+rem
+rem #########################################################################
+
+set SAVEPATH=%PATH%
+rem DON'T include scripts directory in PATH - .bat files in bin directory
+rem are used to run scripts on Windows
+
+if exist "%APPDATA%\GRASS6\env.bat" (
+ call %APPDATA%\GRASS6\env.bat
+)
+if "%GRASS_ADDON_PATH%"=="" set GRASS_ADDON_PATH=%APPDATA%\GRASS6\addons
+PATH=%GISBASE%\bin;%GISBASE%\lib;%GRASS_ADDON_PATH%;%PATH%
+
+set GIS_LOCK=1
+set GRASS_VERSION=GRASS_VERSION_NUMBER
+if "%HOME%"=="" set HOME=%USERPROFILE%
+set WINGISRC=%APPDATA%\GRASS6\grassrc6
+rem Create missing folder
+if not exist "%APPDATA%\GRASS6" (
+ md "%APPDATA%\GRASS6"
+)
+rem Make sure %GISRC% is set so g.dirseps will work
+rem (not actually used)
+set GISRC=junk
+
+rem Generate GISBASE by converting dirsep characters from \ to /
+FOR /F "usebackq delims==" %%i IN (`g.dirseps -g "%GISBASE%"`) DO @set GISBASE=%%i
+
+if not "%LANG%"=="" goto langset
+FOR /F "usebackq delims==" %%i IN (`"%GISBASE%\etc\winlocale"`) DO @set LANG=%%i
+:langset
+
+set GRASS_PAGER=more
+if "%GRASS_WISH%"=="" set GRASS_WISH=wish.exe
+if "%GRASS_SH%"=="" set GRASS_SH=c:\msys\1.0\bin\sh.exe
+
+rem Should do something with "assoc .html" and ftype here but would require
+rem a new g.manual.bat too so leaving it like this for now...
+if "%GRASS_HTML_BROWSER%"=="" set GRASS_HTML_BROWSER=explorer
+
+if "%GRASS_PROJSHARE%"=="" set GRASS_PROJSHARE=CONFIG_PROJSHARE
+
+rem Add python scripts to the PATHEXT variable
+set PATHEXT=%PATHEXT%;.PY
+
+if "%1" == "-version" goto displaylicence
+if "%1" == "-v" goto displaylicence
+
+if "%1" == "-text" goto settextmode
+:aftertextcheck
+
+if "%1" == "-tcltk" goto setguimode
+if "%1" == "-wxpython" goto setwxmode
+if "%1" == "-wx" goto setwxmode
+if "%1" == "-gui" goto setguimode
+
+:afterguicheck
+
+if exist "%WINGISRC%" (
+ set HAVE_GISRC=true
+ goto aftercreategisrc
+)
+
+set HAVE_GISRC=false
+rem Create an initial GISRC file based on current directory
+"%GISBASE%\etc\echo" "GISDBASE: %USERPROFILE%" | g.dirseps -g > "%WINGISRC%"
+"%GISBASE%\etc\echo" "LOCATION_NAME: <UNKNOWN>" >> "%WINGISRC%"
+"%GISBASE%\etc\echo" "MAPSET: <UNKNOWN>" >> "%WINGISRC%"
+
+:aftercreategisrc
+
+rem Now set the real GISRC
+FOR /F "usebackq delims==" %%i IN (`g.dirseps -g "%WINGISRC%"`) DO @set GISRC=%%i
+
+rem Fetch the language setting from user's prefs
+FOR /F "usebackq delims==" %%i IN (`g.gisenv "get=LANG"`) DO @set LANG=%%i
+
+rem Set GRASS_GUI
+
+if "%GRASS_GUI%" == "" (
+ FOR /F "usebackq delims==" %%i IN (`g.gisenv "get=GRASS_GUI"`) DO @set GRASS_GUI=%%i
+) else (
+ g.gisenv "set=GRASS_GUI=%GRASS_GUI%"
+)
+
+rem Set wxGUI as default if not specified elsewhere
+if "%GRASS_GUI%"=="" set GRASS_GUI=wxpython
+
+rem Clean out old .tmp files from the mapset
+if "%HAVE_GISRC%"=="true" (
+ "%GISBASE%\etc\clean_temp" > NUL:
+)
+set HAVE_GISRC=
+
+if "%GRASS_GUI%"=="text" goto text
+if "%GRASS_GUI%"=="wxpython" goto wxpython
+
+if not "%GRASS_WISH%"=="" (
+ "%GRASS_WISH%" "%GISBASE%\etc\gis_set.tcl"
+) else (
+ "%GISBASE%\etc\gis_set.tcl"
+)
+
+rem This doesn't seem to work; don't understand return codes from gis_set.tcl PK
+rem if return ok, gis.m start:
+if %errorlevel% == 2 goto exitinit
+
+rem Does line 42 above mean that GRASS_WISH will always be set?
+if not "%GRASS_WISH%"=="" (
+ start /b "GRASS Tcl/Tk" "%GRASS_WISH%" "%GISBASE%\etc\gm\gm.tcl"
+) else (
+ start /b "GRASS Tcl/Tk" "%GISBASE%\etc\gm\gm.tcl"
+)
+
+rem Will redirecting output to NUL hide legitamite error messages, harming debugging?
+"%GISBASE%\etc\clean_temp" > NUL:
+
+goto exitinit
+
+:wxpython
+
+set PYTHONPATH=%PYTHONPATH%;%GISBASE%\etc\python;%GISBASE%\etc\wxpython
+
+python "%GISBASE%/etc/wxpython/gis_set.py"
+if %errorlevel% == 2 goto exitinit
+python "%GISBASE%/etc/wxpython/wxgui.py"
+
+goto exitinit
+
+:text
+
+"%GISBASE%\etc\set_data"
+
+if %errorlevel% == 1 goto exitinit
+
+rem Get LOCATION_NAME to use in prompt
+FOR /F "usebackq delims==" %%i IN (`g.gisenv "get=LOCATION_NAME"`) DO @set LOCATION_NAME=%%i
+
+type "%GISBASE%\etc\welcome"
+
+"%GISBASE%\etc\echo" ""
+"%GISBASE%\etc\echo" "GRASS homepage: http://grass.osgeo.org/"
+"%GISBASE%\etc\echo" "This version running thru: Windows Command Shell (cmd.exe)"
+"%GISBASE%\etc\echo" "When ready to quit enter: exit"
+"%GISBASE%\etc\echo" "Help is available with the command: g.manual -i"
+"%GISBASE%\etc\echo" "See the licence terms with: g.version -c"
+"%GISBASE%\etc\echo" ""
+
+prompt GRASS %GRASS_VERSION% $C%LOCATION_NAME%$F$G
+
+cmd.exe
+
+prompt
+goto exitinit
+
+:displaylicence
+
+type "%GISBASE%\etc\license"
+goto exitinit
+
+:settextmode
+
+set GRASS_GUI=text
+shift
+
+goto aftertextcheck
+
+:setguimode
+set GRASS_GUI=tcltk
+shift
+
+goto afterguicheck
+
+:setwxmode
+set GRASS_GUI=wxpython
+shift
+
+goto afterguicheck
+
+:exitinit
+
+rem Clean out old .tmp files from the mapset
+"%GISBASE%\etc\clean_temp" > NUL:
+
+set PATH=%SAVEPATH%
+set SAVEPATH=
+exit /b
Property changes on: grass/branches/releasebranch_6_4/lib/init/init.bat
___________________________________________________________________
Modified: svn:eol-style
- native
+ CRLF
Property changes on: grass/branches/releasebranch_6_4/mswindows/env.bat
___________________________________________________________________
Added: svn:mime-type
+ text/x-bat
Added: svn:eol-style
+ CRLF
Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/msys.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/msys.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/msys.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1,197 +1,197 @@
- at echo off
-rem Copyright (C): 2001, 2002, 2003, 2004, 2005 Earnie Boyd
-rem mailto:earnie at users.sf.net
-rem This file is part of Minimal SYStem
-rem http://www.mingw.org/msys.shtml
-rem
-rem File: msys.bat
-rem Revision: 2.4
-rem Revision Date: December 8th, 2005
-rem --- MODIFIED FOR GRASS Aug 2009: Quote path name variables ---
-
-rem ember to set the "Start in:" field of the shortcut.
-rem A value similar to C:\msys\1.0\bin is what the "Start in:" field needs
-rem to represent.
-
-rem ember value of GOTO: is used to know recursion has happened.
-if "%1" == "GOTO:" goto %2
-
-if NOT "x%WD%" == "x" set WD=
-
-rem ember command.com only uses the first eight characters of the label.
-goto _WindowsNT
-
-rem ember that we only execute here if we are in command.com.
-:_Windows
-
-if "x%COMSPEC%" == "x" set COMSPEC=command.com
-start /min "%COMSPEC%" /e:4096 /c %0 GOTO: _Resume %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto EOF
-
-rem ember that we execute here if we recursed.
-:_Resume
-for %%F in (1 2 3) do shift
-if NOT EXIST "%WD%msys-1.0.dll" set WD=.\bin\
-
-rem ember that we get here even in command.com.
-:_WindowsNT
-
-rem Hopefully a temporary workaround for getting MSYS shell to run on x64
-rem (WoW64 cmd prompt sets PROCESSOR_ARCHITECTURE to x86)
-if not "x%PROCESSOR_ARCHITECTURE%" == "xAMD64" goto _NotX64
-set COMSPEC=%WINDIR%\SysWOW64\cmd.exe
-"%COMSPEC%" /c %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
-goto EOF
-:_NotX64
-
-if NOT EXIST "%WD%msys-1.0.dll" set WD=%~dps0bin\
-rem echo %WD%
-
-rem if installed in a directory containing spaces prepare for a world of pain
-for /F %%i IN ('echo %WD%') DO @set PART1=%%i
-if NOT "%PART1%" == "%WD%" (
- echo Path names containing spaces are not supported -- aborting.
- pause
- exit 1
-)
-
-rem ember Set up option to use rxvt based on value of %1
-if "x%MSYSCON%" == "x" set MSYSCON=rxvt.exe
-if "x%1" == "x-norxvt" set MSYSCON=sh.exe
-if "x%1" == "x--norxvt" set MSYSCON=sh.exe
-if "x%MSYSCON%" == "xsh.exe" shift
-
-if "x%MSYSTEM%" == "x" set MSYSTEM=MINGW32
-if "%1" == "MINGW32" set MSYSTEM=MINGW32
-if "%1" == "MSYS" set MSYSTEM=MSYS
-
-if NOT "x%DISPLAY%" == "x" set DISPLAY=
-
-if "x%MSYSCON%" == "xrxvt.exe" goto startrxvt
-if "x%MSYSCON%" == "xsh.exe" goto startsh
-
-:unknowncon
-echo %MSYSCON% is an unknown option for msys.bat.
-pause
-exit 1
-
-:notfound
-echo Cannot find the rxvt.exe or sh.exe binary -- aborting.
-pause
-exit 1
-
-rem If you don't want to use rxvt then rename the file rxvt.exe to something
-rem else. Then sh.exe will be used instead.
-:startrxvt
-if NOT EXIST "%WD%rxvt.exe" goto startsh
-
-rem Setup the default colors for rxvt.
-if "x%MSYSBGCOLOR%" == "x" set MSYSBGCOLOR=White
-if "x%MSYSFGCOLOR%" == "x" set MSYSFGCOLOR=Black
-if "x%MINGW32BGCOLOR%" == "x" set MINGW32BGCOLOR=Black
-if "x%MINGW32FGCOLOR%" == "x" set MINGW32FGCOLOR=White
-if "%MSYSTEM%" == "MSYS" set BGCOLOR=%MSYSBGCOLOR%
-if "%MSYSTEM%" == "MSYS" set FGCOLOR=%MSYSFGCOLOR%
-if "%MSYSTEM%" == "MINGW32" set BGCOLOR=%MINGW32BGCOLOR%
-if "%MSYSTEM%" == "MINGW32" set FGCOLOR=%MINGW32FGCOLOR%
-
-if "x%*" == "x" start "MSYS 1.0" "%WD%rxvt" -backspacekey -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-16 -tn msys -geometry 80x25 -e /bin/sh --login -i
-if NOT "x%*" == "x" start "MSYS 1.0" "%WD%rxvt" -backspacekey -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-16 -tn msys -geometry 80x25 -e /bin/sh --login -c "%*"
-exit
-
-:startsh
-if NOT EXIST "%WD%sh.exe" goto notfound
-start "MSYS 1.0" "%WD%sh" --login -i
-exit
-
-:EOF
-
-rem ChangeLog:
-rem 2002.03.07 Earnie Boyd mailto:earnie at users.sf.net
-rem * Move the @echo off to the top.
-rem * Change the binmode setting to nobinmode.
-rem * Remove the angle brackets around email address to workaround MS
-rem buggy command processor.
-rem
-rem 2002.03.12 Earnie Boyd mailto:earnie at users.sf.net
-rem * Add filter logic to find rxvt.exe
-rem
-rem 2002.03.13 Earnie Boyd mailto:earnie at users.sf.net
-rem * Revert the nobinmode change.
-rem
-rem 2002.03.20 Earnie Boyd mailto:earnie at users.sf.net
-rem * Add logic for stating bash.
-rem
-rem 2002.04.11 Earnie Boyd mailto;earnie at users.sf.net
-rem * Add logic for setting MSYSTEM value based on parameter.
-rem
-rem 2002.04.15 Olivier Gautherot mailto:olivier_gautherot at mentorg.com
-rem * Reduce number test conditions for finding an executable.
-rem
-rem 2002.04.15 Earnie Boyd mailto:earnie at users.sf.net
-rem * Unset DISPLAY if set before starting shell.
-rem
-rem 2002.04.16 Earnie Boyd mailto:earnie at users.sf.net
-rem * Remove use of DEFINED in conditional statments for variables for
-rem command.com support.
-rem * Add check for nonexistance of USERNAME variable for Win9x support.
-rem
-rem 2002.04.17 Earnie Boyd mailto:earnie at users.sf.net
-rem * Add foreground and background color defaults based on MSYSTEM value.
-rem
-rem 2002.04.22 Earnie Boyd mailto:earnie at users.sf.net
-rem * More Win 9x changes.
-rem
-rem 2002.05.04 Earnie Boyd mailto:earnie at users.sf.net
-rem * Remove the SET of USERNAME and HOME.
-rem
-rem 2002.11.18 Earnie Boyd mailto:earnie at users.sf.net
-rem * Add command.com detection and restart with a larger environment to
-rem avoid errors on w9x.
-rem Many thanks to Randy W. Sims mailto:RandyS at ThePierianSpring.org.
-rem See Randy's response to "RE: [Mingw-msys] Installation on WindowsME"
-rem from 11/06/2002 in the archives of mingw-msys at lists.sf.net.
-rem
-rem 2002.11.19 Paul Garceau mailto:pgarceau at attbi.com
-rem * Fix a typo: Change COMPSPEC to COMSPEC.
-rem
-rem 2002.11.25 Earnie Boyd mailto:earnie at users.sf.net
-rem * Remove the SET CYGWIN since it doesn't matter any longer.
-rem
-rem 2003.02.03 Earnie Boyd mailto:earnie at users.sf.net
-rem * Win9x doesn't like ``EXISTS dir'' so change it to ``EXISTS dir\nul''.
-rem Thanks to Nicolas Weber mailto:nicolasweber at gmx.de.
-rem
-rem 2003.03.06 Earnie Boyd mailto:earnie at users.sf.net
-rem * Add -backspacekey switch to rxvt startup.
-rem * Move RXVT color setup to startrxvt label
-rem
-rem 2004.01.30 Earnie Boyd mailto:earnie at users.sf.net
-rem * Add -geometry parameter to work around an off by one issue with
-rem the default values.
-rem Thanks to Dave Schuyler mailto:parameter at users.sf.net
-rem
-rem 2004.03.28 Earnie Boyd mailto:earnie at users.sf.net
-rem * Add -norxvt or --norxvt switch argument.
-rem Thanks to Keith Marshall mailto:Keith.Marshall at total.com.
-rem * Add method to determine absolute path of msys.bat so that we no
-rem longer need to change to the bin directory. This allows msys.bat to be
-rem called from any working directory.
-rem Thanks to Kevin Mack mailto:kevin.mack at us.cd-adapco.com
-rem
-rem 2005.07.06 Max TE Woodbury mailto:mtew at users.sf.net
-rem * Fixed WD check for command.com systems.
-rem * Minimized intermediate CMD window to reduce startup flashyness.
-rem * If rxvt.exe cannot be found, try sh.exe.
-rem
-rem 2005.12.06 Tuomo Latto mailto:nonperson at users.sf.net
-rem * Added a temporary workaround for getting MSYS shell to run on x64.
-rem
-rem 2005.12.07 Keith Marshall mailto:keithmarshall at users.sf.net
-rem * ``EXISTS %WD%\sh.exe'' should be ``EXISTS %WD%sh.exe''; corrected.
-rem * Modified Tuomo's patch, to avoid trashing Window settings in Win32.
-rem
-rem 2005.12.08 Tuomo Latto mailto:nonperson at users.sf.net
-rem * Keith's modified patch fails on x64; start did funny things.
-rem Reworked, for correct behaviour on both platforms.
-rem
+ at echo off
+rem Copyright (C): 2001, 2002, 2003, 2004, 2005 Earnie Boyd
+rem mailto:earnie at users.sf.net
+rem This file is part of Minimal SYStem
+rem http://www.mingw.org/msys.shtml
+rem
+rem File: msys.bat
+rem Revision: 2.4
+rem Revision Date: December 8th, 2005
+rem --- MODIFIED FOR GRASS Aug 2009: Quote path name variables ---
+
+rem ember to set the "Start in:" field of the shortcut.
+rem A value similar to C:\msys\1.0\bin is what the "Start in:" field needs
+rem to represent.
+
+rem ember value of GOTO: is used to know recursion has happened.
+if "%1" == "GOTO:" goto %2
+
+if NOT "x%WD%" == "x" set WD=
+
+rem ember command.com only uses the first eight characters of the label.
+goto _WindowsNT
+
+rem ember that we only execute here if we are in command.com.
+:_Windows
+
+if "x%COMSPEC%" == "x" set COMSPEC=command.com
+start /min "%COMSPEC%" /e:4096 /c %0 GOTO: _Resume %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto EOF
+
+rem ember that we execute here if we recursed.
+:_Resume
+for %%F in (1 2 3) do shift
+if NOT EXIST "%WD%msys-1.0.dll" set WD=.\bin\
+
+rem ember that we get here even in command.com.
+:_WindowsNT
+
+rem Hopefully a temporary workaround for getting MSYS shell to run on x64
+rem (WoW64 cmd prompt sets PROCESSOR_ARCHITECTURE to x86)
+if not "x%PROCESSOR_ARCHITECTURE%" == "xAMD64" goto _NotX64
+set COMSPEC=%WINDIR%\SysWOW64\cmd.exe
+"%COMSPEC%" /c %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+goto EOF
+:_NotX64
+
+if NOT EXIST "%WD%msys-1.0.dll" set WD=%~dps0bin\
+rem echo %WD%
+
+rem if installed in a directory containing spaces prepare for a world of pain
+for /F %%i IN ('echo %WD%') DO @set PART1=%%i
+if NOT "%PART1%" == "%WD%" (
+ echo Path names containing spaces are not supported -- aborting.
+ pause
+ exit 1
+)
+
+rem ember Set up option to use rxvt based on value of %1
+if "x%MSYSCON%" == "x" set MSYSCON=rxvt.exe
+if "x%1" == "x-norxvt" set MSYSCON=sh.exe
+if "x%1" == "x--norxvt" set MSYSCON=sh.exe
+if "x%MSYSCON%" == "xsh.exe" shift
+
+if "x%MSYSTEM%" == "x" set MSYSTEM=MINGW32
+if "%1" == "MINGW32" set MSYSTEM=MINGW32
+if "%1" == "MSYS" set MSYSTEM=MSYS
+
+if NOT "x%DISPLAY%" == "x" set DISPLAY=
+
+if "x%MSYSCON%" == "xrxvt.exe" goto startrxvt
+if "x%MSYSCON%" == "xsh.exe" goto startsh
+
+:unknowncon
+echo %MSYSCON% is an unknown option for msys.bat.
+pause
+exit 1
+
+:notfound
+echo Cannot find the rxvt.exe or sh.exe binary -- aborting.
+pause
+exit 1
+
+rem If you don't want to use rxvt then rename the file rxvt.exe to something
+rem else. Then sh.exe will be used instead.
+:startrxvt
+if NOT EXIST "%WD%rxvt.exe" goto startsh
+
+rem Setup the default colors for rxvt.
+if "x%MSYSBGCOLOR%" == "x" set MSYSBGCOLOR=White
+if "x%MSYSFGCOLOR%" == "x" set MSYSFGCOLOR=Black
+if "x%MINGW32BGCOLOR%" == "x" set MINGW32BGCOLOR=Black
+if "x%MINGW32FGCOLOR%" == "x" set MINGW32FGCOLOR=White
+if "%MSYSTEM%" == "MSYS" set BGCOLOR=%MSYSBGCOLOR%
+if "%MSYSTEM%" == "MSYS" set FGCOLOR=%MSYSFGCOLOR%
+if "%MSYSTEM%" == "MINGW32" set BGCOLOR=%MINGW32BGCOLOR%
+if "%MSYSTEM%" == "MINGW32" set FGCOLOR=%MINGW32FGCOLOR%
+
+if "x%*" == "x" start "MSYS 1.0" "%WD%rxvt" -backspacekey -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-16 -tn msys -geometry 80x25 -e /bin/sh --login -i
+if NOT "x%*" == "x" start "MSYS 1.0" "%WD%rxvt" -backspacekey -sl 2500 -fg %FGCOLOR% -bg %BGCOLOR% -sr -fn Courier-16 -tn msys -geometry 80x25 -e /bin/sh --login -c "%*"
+exit
+
+:startsh
+if NOT EXIST "%WD%sh.exe" goto notfound
+start "MSYS 1.0" "%WD%sh" --login -i
+exit
+
+:EOF
+
+rem ChangeLog:
+rem 2002.03.07 Earnie Boyd mailto:earnie at users.sf.net
+rem * Move the @echo off to the top.
+rem * Change the binmode setting to nobinmode.
+rem * Remove the angle brackets around email address to workaround MS
+rem buggy command processor.
+rem
+rem 2002.03.12 Earnie Boyd mailto:earnie at users.sf.net
+rem * Add filter logic to find rxvt.exe
+rem
+rem 2002.03.13 Earnie Boyd mailto:earnie at users.sf.net
+rem * Revert the nobinmode change.
+rem
+rem 2002.03.20 Earnie Boyd mailto:earnie at users.sf.net
+rem * Add logic for stating bash.
+rem
+rem 2002.04.11 Earnie Boyd mailto;earnie at users.sf.net
+rem * Add logic for setting MSYSTEM value based on parameter.
+rem
+rem 2002.04.15 Olivier Gautherot mailto:olivier_gautherot at mentorg.com
+rem * Reduce number test conditions for finding an executable.
+rem
+rem 2002.04.15 Earnie Boyd mailto:earnie at users.sf.net
+rem * Unset DISPLAY if set before starting shell.
+rem
+rem 2002.04.16 Earnie Boyd mailto:earnie at users.sf.net
+rem * Remove use of DEFINED in conditional statments for variables for
+rem command.com support.
+rem * Add check for nonexistance of USERNAME variable for Win9x support.
+rem
+rem 2002.04.17 Earnie Boyd mailto:earnie at users.sf.net
+rem * Add foreground and background color defaults based on MSYSTEM value.
+rem
+rem 2002.04.22 Earnie Boyd mailto:earnie at users.sf.net
+rem * More Win 9x changes.
+rem
+rem 2002.05.04 Earnie Boyd mailto:earnie at users.sf.net
+rem * Remove the SET of USERNAME and HOME.
+rem
+rem 2002.11.18 Earnie Boyd mailto:earnie at users.sf.net
+rem * Add command.com detection and restart with a larger environment to
+rem avoid errors on w9x.
+rem Many thanks to Randy W. Sims mailto:RandyS at ThePierianSpring.org.
+rem See Randy's response to "RE: [Mingw-msys] Installation on WindowsME"
+rem from 11/06/2002 in the archives of mingw-msys at lists.sf.net.
+rem
+rem 2002.11.19 Paul Garceau mailto:pgarceau at attbi.com
+rem * Fix a typo: Change COMPSPEC to COMSPEC.
+rem
+rem 2002.11.25 Earnie Boyd mailto:earnie at users.sf.net
+rem * Remove the SET CYGWIN since it doesn't matter any longer.
+rem
+rem 2003.02.03 Earnie Boyd mailto:earnie at users.sf.net
+rem * Win9x doesn't like ``EXISTS dir'' so change it to ``EXISTS dir\nul''.
+rem Thanks to Nicolas Weber mailto:nicolasweber at gmx.de.
+rem
+rem 2003.03.06 Earnie Boyd mailto:earnie at users.sf.net
+rem * Add -backspacekey switch to rxvt startup.
+rem * Move RXVT color setup to startrxvt label
+rem
+rem 2004.01.30 Earnie Boyd mailto:earnie at users.sf.net
+rem * Add -geometry parameter to work around an off by one issue with
+rem the default values.
+rem Thanks to Dave Schuyler mailto:parameter at users.sf.net
+rem
+rem 2004.03.28 Earnie Boyd mailto:earnie at users.sf.net
+rem * Add -norxvt or --norxvt switch argument.
+rem Thanks to Keith Marshall mailto:Keith.Marshall at total.com.
+rem * Add method to determine absolute path of msys.bat so that we no
+rem longer need to change to the bin directory. This allows msys.bat to be
+rem called from any working directory.
+rem Thanks to Kevin Mack mailto:kevin.mack at us.cd-adapco.com
+rem
+rem 2005.07.06 Max TE Woodbury mailto:mtew at users.sf.net
+rem * Fixed WD check for command.com systems.
+rem * Minimized intermediate CMD window to reduce startup flashyness.
+rem * If rxvt.exe cannot be found, try sh.exe.
+rem
+rem 2005.12.06 Tuomo Latto mailto:nonperson at users.sf.net
+rem * Added a temporary workaround for getting MSYS shell to run on x64.
+rem
+rem 2005.12.07 Keith Marshall mailto:keithmarshall at users.sf.net
+rem * ``EXISTS %WD%\sh.exe'' should be ``EXISTS %WD%sh.exe''; corrected.
+rem * Modified Tuomo's patch, to avoid trashing Window settings in Win32.
+rem
+rem 2005.12.08 Tuomo Latto mailto:nonperson at users.sf.net
+rem * Keith's modified patch fails on x64; start did funny things.
+rem Reworked, for correct behaviour on both platforms.
+rem
Property changes on: grass/branches/releasebranch_6_4/mswindows/osgeo4w/msys.bat
___________________________________________________________________
Modified: svn:eol-style
- native
+ CRLF
Added: svn:mime-type
+ text/x-bat
Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1,17 +1,17 @@
-set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_osgeo.ico
-set ICON_CMD=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_cmd.ico
-set ICON_TCLTK=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_tcltk.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 "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
-
-mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ GUI.lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%"
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Old TclTk GUI.lnk" "%BATCH%" "-tcltk" \ "Launch GRASS GIS @VERSION@ with the old TclTk GUI" 1 "%ICON_TCLTK%"
-xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk" "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON_CMD%"
-
-xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%"
-
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat.tmpl
-del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .tmpl
+set ICON=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_osgeo.ico
+set ICON_CMD=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_cmd.ico
+set ICON_TCLTK=%OSGEO4W_ROOT%\apps\grass\grass- at VERSION@\etc\gui\icons\grass_tcltk.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 "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
+
+mkdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ GUI.lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%"
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Old TclTk GUI.lnk" "%BATCH%" "-tcltk" \ "Launch GRASS GIS @VERSION@ with the old TclTk GUI" 1 "%ICON_TCLTK%"
+xxmklink "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk" "%BATCH%" "-text" \ "Launch GRASS GIS @VERSION@ in text mode" 1 "%ICON_CMD%"
+
+xxmklink "%ALLUSERSPROFILE%\Desktop\GRASS GIS @VERSION at .lnk" "%BATCH%" "-wx" \ "Launch GRASS GIS @VERSION@ with wxGUI" 1 "%ICON%"
+
+del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat.tmpl
+del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .tmpl
Property changes on: grass/branches/releasebranch_6_4/mswindows/osgeo4w/postinstall.bat
___________________________________________________________________
Added: svn:mime-type
+ text/x-bat
Added: svn:eol-style
+ CRLF
Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1,13 +1,13 @@
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ GUI.lnk"
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Old TclTk GUI.lnk"
-del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk"
-rmdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
-
-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
-del "%OSGEO4W_ROOT%"\apps\msys\bin\regex2.dll
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ GUI.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Old TclTk GUI.lnk"
+del "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@\GRASS @VERSION@ Command Line.lnk"
+rmdir "%OSGEO4W_STARTMENU%\GRASS GIS @VERSION@"
+
+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
+del "%OSGEO4W_ROOT%"\apps\msys\bin\regex2.dll
Property changes on: grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat
___________________________________________________________________
Added: svn:mime-type
+ text/x-bat
Added: svn:eol-style
+ CRLF
Modified: grass/branches/releasebranch_6_4/scripts/windows_launch.bat
===================================================================
--- grass/branches/releasebranch_6_4/scripts/windows_launch.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/scripts/windows_launch.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1 +1 @@
-@"%GRASS_SH%" "%GISBASE%/scripts/SCRIPT_NAME" %*
+@"%GRASS_SH%" "%GISBASE%/scripts/SCRIPT_NAME" %*
Property changes on: grass/branches/releasebranch_6_4/scripts/windows_launch.bat
___________________________________________________________________
Deleted: svn:executable
- *
Modified: svn:eol-style
- native
+ CRLF
Modified: grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz.bat
===================================================================
--- grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz.bat 2013-02-22 02:49:36 UTC (rev 55155)
+++ grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz.bat 2013-02-22 02:53:45 UTC (rev 55156)
@@ -1 +1 @@
-@"%GISBASE%\etc\nviz2.2\nviz.exe" -f "%GISBASE%\etc\nviz2.2\scripts\nviz2.2_script" %*
+@"%GISBASE%\etc\nviz2.2\nviz.exe" -f "%GISBASE%\etc\nviz2.2\scripts\nviz2.2_script" %*
Property changes on: grass/branches/releasebranch_6_4/visualization/nviz/scripts/nviz.bat
___________________________________________________________________
Modified: svn:eol-style
- native
+ CRLF
More information about the grass-commit
mailing list