[GRASS-SVN] r40818 - in grass/branches/develbranch_6/mswindows: . osgeo4w

svn_grass at osgeo.org svn_grass at osgeo.org
Thu Feb 4 04:36:09 EST 2010


Author: hamish
Date: 2010-02-04 04:36:07 -0500 (Thu, 04 Feb 2010)
New Revision: 40818

Added:
   grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat
Modified:
   grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
   grass/branches/develbranch_6/mswindows/GRASS-Packager.bat
Log:
maintain local msys.bat (Helmut, Colin, me; #905, #629)
  merge from trunk


Modified: grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2010-02-04 09:28:36 UTC (rev 40817)
+++ grass/branches/develbranch_6/mswindows/GRASS-Installer.nsi	2010-02-04 09:36:07 UTC (rev 40818)
@@ -12,6 +12,10 @@
 
 !define DEMOLOCATION_PATH "c:\osgeo4w\usr\src\grass6_devel\demolocation"
 
+;Define the source of the patched msys.bat
+
+!define MSYS_BATCH "C:\OSGeo4W\usr\src\grass6_devel\mswindows\osgeo4w\msys.bat"
+
 ;Select if you are building a "Development Version" or a "Release Version" of the GRASS Installer
 ;Change the INSTALLER_TYPE variable to Release, Dev6 or Dev7
 
@@ -415,6 +419,10 @@
 	SetOutPath "$GIS_DATABASE\demolocation"
 	File /r ${DEMOLOCATION_PATH}\*.*
 	
+	;add msys.bat into the INSTALL_DIR\msys directory
+	SetOutPath "$INSTALL_DIR\msys"
+	File /r ${MSYS_BATCH}	
+	
 	;Create the Uninstaller
 	WriteUninstaller "$INSTALL_DIR\Uninstall-GRASS.exe"
 	

Modified: grass/branches/develbranch_6/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/develbranch_6/mswindows/GRASS-Packager.bat	2010-02-04 09:28:36 UTC (rev 40817)
+++ grass/branches/develbranch_6/mswindows/GRASS-Packager.bat	2010-02-04 09:36:07 UTC (rev 40818)
@@ -157,6 +157,8 @@
 xcopy %OSGEO4W_DIR%\apps\msys\lib %PACKAGE_DIR%\msys\lib /S/V/F/I
 xcopy %OSGEO4W_DIR%\apps\msys\man %PACKAGE_DIR%\msys\man /S/V/F/I
 del %PACKAGE_DIR%\msys\etc\fstab
+rem delete msys.bat from osgeo4w because there is an adaption (for spaces in installation path) written by GRASS-Installer.nsi
+del %PACKAGE_DIR%\msys\msys.bat
 
 
 @echo.

Copied: grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat (from rev 40817, grass/trunk/mswindows/osgeo4w/msys.bat)
===================================================================
--- grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat	                        (rev 0)
+++ grass/branches/develbranch_6/mswindows/osgeo4w/msys.bat	2010-02-04 09:36:07 UTC (rev 40818)
@@ -0,0 +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\
+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=LightYellow
+if "x%MINGW32FGCOLOR%" == "x" set MINGW32FGCOLOR=Navy
+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-12 -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-12 -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



More information about the grass-commit mailing list