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

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-01-25 04:05:07 -0800 (Wed, 25 Jan 2012)
New Revision: 50438

Modified:
   grass/trunk/mswindows/GRASS-Installer.nsi
   grass/trunk/mswindows/osgeo4w/package.sh
Log:
winGRASS: extra DLL should be included in /osgeo4w/bin, see http://trac.osgeo.org/grass/wiki/CompileOnWindows?action=diff&version=213&old_version=210

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2012-01-25 11:08:40 UTC (rev 50437)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2012-01-25 12:05:07 UTC (rev 50438)
@@ -544,7 +544,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;$INSTALL_DIR\msys\bin;$INSTALL_DIR\lib$\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/osgeo4w/package.sh
===================================================================
--- grass/trunk/mswindows/osgeo4w/package.sh	2012-01-25 11:08:40 UTC (rev 50437)
+++ grass/trunk/mswindows/osgeo4w/package.sh	2012-01-25 12:05:07 UTC (rev 50438)
@@ -146,7 +146,7 @@
     $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h.mingw
 cp mswindows/osgeo4w/config.h.switch $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass/config.h
 cp mswindows/osgeo4w/config.h.vc $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/include/grass
-mkdir -p $OSGEO4W_ROOT_MSYS/etc/preremove
+mkdir -p $OSGEO4W_ROOT_MSYS/etc/preremove $OSGEO4W_ROOT_MSYS/etc/postinstall
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT@#$OSGEO4W_ROOT#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
     mswindows/osgeo4w/grass.bat.tmpl >$OSGEO4W_ROOT_MSYS/bin/${GRASS_EXECUTABLE}.bat
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@OSGEO4W_ROOT_MSYS@#$OSGEO4W_ROOT_MSYS#g" -e "s#@POSTFIX@#$MAJOR$MINOR#g" \
@@ -184,9 +184,9 @@
 	apps/grass/grass-$VERSION \
 	bin/${GRASS_EXECUTABLE}.bat.tmpl \
 	bin/${GRASS_EXECUTABLE}.tmpl \
-	apps/msys/bin/libintl3.dll \
-	apps/msys/bin/libiconv2.dll \
-	apps/msys/bin/regex2.dll \
+	bin/libintl3.dll \
+	bin/libiconv2.dll \
+	bin/regex2.dll \
 	etc/postinstall/${GRASS_EXECUTABLE}.bat \
 	etc/preremove/${GRASS_EXECUTABLE}.bat