Skip to content

Commit

Permalink
Use lzma compression on package for best compression ratio. Other sma…
Browse files Browse the repository at this point in the history
…ll tweaks to make a non grass package possible

git-svn-id: http://svn.osgeo.org/qgis/branches/Release-1_2_0@11612 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Sep 10, 2009
1 parent 35a131e commit b295db4
Showing 1 changed file with 24 additions and 3 deletions.
27 changes: 24 additions & 3 deletions ms-windows/QGIS-Installer.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
;Select if you are building a "Development Version" or a "Release Version" of the Quantum GIS Installer
;Change the INSTALLER_TYPE variable to Release or Development

!define INSTALLER_TYPE "Release"
!define INSTALLER_TYPE "Release-NoGrass"

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

Expand All @@ -18,13 +18,17 @@
!define RELEASE_VERSION_NUMBER "1.2.0"
!define RELEASE_VERSION_NAME "Daphnis"
!define RELEASE_SVN_REVISION "11475"
!define RELEASE_BINARY_REVISION "0"
!define RELEASE_BINARY_REVISION "1"

!define DEV_VERSION_NUMBER ""
!define DEV_VERSION_NAME ""
!define DEV_SVN_REVISION ""
!define DEV_BINARY_REVISION ""

; Added by Tim to get optimal compression
SetCompressor /SOLID lzma


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

;Don't modify the following lines
Expand All @@ -39,7 +43,7 @@
;----------------------------------------------------------------------------------------------------------------------------

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

;Set the installer variables, depending on the selected version to build
Expand All @@ -56,6 +60,18 @@
!define CHECK_INSTALL_NAME "${RELEASE_QGIS_BASE}"
!define INSTALLER_DISPLAYED_NAME "${COMPLETE_NAME}"
!define PACKAGE_FOLDER ".\QGIS-Release-Package"
!else if ${INSTALLER_TYPE} == "Release-NoGrass"
!define VERSION_NUMBER "${RELEASE_VERSION_NUMBER}"
!define VERSION_NAME "${RELEASE_VERSION_NAME}"
!define COMPLETE_NAME "${RELEASE_QGIS_BASE} ${RELEASE_VERSION_NUMBER} ${RELEASE_VERSION_NAME}"
!define SVN_REVISION "${RELEASE_SVN_REVISION}"
!define BINARY_REVISION "${RELEASE_BINARY_REVISION}"
!define QGIS_BASE "${RELEASE_QGIS_BASE}"
!define INSTALLER_NAME "QGIS-${VERSION_NUMBER}-${BINARY_REVISION}-No-GrassSetup.exe"
!define DISPLAYED_NAME "${RELEASE_QGIS_BASE} ${VERSION_NUMBER}-${BINARY_REVISION}"
!define CHECK_INSTALL_NAME "${RELEASE_QGIS_BASE}"
!define INSTALLER_DISPLAYED_NAME "${COMPLETE_NAME}"
!define PACKAGE_FOLDER ".\QGIS-Release-Package-No-Grass"
!else if ${INSTALLER_TYPE} == "Development"
!define VERSION_NUMBER "${DEV_VERSION_NUMBER}"
!define VERSION_NAME "${DEV_VERSION_NAME}"
Expand Down Expand Up @@ -525,6 +541,9 @@ Section "Uninstall"

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

Delete "$INSTDIR\MRSID_README.txt"
Delete "$INSTDIR\run.bat"

;remove folders
RMDir /r "$INSTDIR\bin"
Expand All @@ -541,6 +560,8 @@ Section "Uninstall"
RMDir /r "$INSTDIR\resources"
RMDir /r "$INSTDIR\svg"
RMDir /r "$INSTDIR\themes"
RMDir /r "$INSTDIR\proj"
RMDir /r "$INSTDIR\epsg_csv"

;if empty, remove the install folder
RMDir "$INSTDIR"
Expand Down

0 comments on commit b295db4

Please sign in to comment.