[QGIS Commit] r15642 - trunk/qgis/ms-windows

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2011-03-30 06:27:32 -0700 (Wed, 30 Mar 2011)
New Revision: 15642

Modified:
   trunk/qgis/ms-windows/QGIS-Installer.nsi
   trunk/qgis/ms-windows/quickpackage.sh
Log:
nsi updates: commented out reboot which causes nsis to fail for me. Updated quickpackage to set version name to 1.7

Modified: trunk/qgis/ms-windows/QGIS-Installer.nsi
===================================================================
--- trunk/qgis/ms-windows/QGIS-Installer.nsi	2011-03-30 08:30:23 UTC (rev 15641)
+++ trunk/qgis/ms-windows/QGIS-Installer.nsi	2011-03-30 13:27:32 UTC (rev 15642)
@@ -427,7 +427,7 @@
 	nsExec::ExecToLog '"$0" /c "$INSTALL_DIR\postinstall.bat"'
 
 !if ${INSTALLER_TYPE} == "OSGeo4W"
-	IfFileExists "$INSTALL_DIR\etc\reboot" SetRebootFlag true
+	;IfFileExists "$INSTALL_DIR\etc\reboot" SetRebootFlag true
 
         Delete "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk"
         CreateShortCut "$DESKTOP\Quantum GIS (${VERSION_NUMBER}).lnk" "$INSTALL_DIR\bin\nircmd.exe" 'exec hide "$INSTALL_DIR\bin\qgis.bat"' \

Modified: trunk/qgis/ms-windows/quickpackage.sh
===================================================================
--- trunk/qgis/ms-windows/quickpackage.sh	2011-03-30 08:30:23 UTC (rev 15641)
+++ trunk/qgis/ms-windows/quickpackage.sh	2011-03-30 13:27:32 UTC (rev 15642)
@@ -12,12 +12,12 @@
 # Tim Sutton November 2010
 
 makensis \
--DVERSION_NUMBER='1.6.0' \
--DVERSION_NAME='Copiapo' \
+-DVERSION_NUMBER='1.7.0' \
+-DVERSION_NAME='Wroclaw' \
 -DSVN_REVISION='0' \
 -DQGIS_BASE='Quantum GIS' \
--DINSTALLER_NAME='QGIS-1-6-0-Setup.exe' \
--DDISPLAYED_NAME='Quantum GIS 1.6.0' \
+-DINSTALLER_NAME='QGIS-1-7-0-Setup.exe' \
+-DDISPLAYED_NAME='Quantum GIS 1.7.0' \
 -DBINARY_REVISION=1 \
 -DINSTALLER_TYPE=OSGeo4W \
 -DPACKAGE_FOLDER=osgeo4w/unpacked \