Skip to content
Permalink
Browse files
nsi updates: commented out reboot which causes nsis to fail for me. U…
…pdated quickpackage to set version name to 1.7

git-svn-id: http://svn.osgeo.org/qgis/trunk@15642 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Mar 30, 2011
1 parent 44bf9e9 commit acff0b1b63a56c01ebc573a7062dd151fc43791c
Showing with 5 additions and 5 deletions.
  1. +1 −1 ms-windows/QGIS-Installer.nsi
  2. +4 −4 ms-windows/quickpackage.sh
@@ -427,7 +427,7 @@ Section "Quantum GIS" SecQGIS
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"' \
@@ -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 \

0 comments on commit acff0b1

Please sign in to comment.