[GRASS-SVN] r44154 - grass/branches/releasebranch_6_4/mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-11-01 14:42:27 -0700 (Mon, 01 Nov 2010)
New Revision: 44154

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
   grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
Log:
store grass libs in ./lib instead of ./extralib

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-11-01 18:53:48 UTC (rev 44153)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-11-01 21:42:27 UTC (rev 44154)
@@ -500,7 +500,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/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat	2010-11-01 18:53:48 UTC (rev 44153)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Packager.bat	2010-11-01 21:42:27 UTC (rev 44154)
@@ -45,6 +45,7 @@
 mkdir %PACKAGE_DIR%\extralib
 
 copy %OSGEO4W_DIR%\bin\*.dll %PACKAGE_DIR%\extralib
+del %PACKAGE_DIR%\extralib\libgrass_*6.4.0*.dll
 del %PACKAGE_DIR%\extralib\libgrass_*6.5*.dll
 del %PACKAGE_DIR%\extralib\libgrass_*7.0*.dll
 del %PACKAGE_DIR%\extralib\Qt*4.dll
@@ -52,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.