[GRASS-SVN] r50417 - in grass/branches/releasebranch_6_4/mswindows: . osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2012-01-24 11:33:06 -0800 (Tue, 24 Jan 2012)
New Revision: 50417

Modified:
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh
   grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat
Log:
winGRASS: extra mingw/msys packages should be copied to apps/msys

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2012-01-24 16:33:01 UTC (rev 50416)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2012-01-24 19:33:06 UTC (rev 50417)
@@ -489,7 +489,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\lib$\r$\n'
+	FileWrite $0 'set FREETYPEBASE=$INSTALL_DIR\extralib;$INSTALL_DIR\msys\bin;$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/osgeo4w/package.sh
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-01-24 16:33:01 UTC (rev 50416)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/package.sh	2012-01-24 19:33:06 UTC (rev 50417)
@@ -144,6 +144,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
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@osgeo4w@#$OSGEO4W_ROOT#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" \
@@ -155,12 +156,6 @@
 sed -e "s#@VERSION@#$VERSION#g" -e "s#@GRASS_EXECUTABLE@#$GRASS_EXECUTABLE#g" \
     mswindows/osgeo4w/preremove.bat >$OSGEO4W_ROOT_MSYS/etc/preremove/${GRASS_EXECUTABLE}.bat 
 
-if [ -f /c/mingw/bin/libgnurx-0.dll ]; then
-    cp /c/mingw/bin/libgnurx-0.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin 
-    cp /c/mingw/bin/libiconv-2.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin 
-    cp /c/mingw/bin/libintl-8.dll $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/bin
-fi
-
 if [ -n "$PACKAGE" ]; then
     log building vc libraries 
     sh mswindows/osgeo4w/mklibs.sh $OSGEO4W_ROOT_MSYS/apps/grass/grass-$VERSION/lib/*.$VERSION.dll 
@@ -187,9 +182,9 @@
 	apps/grass/grass-$VERSION \
 	bin/${GRASS_EXECUTABLE}.bat.tmpl \
 	bin/${GRASS_EXECUTABLE}.tmpl \
-	bin/libintl3.dll \
-	bin/libiconv2.dll \
-	bin/regex2.dll \
+	apps/msys/bin/libintl3.dll \
+	apps/msys/bin/libiconv2.dll \
+	apps/msys/bin/regex2.dll \
 	etc/postinstall/${GRASS_EXECUTABLE}.bat \
 	etc/preremove/${GRASS_EXECUTABLE}.bat
     

Modified: grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat	2012-01-24 16:33:01 UTC (rev 50416)
+++ grass/branches/releasebranch_6_4/mswindows/osgeo4w/preremove.bat	2012-01-24 19:33:06 UTC (rev 50417)
@@ -8,3 +8,6 @@
 del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE at .bat
 del "%OSGEO4W_ROOT%"\bin\@GRASS_EXECUTABLE@
 del "%OSGEO4W_ROOT%"\apps\grass\grass- at VERSION@\etc\fontcap
+del "%OSGEO4W_ROOT%"\apps\msys\bin\libintl3.dll
+del "%OSGEO4W_ROOT%"\apps\msys\bin\libiconv2.dll
+del "%OSGEO4W_ROOT%"\apps\msys\bin\regex2.dll