[GRASS-SVN] r67166 - grass/branches/releasebranch_7_0/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-16 03:33:47 -0800 (Wed, 16 Dec 2015)
New Revision: 67166

Modified:
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
   grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat
Log:
wingrass: move extra libs from bin to lib directory
          (merge r67165 from trunk)


Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-16 11:32:37 UTC (rev 67165)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/package.sh	2015-12-16 11:33:47 UTC (rev 67166)
@@ -253,27 +253,14 @@
 	/mingw${MINGW_POSTFIX}/bin/libpng16-16.dll \
 	/mingw${MINGW_POSTFIX}/bin/libsystre-0.dll \
 	/mingw${MINGW_POSTFIX}/bin/libtre-5.dll \
-	bin
+	apps/grass/grass-$VERSION/lib
     
     # creating grass package
     tar -cjf $PDIR/grass$PACKAGE_POSTFIX-$VERSION-$PACKAGE_PATCH.tar.bz2 \
 	apps/grass/grass-$VERSION \
 	bin/${GRASS_EXECUTABLE}.bat.tmpl \
 	etc/postinstall/grass${PACKAGE_POSTFIX}.bat \
-	etc/preremove/grass${PACKAGE_POSTFIX}.bat \
-	bin/libintl-8.dll \
-        bin/libiconv-2.dll \
-	bin/libfontconfig-1.dll \
-	bin/$mingw_libgcc \
-	bin/libwinpthread-1.dll \
-	bin/libexpat-1.dll \
-	bin/libfreetype-6.dll \
-	bin/libbz2-1.dll \
-        bin/libharfbuzz-0.dll \
-	bin/libglib-2.0-0.dll \
-	bin/libpng16-16.dll \
-	bin/libsystre-0.dll \
-	bin/libtre-5.dll
+	etc/preremove/grass${PACKAGE_POSTFIX}.bat
     
     # clean up
     rm bin/${GRASS_EXECUTABLE}.bat.tmpl

Modified: grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat	2015-12-16 11:32:37 UTC (rev 67165)
+++ grass/branches/releasebranch_7_0/mswindows/osgeo4w/preremove.bat	2015-12-16 11:33:47 UTC (rev 67166)
@@ -7,15 +7,15 @@
 del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat
 del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
 
-del "%OSGEO4W_ROOT%"\bin\libintl-8.dll
-del "%OSGEO4W_ROOT%"\bin\libiconv-2.dll
-del "%OSGEO4W_ROOT%"\bin\libfontconfig-1.dll
-if exist "%OSGEO4W_ROOT%"\bin\libgcc_s_seh-1.dll "%OSGEO4W_ROOT%"\bin\libgcc_s_seh-1.dll
-if exist "%OSGEO4W_ROOT%"\bin\libgcc_s_dw2-1.dll "%OSGEO4W_ROOT%"\bin\libgcc_s_dw2-1.dll
-del "%OSGEO4W_ROOT%"\bin\libwinpthread-1.dll
-del "%OSGEO4W_ROOT%"\bin\libexpat-1.dll
-del "%OSGEO4W_ROOT%"\bin\libfreetype-6.dll
-del "%OSGEO4W_ROOT%"\bin\libbz2-1.dll
-del "%OSGEO4W_ROOT%"\bin\libharfbuzz-0.dll
-del "%OSGEO4W_ROOT%"\bin\libglib-2.0-0.dll
-del "%OSGEO4W_ROOT%"\bin\libpng16-16.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libintl-8.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libiconv-2.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libfontconfig-1.dll
+if exist "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libgcc_s_seh-1.dll "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libgcc_s_seh-1.dll
+if exist "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libgcc_s_dw2-1.dll "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libgcc_s_dw2-1.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libwinpthread-1.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libexpat-1.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libfreetype-6.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libbz2-1.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libharfbuzz-0.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libglib-2.0-0.dll
+del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\lib\libpng16-16.dll