[QGIS Commit] r15840 - trunk/qgis/ms-windows/osgeo4w

[svn_qgis at osgeo.org]

Author: jef
Date: 2011-04-28 06:16:28 -0700 (Thu, 28 Apr 2011)
New Revision: 15840

Modified:
   trunk/qgis/ms-windows/osgeo4w/creatensis.pl
   trunk/qgis/ms-windows/osgeo4w/package-nightly.cmd
   trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl
Log:
osgeo4w update: adapt to new GRASS 6.4.1 and gdal-mrsid packages

Modified: trunk/qgis/ms-windows/osgeo4w/creatensis.pl
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/creatensis.pl	2011-04-28 09:40:42 UTC (rev 15839)
+++ trunk/qgis/ms-windows/osgeo4w/creatensis.pl	2011-04-28 13:16:28 UTC (rev 15840)
@@ -103,11 +103,6 @@
 	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;

Modified: trunk/qgis/ms-windows/osgeo4w/package-nightly.cmd
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/package-nightly.cmd	2011-04-28 09:40:42 UTC (rev 15839)
+++ trunk/qgis/ms-windows/osgeo4w/package-nightly.cmd	2011-04-28 13:16:28 UTC (rev 15840)
@@ -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

Modified: trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl
===================================================================
--- trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl	2011-04-28 09:40:42 UTC (rev 15839)
+++ trunk/qgis/ms-windows/osgeo4w/qgis.bat.tmpl	2011-04-28 13:16:28 UTC (rev 15840)
@@ -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 %*