[GRASS-SVN] r67138 - grass/branches/releasebranch_7_0/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-15 02:04:39 -0800 (Tue, 15 Dec 2015)
New Revision: 67138

Modified:
   grass/branches/releasebranch_7_0/mswindows/GRASS-Packager.bat.tmpl
Log:
wingrass: include msys2 dependecies into packager
          (merge r67137 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/GRASS-Packager.bat.tmpl
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/GRASS-Packager.bat.tmpl	2015-12-15 09:55:45 UTC (rev 67137)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Packager.bat.tmpl	2015-12-15 10:04:39 UTC (rev 67138)
@@ -21,6 +21,8 @@
 set OSGEO4W_PKG_DIR=C:\OSGeo4W%1
 )
 
+set MSYS_BLD_DIR=C:\msys%1\mingw%1
+
 set GRASS_PREFIX=%OSGEO4W_BLD_DIR%\apps\grass\grass- at GRASS_VERSION_MAJOR@. at GRASS_VERSION_MINOR@. at GRASS_VERSION_RELEASE@
 
 @echo.
@@ -49,11 +51,26 @@
 mkdir %PACKAGE_DIR%\extrabin
 mkdir %PACKAGE_DIR%\extrabin\gdalplugins
 
+ at echo OSGeo4W
 copy %OSGEO4W_PKG_DIR%\bin\* %PACKAGE_DIR%\extrabin
 xcopy %OSGEO4W_PKG_DIR%\bin\gdalplugins\* %PACKAGE_DIR%\extrabin\gdalplugins /S/V/F/I
 del %PACKAGE_DIR%\extrabin\msvcp*
 del %PACKAGE_DIR%\extrabin\msvcr*
 
+ at echo MSYS2
+copy %MSYS_BLD_DIR%\bin\libintl-8.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libiconv-2.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libfontconfig-1.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libwinpthread-1.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libexpat-1.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libfreetype-6.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libbz2-1.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libharfbuzz-0.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libglib-2.0-0.dll %PACKAGE_DIR%\extrabin
+copy %MSYS_BLD_DIR%\bin\libpng16-16.dll %PACKAGE_DIR%\extrabin
+if exist "%MSYS_BLD_DIR%\bin\libgcc_s_seh-1.dll" copy %MSYS_BLD_DIR%\bin\libgcc_s_seh-1.dll %PACKAGE_DIR%\extrabin
+if exist "%MSYS_BLD_DIR%\bin\libgcc_s_dw2-1.dll" copy %MSYS_BLD_DIR%\bin\libgcc_s_dw2-1.dll %PACKAGE_DIR%\extrabin
+
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy 'Windows batchfiles for use with R' (GRASS-R-integration) from source to PACKAGE_DIR\extrabin