Skip to content

Commit d6f69f7

Browse files
author
timlinux
committed
Push upstream changes in installer logic from 0.8 branch
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6671 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 6f7eea3 commit d6f69f7

File tree

4 files changed

+471
-224
lines changed

4 files changed

+471
-224
lines changed

win_build/README.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,26 @@ The installer script has an optional data
77
download part. This requires an NSIS
88
plugin available here:
99

10+
http://nsis.sourceforge.net/ZipDLL
11+
or
1012
http://nsis.sourceforge.net/ZipDLL_plug-in
1113

1214
Follow the instructions on that page before
1315
attempting to run the installer.
16+
17+
NOTE: the zipdll.nsh at the download was
18+
broken at time of writing this. Use the
19+
one provided in this directory instead
20+
(still copy it to your nsis include dir
21+
though).
22+
23+
The NSIS installer now expects the qgis
24+
binaries to be packaged to exist in
25+
c:\Program Files\qgis<version> (the old
26+
c:\dev\cpp\qgis\qgs-release path is deprecated)
27+
28+
Set the PRODUCT_VERSION_NUMBER in qgis.nsis
29+
before running. This will allow having multiple
30+
development versions on the same machine and
31+
being able to package them without issue.
32+

win_build/qgis-debug.nsi

Lines changed: 0 additions & 203 deletions
This file was deleted.

win_build/qgis.nsi

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
; HM NIS Edit Wizard helper defines
44
!define PRODUCT_NAME "Quantum GIS"
5-
!define PRODUCT_VERSION "0.8 Titan"
5+
!define PRODUCT_VERSION_NUMBER "0.8.1"
6+
!define PRODUCT_VERSION_NAME "Titan"
7+
!define PRODUCT_VERSION "${PRODUCT_VERSION_NUMBER} ${PRODUCT_VERSION_NAME}"
68
!define PRODUCT_PUBLISHER "qgis.org"
79
!define PRODUCT_WEB_SITE "http://qgis.org"
810
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qgis.exe"
@@ -81,7 +83,7 @@ FunctionEnd
8183
; MUI end ------
8284

8385
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
84-
OutFile "qgis_setup.exe"
86+
OutFile "qgis_setup${PRODUCT_VERSION_NUMBER}.exe"
8587
InstallDir "$PROGRAMFILES\Quantum GIS"
8688
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
8789
ShowInstDetails show
@@ -93,23 +95,25 @@ Section "Quantum GIS Application" SEC01
9395
SetOutPath "$INSTDIR"
9496
SetOverwrite try
9597
;------- Qt
96-
File "C:\dev\cpp\qgis\qgis-release\QtCore4.dll"
97-
File "C:\dev\cpp\qgis\qgis-release\QtGui4.dll"
98-
File "C:\dev\cpp\qgis\qgis-release\QtNetwork4.dll"
99-
File "C:\dev\cpp\qgis\qgis-release\QtXml4.dll"
100-
File "C:\dev\cpp\qgis\qgis-release\QtSvg4.dll"
101-
File "C:\dev\cpp\qgis\qgis-release\mingwm10.dll"
98+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtCore4.dll"
99+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtGui4.dll"
100+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtNetwork4.dll"
101+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtXml4.dll"
102+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\QtSvg4.dll"
103+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\mingwm10.dll"
102104
;------- qgis Related
103-
File "C:\dev\cpp\qgis\qgis-release\*.dll"
104-
File "C:\dev\cpp\qgis\qgis-release\*.exe"
105+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\*.dll"
106+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\*.exe"
105107
;------- proj and gdal Related
106-
File "C:\dev\cpp\qgis\qgis-release\*.csv"
108+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\*.csv"
107109
;subdirs
108-
File /r "C:\dev\cpp\qgis\qgis-release\grass"
109-
File /r "C:\dev\cpp\qgis\qgis-release\lib"
110-
File /r "C:\dev\cpp\qgis\qgis-release\share"
111-
File /r "C:\dev\cpp\qgis\qgis-release\nad"
112-
File /r "C:\dev\cpp\qgis\qgis-release\msys"
110+
File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\grass"
111+
File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\lib"
112+
File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\share"
113+
File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\nad"
114+
File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\msys"
115+
;qt plugins
116+
File /r "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\plugins"
113117

114118
; Shortcuts
115119
; Next line is important - added by Tim
@@ -134,21 +138,29 @@ Section "Sample Data - Spearfish (GRASS)" SEC02
134138
!insertmacro ZIPDLL_EXTRACT "$INSTDIR\SampleData\spearfish.zip" "$INSTDIR\SampleData\" "<ALL>"
135139
;ZipDLL::extractall "$INSTDIR\SampleData\spearfish.zip" "$INSTDIR\SampleData\"
136140
;the next line is a hack / workaround for a problem in zipdll.nsh
137-
!endif
141+
;!endif
142+
;!endif commented by freddy to solve the sample data extracting problem,
143+
;also is neccesary to download header file for nsi from :
144+
; http://forums.winamp.com/attachment.php?s=b03c6736d9de4a864dd2d4e7b40babfb&postid=1293264
138145

139146

140147
SectionEnd
141-
Section "Sample Data - Alaska (Non GRASS)" SEC03
142-
SetOutPath "$INSTDIR\SampleData\Alaska\"
143-
NSISdl::download http://qgis.org/uploadfiles/qgis_sample_data.tar.gz alaska.tar.gz
144-
; File "C:\dev/cpp/qgis/\qgis-release\SampleData\EnvironmentLayers\2050\A1F\Annual_dev/cpp/qgis/erature_range.asc"
145148

149+
Section "Development headers" SEC03
150+
SetOutPath "$INSTDIR\include"
151+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\include\*.h"
152+
SectionEnd
146153

154+
Section "Sample Data - Alaska (Non GRASS)" SEC04
155+
SetOutPath "$INSTDIR\SampleData\Alaska\"
156+
NSISdl::download http://qgis.org/uploadfiles/qgis_sample_data.zip alaska.zip
157+
!insertmacro ZIPDLL_EXTRACT "$INSTDIR\SampleData\Alaska\alaska.zip" "$INSTDIR\SampleData\Alaska" "<ALL>"
147158
; Shortcuts
148159
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
149160
!insertmacro MUI_STARTMENU_WRITE_END
150161
SectionEnd
151162

163+
152164
Section -AdditionalIcons
153165
SetOutPath $INSTDIR
154166
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application

0 commit comments

Comments
 (0)