include windows installer updates

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_5_0@14076 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Aug 13, 2010 · ab93815 · ab93815
1 parent bab2337
commit ab93815
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/ms-windows/QGIS-Installer.nsi b/ms-windows/QGIS-Installer.nsi
@@ -38,7 +38,7 @@ RequestExecutionLevel admin
 
 ;NSIS Includes
 
-!include "MUI2.nsh"
+!include "MUI.nsh"
 !include "LogicLib.nsh"
 
 ;----------------------------------------------------------------------------------------------------------------------------
@@ -89,6 +89,7 @@ RequestExecutionLevel admin
 	!define INSTALLER_DISPLAYED_NAME "${DISPLAYED_NAME}"
 
 	!addplugindir osgeo4w/untgz
+	!addplugindir osgeo4w/nsis
 !endif
 
 ;----------------------------------------------------------------------------------------------------------------------------
@@ -282,6 +283,7 @@ FunctionEnd
 
 ;Installer Pages
 
+!define MUI_WELCOMEPAGE_TITLE_3LINES
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE ".\Installer-Files\LICENSE.txt"
 
@@ -295,6 +297,7 @@ FunctionEnd
 !insertmacro MUI_UNPAGE_WELCOME
 !insertmacro MUI_UNPAGE_CONFIRM
 !insertmacro MUI_UNPAGE_INSTFILES
+!define MUI_FINISHPAGE_TITLE_3LINES
 !insertmacro MUI_UNPAGE_FINISH
 
 ;----------------------------------------------------------------------------------------------------------------------------
@@ -400,7 +403,7 @@ Section "Quantum GIS" SecQGIS
 	SetShellVarContext current
 
 !if ${INSTALLER_TYPE} == "OSGeo4W"
-	CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis-dev.bat"' \
+	CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
 	"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
 !else
 	CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
@@ -413,7 +416,7 @@ Section "Quantum GIS" SecQGIS
 	CreateDirectory "$SMPROGRAMS\${QGIS_BASE}"
 
 !if ${INSTALLER_TYPE} == "OSGeo4W"
-	CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis-dev.bat"' \
+	CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \
 	"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"
 !else
 	CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\

diff --git a/ms-windows/osgeo4w/creatensis.pl b/ms-windows/osgeo4w/creatensis.pl
@@ -52,7 +52,7 @@ sub getDeps {
 	}
 }
 
-getDeps("qgis-dev");
+getDeps("qgis-full");
 
 if(-f "../addons/bin/NCSEcw.dll") {
 	print "Enabling ECW support...\n";
@@ -64,9 +64,6 @@ sub getDeps {
 	getDeps("gdal16-mrsid")
 }
 
-delete $pkgs{"qgis-dev"};
-
-
 foreach my $p ( keys %pkgs ) {
 	$f = "$root/$file{$p}";
 	$f =~ s/\/\.\//\//g;
@@ -106,7 +103,7 @@ sub getDeps {
 
 	system "cd apps/nircmd; unzip ../../../packages/nircmd.zip && mv nircmd.exe ../../bin";
 
-	system "tar -C ../addons -cf . | tar -xf -" if -d "../addons";
+	system "tar -C ../addons -cf - . | tar -xf -" if -d "../addons";
 
 	chdir "..";
 }
@@ -195,6 +192,8 @@ sub getDeps {
 $revision =~ s/\D+$//g;
 close F;
 
+system "unzip packages/Untgz.zip" unless -d "untgz";
+
 chdir "..";
 
 my $cmd = "makensis";

diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd
@@ -14,7 +14,7 @@ set PACKAGE=%2
 set PACKAGENAME=%3
 if "%VERSION%"=="" goto error
 if "%PACKAGE%"=="" goto error
-if "%PACKAGENAME%"=="" set PACKAGENAME=qgis-dev
+if "%PACKAGENAME%"=="" set PACKAGENAME=qgis
 
 path %SYSTEMROOT%\system32;%SYSTEMROOT%;%SYSTEMROOT%\System32\Wbem;%PROGRAMFILES%\CMake 2.6\bin
 set PYTHONPATH=