[GRASS-SVN] r67092 - grass/trunk/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-13 04:24:23 -0800 (Sun, 13 Dec 2015)
New Revision: 67092

Modified:
   grass/trunk/mswindows/GRASS-Packager.bat.tmpl
Log:
wingrass: update GRASS-Packager for msys2 (drop msys dependency)

Modified: grass/trunk/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat.tmpl	2015-12-12 16:12:59 UTC (rev 67091)
+++ grass/trunk/mswindows/GRASS-Packager.bat.tmpl	2015-12-13 12:24:23 UTC (rev 67092)
@@ -14,11 +14,11 @@
 
 set PACKAGE_DIR=.\GRASS- at GRASS_VERSION_MAJOR@@GRASS_VERSION_MINOR at -Package
 
-set OSGEO4W_BLD_DIR=C:\OSGeo4W
-if exist C:\OSGeo4W_grass at GRASS_VERSION_MAJOR@ (
-set OSGEO4W_PKG_DIR=C:\OSGeo4W_grass at GRASS_VERSION_MAJOR@
+set OSGEO4W_BLD_DIR=C:\OSGeo4W%1
+if exist C:\OSGeo4W%1_grass at GRASS_VERSION_MAJOR@ (
+set OSGEO4W_PKG_DIR=C:\OSGeo4W%1_grass at GRASS_VERSION_MAJOR@
 ) else (
-set OSGEO4W_PKG_DIR=C:\OSGeo4W
+set OSGEO4W_PKG_DIR=C:\OSGeo4W%1
 )
 
 set GRASS_PREFIX=%OSGEO4W_BLD_DIR%\apps\grass\grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@
@@ -68,7 +68,7 @@
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
 
-mkdir %PACKAGE_DIR%\share
+if not exist "%PACKAGE_DIR%\share" mkdir %PACKAGE_DIR%\share
 mkdir %PACKAGE_DIR%\share\proj
 xcopy %OSGEO4W_PKG_DIR%\share\proj %PACKAGE_DIR%\share\proj /S/V/F/I
 
@@ -92,23 +92,6 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
- at echo Copy MSYS files to PACKAGE_DIR\msys
- at echo -----------------------------------------------------------------------------------------------------------------------
- at echo.
-
-mkdir %PACKAGE_DIR%\msys
-
-xcopy %OSGEO4W_PKG_DIR%\apps\msys\* %PACKAGE_DIR%\msys /S/V/F/I
-
-rem delete msys.bat and fstab from osgeo4w because there is an
-rem adaption (for spaces in installation path) written by
-rem GRASS-Installer.nsi
-
-del %PACKAGE_DIR%\msys\msys.bat
-del %PACKAGE_DIR%\msys\etc\fstab
-
- at echo.
- at echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy Python content to PACKAGE_DIR\Python27
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.