Skip to content
Permalink
Browse files

Updates to installer so that 1.1 release goes into Program Files\Quan…

…tum GIS Unstable so that it can live side by side with stable. Also ported other changes I made in stable branches installer to here

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_1_0@10749 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed May 6, 2009
1 parent e709246 commit 2d7bb108b7cded8cec758132cc7801c660a86b61
Showing with 18 additions and 9 deletions.
  1. +18 −9 ms-windows/QGIS-Installer.nsi
@@ -15,10 +15,10 @@

;Version variables

!define RELEASE_VERSION_NUMBER "0.11.0"
!define RELEASE_VERSION_NAME "Metis"
!define RELEASE_SVN_REVISION "8811"
!define RELEASE_BINARY_REVISION "2"
!define RELEASE_VERSION_NUMBER "1.1.0"
!define RELEASE_VERSION_NAME "Kore"
!define RELEASE_SVN_REVISION "10748"
!define RELEASE_BINARY_REVISION "0"

!define DEV_VERSION_NUMBER ""
!define DEV_VERSION_NAME ""
@@ -39,8 +39,8 @@
;----------------------------------------------------------------------------------------------------------------------------

;define the QGIS Base Name
!define RELEASE_QGIS_BASE "Quantum GIS"
!define DEV_QGIS_BASE "QGIS-Dev"
!define RELEASE_QGIS_BASE "Quantum GIS Unstable"
!define DEV_QGIS_BASE "Quantum GIS Unstable Dev"

;Set the installer variables, depending on the selected version to build

@@ -301,6 +301,13 @@ Var /GLOBAL DOWNLOAD_MESSAGE_
Section "Quantum GIS" SecQGIS

SectionIn RO

;Added by Tim to set the reg key so we get default toolbar layout
!include ui.nsh
;Added by Tim to set the reg key so we get default plugin loading
!include plugins.nsh
;Added by Tim to set the reg key so we get default python & py plugins
!include python_plugins.nsh

;Set the INSTALL_DIR variable
Var /GLOBAL INSTALL_DIR
@@ -370,15 +377,15 @@ Section "Quantum GIS" SecQGIS
;Create the Desktop Shortcut
SetShellVarContext current

CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\qgis.exe" ""\
CreateShortCut "$DESKTOP\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"

;Create the Windows Start Menu Shortcuts
SetShellVarContext all

CreateDirectory "$SMPROGRAMS\${QGIS_BASE}"

CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\qgis.exe" ""\
CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\${QGIS_BASE}.lnk" "$INSTALL_DIR\bin\qgis.exe" ""\
"$INSTALL_DIR\icons\QGIS.ico" "" SW_SHOWNORMAL "" "Launch ${COMPLETE_NAME}"

CreateShortCut "$SMPROGRAMS\${QGIS_BASE}\Quantum GIS Web Site.lnk" "$INSTALL_DIR\QGIS-WebSite.url" ""\
@@ -514,11 +521,13 @@ Section "Uninstall"
Delete "$INSTDIR\QGIS-WebSite.url"

Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.csv"

Delete "$INSTDIR\icons\QGIS.ico"
Delete "$INSTDIR\icons\QGIS_Web.ico"

;remove folders
RMDir /r "$INSTDIR\bin"
RMDir /r "$INSTDIR\doc"
RMDir /r "$INSTDIR\grass"
RMDir /r "$INSTDIR\i18n"
@@ -560,4 +569,4 @@ SectionEnd
!insertmacro MUI_DESCRIPTION_TEXT ${SecAlaskaSDB} "Download and install the Alaska sample database (shapefiles and TIFF data)"
!insertmacro MUI_FUNCTION_DESCRIPTION_END

;----------------------------------------------------------------------------------------------------------------------------
;----------------------------------------------------------------------------------------------------------------------------

0 comments on commit 2d7bb10

Please sign in to comment.
You can’t perform that action at this time.