[GRASS-SVN] r42547 - in grass/trunk/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-06-13 13:09:00 +0000 (Sun, 13 Jun 2010)
New Revision: 42547

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi
   grass/trunk/mswindows/GRASS-Packager.bat
   grass/trunk/mswindows/osgeo4w/package.sh
Log:
wingrass: grass libs moved from extralib to lib

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2010-06-10 20:21:11 UTC (rev 42546)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2010-06-13 13:09:00 UTC (rev 42547)
@@ -535,7 +535,7 @@
 	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'

Modified: grass/trunk/mswindows/GRASS-Packager.bat
===================================================================
--- grass/trunk/mswindows/GRASS-Packager.bat	2010-06-10 20:21:11 UTC (rev 42546)
+++ grass/trunk/mswindows/GRASS-Packager.bat	2010-06-13 13:09:00 UTC (rev 42547)
@@ -53,6 +53,14 @@
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------
+ at echo Move GRASS libs from extralib to lib
+ at echo -----------------------------------------------------------------------------------------------------------------------
+ at echo.
+
+move %PACKAGE_DIR%\extralib\libgrass_*.dll %PACKAGE_DIR%\lib
+
+ at echo.
+ at echo -----------------------------------------------------------------------------------------------------------------------
 @echo Copy Extrabins to PACKAGE_DIR\extrabin
 @echo -----------------------------------------------------------------------------------------------------------------------
 @echo.
@@ -61,6 +69,7 @@
 
 copy %OSGEO4W_DIR%\bin\*.exe %PACKAGE_DIR%\extrabin
 del %PACKAGE_DIR%\extrabin\svn*.exe
+del %PACKAGE_DIR%\extrabin\osgeo4w-*.exe
 
 @echo.
 @echo -----------------------------------------------------------------------------------------------------------------------

Modified: grass/trunk/mswindows/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh	2010-06-10 20:21:11 UTC (rev 42546)
+++ grass/trunk/mswindows/osgeo4w/package.sh	2010-06-13 13:09:00 UTC (rev 42547)
@@ -1,6 +1,6 @@
 #!/c/OSGeo4W/apps/msys/bin/sh
 
-set -e
+### set -e
 
 if ! [ -d mswindows ]; then
 	echo Start from GRASS toplevel dir