sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-19 00:04:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@15840 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2011-04-28 13:16:28 +00:00
parent d52820fb65
commit b33fa930f9
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ms-windows/osgeo4w/creatensis.pl
View File

@ -103,11 +103,6 @@ if(-f "../addons/bin/NCSEcw4_RO.dll") {
getDeps("gdal-ecw") 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 ) { foreach my $p ( keys %pkgs ) {
my $f = "$root/$file{$p}"; my $f = "$root/$file{$p}";
$f =~ s/\/\.\//\//g; $f =~ s/\/\.\//\//g;

2
ms-windows/osgeo4w/package-nightly.cmd
View File

@ -1,5 +1,5 @@
@echo off @echo off
set GRASS_VERSION=6.4.0 set GRASS_VERSION=6.4.1
set SVNVERSION=c:/cygwin/bin/svnversion set SVNVERSION=c:/cygwin/bin/svnversion
set BUILDDIR=%CD%\build set BUILDDIR=%CD%\build

4
ms-windows/osgeo4w/qgis.bat.tmpl
View File

@ -2,8 +2,8 @@
SET OSGEO4W_ROOT=@osgeo4w@ SET OSGEO4W_ROOT=@osgeo4w@
call "%OSGEO4W_ROOT%"\bin\o4w_env.bat 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 @echo off
SET GDAL_DRIVER_PATH=%OSGEO4W_ROOT%\bin\gdalplugins\1.8 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 %* start "Quantum GIS" /B "%OSGEO4W_ROOT%"\apps\@package@\bin\qgis.exe %*