mirror of
https://github.com/qgis/QGIS.git
synced 2025-04-16 00:03:12 -04:00
nsi updates: commented out reboot which causes nsis to fail for me. Updated quickpackage to set version name to 1.7
git-svn-id: http://svn.osgeo.org/qgis/trunk@15642 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
parent
44bf9e9338
commit
acff0b1b63
@ -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 \
|
||||
|
Loading…
x
Reference in New Issue
Block a user