osgeo4w update: adapt to new GRASS 6.4.1 and gdal-mrsid packages

jef · jef · commit b33fa930f9e5 · 2011-04-28T13:16:28.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15840 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/ms-windows/osgeo4w/creatensis.pl b/ms-windows/osgeo4w/creatensis.pl
@@ -103,11 +103,6 @@ sub getDeps {
 	getDeps("gdal-ecw")
 }
 
-if(-f "../addons/bin/lti_dsdk_dll.dll") {
-	print "Enabling MrSID support...\n" if $verbose;
-	getDeps("gdal-mrsid")
-}
-
 foreach my $p ( keys %pkgs ) {
 	my $f = "$root/$file{$p}";
 	$f =~ s/\/\.\//\//g;
diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd
@@ -1,5 +1,5 @@
 @echo off
-set GRASS_VERSION=6.4.0
+set GRASS_VERSION=6.4.1
 set SVNVERSION=c:/cygwin/bin/svnversion
 
 set BUILDDIR=%CD%\build
diff --git a/ms-windows/osgeo4w/qgis.bat.tmpl b/ms-windows/osgeo4w/qgis.bat.tmpl
@@ -2,8 +2,8 @@
 
 SET OSGEO4W_ROOT=@osgeo4w@
 call "%OSGEO4W_ROOT%"\bin\o4w_env.bat
-call "%OSGEO4W_ROOT%"\bin\grass-env.bat
+call "%OSGEO4W_ROOT%"\apps\grass\grass-6.4.1\etc\env.bat
 @echo off
 SET GDAL_DRIVER_PATH=%OSGEO4W_ROOT%\bin\gdalplugins\1.8
-path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin;%GISBASE%\bin
+path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin
 start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.exe %*
