Skip to content
Permalink
Browse files
osgeo4w update: adapt to new GRASS 6.4.1 and gdal-mrsid packages
git-svn-id: http://svn.osgeo.org/qgis/trunk@15840 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
jef committed Apr 28, 2011
1 parent d52820f commit b33fa930f9e58f399260195d8d65b68c6fa26d0d
Showing with 3 additions and 8 deletions.
  1. +0 −5 ms-windows/osgeo4w/creatensis.pl
  2. +1 −1 ms-windows/osgeo4w/package-nightly.cmd
  3. +2 −2 ms-windows/osgeo4w/qgis.bat.tmpl
@@ -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;
@@ -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
@@ -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 %*

0 comments on commit b33fa93

Please sign in to comment.