From 0377e259c32221588280cdbc8863596d6d60caf3 Mon Sep 17 00:00:00 2001 From: Tim Sutton Date: Wed, 4 May 2011 15:34:31 +0200 Subject: [PATCH 1/2] Added shortname option to quickpackage script --- ms-windows/quickpackage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/ms-windows/quickpackage.sh b/ms-windows/quickpackage.sh index ea325ae5527..b47290c897e 100755 --- a/ms-windows/quickpackage.sh +++ b/ms-windows/quickpackage.sh @@ -21,4 +21,5 @@ makensis \ -DBINARY_REVISION=1 \ -DINSTALLER_TYPE=OSGeo4W \ -DPACKAGE_FOLDER=osgeo4w/unpacked \ +-DSHORTNAME=qgis \ QGIS-Installer.nsi From 0b7f5fa542348f8199b4912e2ecf9327a14451d7 Mon Sep 17 00:00:00 2001 From: Tim Sutton Date: Wed, 4 May 2011 13:17:07 +0200 Subject: [PATCH 2/2] Dont point to old gdal lib/include dirs when creating an msvc shell --- doc/msvc.t2t | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/msvc.t2t b/doc/msvc.t2t index 5f037d036f8..376ee365f49 100644 --- a/doc/msvc.t2t +++ b/doc/msvc.t2t @@ -86,8 +86,8 @@ set OSGEO4W_ROOT=C:\OSGeo4W call "%OSGEO4W_ROOT%\bin\o4w_env.bat" @set GRASS_PREFIX=c:/OSGeo4W/apps/grass/grass-6.4.0 -@set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\apps\gdal-17\include;%OSGEO4W_ROOT%\include -@set LIB=%LIB%;%OSGEO4W_ROOT%\apps\gdal-17\lib;%OSGEO4W_ROOT%\lib +@set INCLUDE=%INCLUDE%;%OSGEO4W_ROOT%\include +@set LIB=%LIB%;%OSGEO4W_ROOT%\lib;%OSGEO4W_ROOT%\lib @cmd ```