Enhancements to installer builder:

- added a new zipdll.nsh that needs to be copied into the NSIS/include dir and should fix download and extract sample data functionality - updated readme file - it now expects the qgis binaries to be packaged to exist in c:\Program Files\qgis<version> - set the PRODUCT_VERSION_NUMBER before running This will allow having multiple development versions on the same machine and being able to package them without issue. git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6667 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Feb 22, 2007 · 625b576 · 625b576
1 parent d9fbd4b
commit 625b576
Show file tree

Hide file tree

Showing 3 changed files with 446 additions and 17 deletions.
diff --git a/win_build/README.txt b/win_build/README.txt
@@ -7,7 +7,15 @@ The installer script has an optional data
 download part. This requires an NSIS 
 plugin available here:
 
+http://nsis.sourceforge.net/ZipDLL
+or
 http://nsis.sourceforge.net/ZipDLL_plug-in
 
 Follow the instructions on that page before
 attempting to run the installer.
+
+NOTE: the zipdll.nsh at the download was 
+broken at time of writing this. Use the 
+one provided in this directory instead
+(still copy it to your nsis include dir 
+though).
diff --git a/win_build/qgis.nsi b/win_build/qgis.nsi
@@ -2,7 +2,9 @@
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "Quantum GIS"
-!define PRODUCT_VERSION "0.8.1 Titan"
+!define PRODUCT_VERSION_NUMBER "0.8.1"
+!define PRODUCT_VERSION_NAME "Titan"
+!define PRODUCT_VERSION "${PRODUCT_VERSION_NUMBER} ${PRODUCT_VERSION_NAME}"
 !define PRODUCT_PUBLISHER "qgis.org"
 !define PRODUCT_WEB_SITE "http://qgis.org"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qgis.exe"
@@ -93,25 +95,25 @@ Section "Quantum GIS Application" SEC01
   SetOutPath "$INSTDIR"
   SetOverwrite try
 ;------- Qt 
-  File "C:\dev\cpp\qgis\qgis-release\QtCore4.dll"
-  File "C:\dev\cpp\qgis\qgis-release\QtGui4.dll"
-  File "C:\dev\cpp\qgis\qgis-release\QtNetwork4.dll"
-  File "C:\dev\cpp\qgis\qgis-release\QtXml4.dll"
-  File "C:\dev\cpp\qgis\qgis-release\QtSvg4.dll"
-  File "C:\dev\cpp\qgis\qgis-release\mingwm10.dll"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtCore4.dll"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtGui4.dll"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtNetwork4.dll"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtXml4.dll"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtSvg4.dll"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\mingwm10.dll"
 ;------- qgis Related
-  File "C:\dev\cpp\qgis\qgis-release\*.dll"
-  File "C:\dev\cpp\qgis\qgis-release\*.exe"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\*.dll"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\*.exe"
 ;------- proj and gdal Related
-  File "C:\dev\cpp\qgis\qgis-release\*.csv"
+  File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\*.csv"
 ;subdirs
-  File /r "C:\dev\cpp\qgis\qgis-release\grass"
-  File /r "C:\dev\cpp\qgis\qgis-release\lib"
-  File /r "C:\dev\cpp\qgis\qgis-release\share"
-  File /r "C:\dev\cpp\qgis\qgis-release\nad"
-  File /r "C:\dev\cpp\qgis\qgis-release\msys"
+  File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\grass"
+  File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\lib"
+  File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\share"
+  File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\nad"
+  File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\msys"
   ;qt plugins
-  File /r "C:\dev\cpp\qgis\qgis-release\plugins"
+  File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\plugins"
 
 ; Shortcuts
 ; Next line is important - added by Tim
@@ -146,7 +148,7 @@ SectionEnd
 
 Section "Development headers" SEC03
  SetOutPath "$INSTDIR\include"
- File "C:\dev\cpp\qgis\qgis-release\include\*.h"
+ File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\include\*.h"
 SectionEnd
 
 Section "Sample Data - Alaska (Non GRASS)" SEC04