wingrass: grass libs moved from extralib to lib

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@42547 15284696-431f-4ddb-bdfa-cd5b030d7da7

mswindows/GRASS-Installer.nsi

@@ -535,7 +535,7 @@ Section "GRASS" SecGRASS
 	FileWrite $0 'set GISBASE=$INSTALL_DIR$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set path to freetype dll$\r$\n'
-	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib$\r$\n'
+	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\lib$\r$\n'
 	FileWrite $0 '$\r$\n'
 	FileWrite $0 'rem set dependecies path$\r$\n'
 	FileWrite $0 'set PATH=%FREETYPEBASE%;%PATH%$\r$\n'

mswindows/GRASS-Packager.bat

@@ -53,6 +53,14 @@ rem copy %OSGEO4W_DIR%\pgsql\lib\libpq.dll %PACKAGE_DIR%\extralib
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
+@echo Move GRASS libs from extralib to lib
+@echo -----------------------------------------------------------------------------------------------------------------------
+@echo.
+
+move %PACKAGE_DIR%\extralib\libgrass_*.dll %PACKAGE_DIR%\lib
+
+@echo.
+@echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy Extrabins to PACKAGE_DIR\extrabin
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
@@ -61,6 +69,7 @@ mkdir %PACKAGE_DIR%\extrabin
 
 copy %OSGEO4W_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
 del %PACKAGE_DIR%\extrabin\svn*.exe
+del %PACKAGE_DIR%\extrabin\osgeo4w-*.exe
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------

mswindows/osgeo4w/package.sh

@@ -1,6 +1,6 @@
 #!/c/OSGeo4W/apps/msys/bin/sh
 
-set -e
+### set -e
 
 if ! [ -d mswindows ]; then
 	echo Start from GRASS toplevel dir