[GRASS-SVN] r67178 - in grass/branches/releasebranch_7_0/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-16 07:48:36 -0800 (Wed, 16 Dec 2015)
New Revision: 67178

Modified:
   grass/branches/releasebranch_7_0/mswindows/GRASS-Packager.bat.tmpl
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
Log:
winGRASS: add zlib1.dll dependecy, cleanup GRASS-Packager script
          (merge r67177 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-16 15:44:17 UTC (rev 67177)
+++ grass/branches/releasebranch_7_0/mswindows/GRASS-Packager.bat.tmpl	2015-12-16 15:48:36 UTC (rev 67178)
@@ -51,28 +51,11 @@
 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
-copy %MSYS_BLD_DIR%\bin\libsystre-0.dll %PACKAGE_DIR%\extrabin
-copy %MSYS_BLD_DIR%\bin\libtre-5.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

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-16 15:44:17 UTC (rev 67177)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-16 15:48:36 UTC (rev 67178)
@@ -253,6 +253,7 @@
 	/mingw${MINGW_POSTFIX}/bin/libpng16-16.dll \
 	/mingw${MINGW_POSTFIX}/bin/libsystre-0.dll \
 	/mingw${MINGW_POSTFIX}/bin/libtre-5.dll \
+        /mingw${MINGW_POSTFIX}/bin/zlib1.dll \
 	apps/grass/grass-$VERSION/bin
     
     # creating grass package