Skip to content

Commit 94fb639

Browse files
author
timlinux
committedOct 19, 2006
Preliminary updates to nsi - still not useable in anyway
git-svn-id: http://svn.osgeo.org/qgis/trunk@5975 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent f9f1d96 commit 94fb639

File tree

3 files changed

+86
-422
lines changed

3 files changed

+86
-422
lines changed
 

‎win_build/qgis.nsi

Lines changed: 86 additions & 422 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,44 @@
22

33
; HM NIS Edit Wizard helper defines
44
!define PRODUCT_NAME "Quantum GIS"
5-
!define PRODUCT_VERSION "0.6 Prerelease 3"
6-
!define PRODUCT_PUBLISHER "QGIS Development Team"
5+
!define PRODUCT_VERSION "0.8preview3"
6+
!define PRODUCT_PUBLISHER "qgis.org"
77
!define PRODUCT_WEB_SITE "http://qgis.org"
88
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\qgis.exe"
99
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
1010
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
11+
!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
12+
13+
SetCompressor zlib
14+
; Added by Tim for setting env vars (see this file on disk)
15+
!include WriteEnvStr.nsh
1116

1217
; MUI 1.67 compatible ------
1318
!include "MUI.nsh"
1419

1520
; MUI Settings
1621
!define MUI_ABORTWARNING
17-
!define MUI_ICON "C:\Development\qgis_win32\src\qgis_win322.ico"
18-
!define MUI_UNICON "C:\Development\qgis_win32\src\qgis_win322_uninstall.ico"
19-
;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico"
20-
22+
!define MUI_ICON "C:\dev\cpp\qgis\win_build\qgis64x64.ico"
23+
!define MUI_UNICON "C:\dev\cpp\qgis\win_build\qgis64x64.ico"
24+
; Added by Tim for side image
25+
!define MUI_WELCOMEFINISHPAGE_BITMAP "C:\dev\cpp\qgis\win_build\sidebar.bmp"
2126
; Welcome page
2227
!insertmacro MUI_PAGE_WELCOME
2328
; License page
24-
!insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
29+
!define MUI_LICENSEPAGE_RADIOBUTTONS
30+
!insertmacro MUI_PAGE_LICENSE "C:\dev\cpp\qgis\LICENSE.txt"
31+
; Components page
32+
!insertmacro MUI_PAGE_COMPONENTS
2533
; Directory page
2634
!insertmacro MUI_PAGE_DIRECTORY
35+
; Start menu page
36+
var ICONS_GROUP
37+
!define MUI_STARTMENUPAGE_NODISABLE
38+
!define MUI_STARTMENUPAGE_DEFAULTFOLDER "Quantum GIS"
39+
!define MUI_STARTMENUPAGE_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}"
40+
!define MUI_STARTMENUPAGE_REGISTRY_KEY "${PRODUCT_UNINST_KEY}"
41+
!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "${PRODUCT_STARTMENU_REGVAL}"
42+
!insertmacro MUI_PAGE_STARTMENU Application $ICONS_GROUP
2743
; Instfiles page
2844
!insertmacro MUI_PAGE_INSTFILES
2945
; Finish page
@@ -36,229 +52,67 @@
3652
; Language files
3753
!insertmacro MUI_LANGUAGE "English"
3854

55+
; Reserve files
56+
!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
57+
3958
; MUI end ------
4059

4160
Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
42-
OutFile "Setup.exe"
61+
OutFile "qgis_setup.exe"
4362
InstallDir "$PROGRAMFILES\Quantum GIS"
4463
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
4564
ShowInstDetails show
4665
ShowUnInstDetails show
4766

4867
Section "MainSection" SEC01
4968
SetOutPath "$INSTDIR"
69+
5070
SetOverwrite ifnewer
51-
File "qgis.exe"
52-
File "..\..\qgis_win32_dist\msvcp80.dll"
53-
File "..\..\qgis_win32_dist\msvcr80.dll"
54-
File "..\..\qgis_win32_dist\msvcp70.dll"
55-
File "..\..\qgis_win32_dist\msvcr70.dll"
56-
File "..\..\qgis_win32_dist\gdal12.dll"
57-
File "..\..\qgis_win32_dist\qt-mtnc321.dll"
58-
CreateDirectory "$SMPROGRAMS\Quantum GIS"
59-
CreateShortCut "$SMPROGRAMS\Quantum GIS\Quantum GIS.lnk" "$INSTDIR\qgis.exe"
60-
CreateShortCut "$DESKTOP\Quantum GIS.lnk" "$INSTDIR\qgis.exe"
61-
SetOutPath "$INSTDIR\lib\qgis"
71+
File "C:\dev/cpp/qgis/\qgis-release\qgis_core.dll"
6272
SetOverwrite try
63-
File "..\..\qgis_win32_dist\lib\qgis\copyright_label.dll"
64-
File "..\..\qgis_win32_dist\lib\qgis\delimitedtext.dll"
65-
File "..\..\qgis_win32_dist\lib\qgis\delimited_text.dll"
66-
File "..\..\qgis_win32_dist\lib\qgis\gps_importer.dll"
67-
File "..\..\qgis_win32_dist\lib\qgis\gpx.dll"
68-
File "..\..\qgis_win32_dist\lib\qgis\grid_maker.dll"
69-
; File "..\..\qgis_win32_dist\lib\qgis\http_server.dll"
70-
File "..\..\qgis_win32_dist\lib\qgis\north_arrow.dll"
71-
File "..\..\qgis_win32_dist\lib\qgis\ogr.dll"
72-
File "..\..\qgis_win32_dist\lib\qgis\postgres.dll"
73-
File "..\..\qgis_win32_dist\lib\qgis\scale_bar.dll"
74-
File "..\..\qgis_win32_dist\lib\qgis\spit.dll"
75-
SetOutPath "$INSTDIR\share\qgis\doc"
76-
File "..\..\qgis_win32_dist\share\qgis\doc\favicon.ico"
77-
SetOutPath "$INSTDIR\share\qgis\doc\images"
78-
File "..\..\qgis_win32_dist\share\qgis\doc\images\qgis_new_80pct.png"
79-
SetOutPath "$INSTDIR\share\qgis\doc"
80-
File "..\..\qgis_win32_dist\share\qgis\doc\index.html"
81-
File "..\..\qgis_win32_dist\share\qgis\doc\install.pdf"
82-
SetOutPath "$INSTDIR\share\qgis\doc\install_guide"
83-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\contents.png"
84-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\index.html"
85-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\install.css"
86-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\install.html"
87-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\internals.pl"
88-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\labels.pl"
89-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\next.png"
90-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\next_g.png"
91-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node1.html"
92-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node10.html"
93-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node11.html"
94-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node12.html"
95-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node13.html"
96-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node14.html"
97-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node15.html"
98-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node16.html"
99-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node17.html"
100-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node18.html"
101-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node19.html"
102-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node2.html"
103-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node20.html"
104-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node3.html"
105-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node4.html"
106-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node5.html"
107-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node6.html"
108-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node7.html"
109-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node8.html"
110-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\node9.html"
111-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\nx_grp_g.png"
112-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\prev.png"
113-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\prev_g.png"
114-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\up.png"
115-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\up_g.png"
116-
File "..\..\qgis_win32_dist\share\qgis\doc\install_guide\WARNINGS"
117-
SetOutPath "$INSTDIR\share\qgis\doc\plugins\delimited_text"
118-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\delimited_text\dialog.png"
119-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\delimited_text\index.html"
120-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\delimited_text\plugin_manager.png"
121-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\delimited_text\toolbar_icon.png"
122-
SetOutPath "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer"
123-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\geoprocessing\buffer\alaska_pglayer.png"
124-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\geoprocessing\buffer\buffer.png"
125-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\geoprocessing\buffer\bufferdialog.png"
126-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\geoprocessing\buffer\buffericon.png"
127-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\geoprocessing\buffer\bufferresult.png"
128-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\geoprocessing\buffer\index.html"
129-
File "..\..\qgis_win32_dist\share\qgis\doc\plugins\geoprocessing\buffer\pluginmanager.png"
130-
SetOutPath "$INSTDIR\share\qgis\doc"
131-
File "..\..\qgis_win32_dist\share\qgis\doc\qgisdoc.css"
132-
File "..\..\qgis_win32_dist\share\qgis\doc\README"
133-
File "..\..\qgis_win32_dist\share\qgis\doc\userguide.pdf"
134-
SetOutPath "$INSTDIR\share\qgis\i18n"
135-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_de.qm"
136-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_fr.qm"
137-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_it.qm"
138-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_nl.qm"
139-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_pt_BR.qm"
140-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_ru.qm"
141-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_se.qm"
142-
File "..\..\qgis_win32_dist\share\qgis\i18n\qgis_zh_CN.qm"
143-
SetOutPath "$INSTDIR\share\qgis\images\icons"
144-
File "..\..\qgis_win32_dist\share\qgis\images\icons\inoverview.png"
145-
File "..\..\qgis_win32_dist\share\qgis\images\icons\no_pyramid.png"
146-
File "..\..\qgis_win32_dist\share\qgis\images\icons\pyramid.png"
147-
File "..\..\qgis_win32_dist\share\qgis\images\icons\qgis-icon.png"
148-
File "..\..\qgis_win32_dist\share\qgis\images\icons\qgis-icon2.png"
149-
File "C:\Development\qgis_win32\src\qgis_win322.ico"
73+
;------- Qt
74+
;File "C:\dev/cpp/qgis/\qgis-release\QtCore4.dll"
75+
;File "C:\dev/cpp/qgis/\qgis-release\QtGui4.dll"
76+
;File "C:\dev/cpp/qgis/\qgis-release\QtNetwork4.dll"
77+
;File "C:\dev/cpp/qgis/\qgis-release\QtXml4.dll"
78+
;File "C:\dev/cpp/qgis/\qgis-release\QtSvg4.dll"
79+
;File "C:\dev/cpp/qgis/\qgis-release\mingwm10.dll"
80+
;------- qgis Related
81+
File "C:\dev/cpp/qgis/\qgis-release\*.dll"
82+
;File "C:\dev/cpp/qgis/\qgis-release\*.exe"
83+
; Shortcuts
84+
; Next line is important - added by Tim
85+
; if its not there the application working dir will be the last used
86+
;outpath and libom wont be able to find its alg
87+
SetOutPath "$INSTDIR"
88+
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
89+
CreateDirectory "$SMPROGRAMS\$ICONS_GROUP"
90+
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Quantum GIS.lnk" "$INSTDIR\qgis.exe"
91+
CreateShortCut "$DESKTOP\Quantum GIS.lnk" "$INSTDIR\qgis.exe"
92+
!insertmacro MUI_STARTMENU_WRITE_END
93+
; Added by Tim to set the PROJ_LIB env var so teh nad dir can be located by Proj
94+
Push PROJ_LIB
95+
Push "$INSTDIR\nad"
96+
Call WriteEnvStr
15097

151-
SetOutPath "$INSTDIR\share\qgis\images\north_arrows"
152-
File "..\..\qgis_win32_dist\share\qgis\images\north_arrows\default.png"
153-
SetOutPath "$INSTDIR\share\qgis\images\splash"
154-
File "..\..\qgis_win32_dist\share\qgis\images\splash\splash.png"
155-
SetOutPath "$INSTDIR\share\qgis\svg\biology"
156-
File "..\..\qgis_win32_dist\share\qgis\svg\biology\Coniferous.svg"
157-
File "..\..\qgis_win32_dist\share\qgis\svg\biology\Deciduous.svg"
158-
File "..\..\qgis_win32_dist\share\qgis\svg\biology\Flower.svg"
159-
SetOutPath "$INSTDIR\share\qgis\svg\geometric"
160-
File "..\..\qgis_win32_dist\share\qgis\svg\geometric\Square1.svg"
161-
File "..\..\qgis_win32_dist\share\qgis\svg\geometric\Square2.svg"
162-
File "..\..\qgis_win32_dist\share\qgis\svg\geometric\Triangle1.svg"
163-
SetOutPath "$INSTDIR\share\qgis\svg\gpsicons"
164-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\anchor.svg"
165-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\boat.svg"
166-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\camera.svg"
167-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\car.svg"
168-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\city_building.svg"
169-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\couple.svg"
170-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\cross.svg"
171-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\deer.svg"
172-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\dollar.svg"
173-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\fish.svg"
174-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\flag.svg"
175-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\food.svg"
176-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\gas.svg"
177-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\golf.svg"
178-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\h.svg"
179-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\house.svg"
180-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\parachute.svg"
181-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\phone.svg"
182-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\plane.svg"
183-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\point.svg"
184-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\question.svg"
185-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\shipwreck.svg"
186-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\skier.svg"
187-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\skull.svg"
188-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\swimmer.svg"
189-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\table.svg"
190-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\teepee.svg"
191-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\tree.svg"
192-
File "..\..\qgis_win32_dist\share\qgis\svg\gpsicons\walker.svg"
193-
SetOutPath "$INSTDIR\share\qgis\svg\icon"
194-
File "..\..\qgis_win32_dist\share\qgis\svg\icon\golfcourse.svg"
195-
SetOutPath "$INSTDIR\share\qgis\svg\north_arrows"
196-
File "..\..\qgis_win32_dist\share\qgis\svg\north_arrows\default.svg"
197-
File "..\..\qgis_win32_dist\share\qgis\svg\north_arrows\NorthArrow1.svg"
198-
File "..\..\qgis_win32_dist\share\qgis\svg\north_arrows\NorthArrow2.svg"
199-
File "..\..\qgis_win32_dist\share\qgis\svg\north_arrows\NorthArrow3.svg"
200-
File "..\..\qgis_win32_dist\share\qgis\svg\north_arrows\NorthArrow4.svg"
201-
File "..\..\qgis_win32_dist\share\qgis\svg\north_arrows\NorthArrow5.svg"
202-
File "..\..\qgis_win32_dist\share\qgis\svg\north_arrows\NorthArrow6.svg"
203-
SetOutPath "$INSTDIR\share\qgis\svg\symbol"
204-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Cross1.svg"
205-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Cross2.svg"
206-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Cross4.svg"
207-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Cross5.svg"
208-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Cross6.svg"
209-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Star1.svg"
210-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Star2.svg"
211-
File "..\..\qgis_win32_dist\share\qgis\svg\symbol\Star3.svg"
212-
SetOutPath "$INSTDIR\share\qgis\themes\default"
213-
File "..\..\qgis_win32_dist\share\qgis\themes\default\add_all_to_overview.png"
214-
File "..\..\qgis_win32_dist\share\qgis\themes\default\add_pg_layer.png"
215-
File "..\..\qgis_win32_dist\share\qgis\themes\default\add_raster_layer.png"
216-
File "..\..\qgis_win32_dist\share\qgis\themes\default\add_vector_layer.png"
217-
File "..\..\qgis_win32_dist\share\qgis\themes\default\attribute_table.png"
218-
File "..\..\qgis_win32_dist\share\qgis\themes\default\check_version.png"
219-
File "..\..\qgis_win32_dist\share\qgis\themes\default\contexthelp.png"
220-
File "..\..\qgis_win32_dist\share\qgis\themes\default\digitising_general.png"
221-
File "..\..\qgis_win32_dist\share\qgis\themes\default\digitising_line.png"
222-
File "..\..\qgis_win32_dist\share\qgis\themes\default\digitising_point.png"
223-
File "..\..\qgis_win32_dist\share\qgis\themes\default\digitising_polygon.png"
224-
File "..\..\qgis_win32_dist\share\qgis\themes\default\exit.png"
225-
File "..\..\qgis_win32_dist\share\qgis\themes\default\export_map_server.png"
226-
File "..\..\qgis_win32_dist\share\qgis\themes\default\fileprint.png"
227-
File "..\..\qgis_win32_dist\share\qgis\themes\default\file_new.png"
228-
File "..\..\qgis_win32_dist\share\qgis\themes\default\file_print.png"
229-
File "..\..\qgis_win32_dist\share\qgis\themes\default\file_save.png"
230-
File "..\..\qgis_win32_dist\share\qgis\themes\default\file_save_as.png"
231-
File "..\..\qgis_win32_dist\share\qgis\themes\default\gis_plain_cursor.png"
232-
File "..\..\qgis_win32_dist\share\qgis\themes\default\help.png"
233-
File "..\..\qgis_win32_dist\share\qgis\themes\default\help_about.png"
234-
File "..\..\qgis_win32_dist\share\qgis\themes\default\help_contents.png"
235-
File "..\..\qgis_win32_dist\share\qgis\themes\default\hide_all_layers.png"
236-
File "..\..\qgis_win32_dist\share\qgis\themes\default\home_page.png"
237-
File "..\..\qgis_win32_dist\share\qgis\themes\default\identify.png"
238-
File "..\..\qgis_win32_dist\share\qgis\themes\default\inline_table.png"
239-
File "..\..\qgis_win32_dist\share\qgis\themes\default\pan.png"
240-
File "..\..\qgis_win32_dist\share\qgis\themes\default\plugin_manager.png"
241-
File "..\..\qgis_win32_dist\share\qgis\themes\default\preferences.png"
242-
File "..\..\qgis_win32_dist\share\qgis\themes\default\project_open.png"
243-
File "..\..\qgis_win32_dist\share\qgis\themes\default\project_properties.png"
244-
File "..\..\qgis_win32_dist\share\qgis\themes\default\reload.png"
245-
File "..\..\qgis_win32_dist\share\qgis\themes\default\remove_all_from_overview.png"
246-
File "..\..\qgis_win32_dist\share\qgis\themes\default\save_map_image.png"
247-
File "..\..\qgis_win32_dist\share\qgis\themes\default\select.png"
248-
File "..\..\qgis_win32_dist\share\qgis\themes\default\show_all_layers.png"
249-
File "..\..\qgis_win32_dist\share\qgis\themes\default\sourceforge_page.png"
250-
File "..\..\qgis_win32_dist\share\qgis\themes\default\zoom_full.png"
251-
File "..\..\qgis_win32_dist\share\qgis\themes\default\zoom_in.png"
252-
File "..\..\qgis_win32_dist\share\qgis\themes\default\zoom_last.png"
253-
File "..\..\qgis_win32_dist\share\qgis\themes\default\zoom_out.png"
254-
File "..\..\qgis_win32_dist\share\qgis\themes\default\zoom_selected.png"
98+
SectionEnd
99+
100+
Section "Sample Data" SEC02
101+
; SetOutPath "$INSTDIR\SampleData\EnvironmentLayers\2050\A1F"
102+
; File "C:\dev/cpp/qgis/\qgis-release\SampleData\EnvironmentLayers\2050\A1F\Annual_dev/cpp/qgis/erature_range.asc"
103+
104+
; Shortcuts
105+
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
106+
!insertmacro MUI_STARTMENU_WRITE_END
255107
SectionEnd
256108

257109
Section -AdditionalIcons
258110
SetOutPath $INSTDIR
111+
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
259112
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
260-
CreateShortCut "$SMPROGRAMS\Quantum GIS\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
261-
CreateShortCut "$SMPROGRAMS\Quantum GIS\Uninstall.lnk" "$INSTDIR\uninst.exe"
113+
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Website.lnk" "$INSTDIR\${PRODUCT_NAME}.url"
114+
CreateShortCut "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk" "$INSTDIR\uninst.exe"
115+
!insertmacro MUI_STARTMENU_WRITE_END
262116
SectionEnd
263117

264118
Section -Post
@@ -272,6 +126,12 @@ Section -Post
272126
WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
273127
SectionEnd
274128

129+
; Section descriptions
130+
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
131+
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Main application files - you really need this!"
132+
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Sample data (not required if you have your own data already)"
133+
!insertmacro MUI_FUNCTION_DESCRIPTION_END
134+
275135

276136
Function un.onUninstSuccess
277137
HideWindow
@@ -284,222 +144,26 @@ Function un.onInit
284144
FunctionEnd
285145

286146
Section Uninstall
147+
# remove the variable
148+
Push PROJ_LIB
149+
Call un.DeleteEnvStr
150+
151+
!insertmacro MUI_STARTMENU_GETFOLDER "Application" $ICONS_GROUP
287152
Delete "$INSTDIR\${PRODUCT_NAME}.url"
288153
Delete "$INSTDIR\uninst.exe"
289-
Delete "$INSTDIR\share\qgis\themes\default\zoom_selected.png"
290-
Delete "$INSTDIR\share\qgis\themes\default\zoom_out.png"
291-
Delete "$INSTDIR\share\qgis\themes\default\zoom_last.png"
292-
Delete "$INSTDIR\share\qgis\themes\default\zoom_in.png"
293-
Delete "$INSTDIR\share\qgis\themes\default\zoom_full.png"
294-
Delete "$INSTDIR\share\qgis\themes\default\sourceforge_page.png"
295-
Delete "$INSTDIR\share\qgis\themes\default\show_all_layers.png"
296-
Delete "$INSTDIR\share\qgis\themes\default\select.png"
297-
Delete "$INSTDIR\share\qgis\themes\default\save_map_image.png"
298-
Delete "$INSTDIR\share\qgis\themes\default\remove_all_from_overview.png"
299-
Delete "$INSTDIR\share\qgis\themes\default\reload.png"
300-
Delete "$INSTDIR\share\qgis\themes\default\project_properties.png"
301-
Delete "$INSTDIR\share\qgis\themes\default\project_open.png"
302-
Delete "$INSTDIR\share\qgis\themes\default\preferences.png"
303-
Delete "$INSTDIR\share\qgis\themes\default\plugin_manager.png"
304-
Delete "$INSTDIR\share\qgis\themes\default\pan.png"
305-
Delete "$INSTDIR\share\qgis\themes\default\inline_table.png"
306-
Delete "$INSTDIR\share\qgis\themes\default\identify.png"
307-
Delete "$INSTDIR\share\qgis\themes\default\home_page.png"
308-
Delete "$INSTDIR\share\qgis\themes\default\hide_all_layers.png"
309-
Delete "$INSTDIR\share\qgis\themes\default\help_contents.png"
310-
Delete "$INSTDIR\share\qgis\themes\default\help_about.png"
311-
Delete "$INSTDIR\share\qgis\themes\default\help.png"
312-
Delete "$INSTDIR\share\qgis\themes\default\gis_plain_cursor.png"
313-
Delete "$INSTDIR\share\qgis\themes\default\file_save_as.png"
314-
Delete "$INSTDIR\share\qgis\themes\default\file_save.png"
315-
Delete "$INSTDIR\share\qgis\themes\default\file_print.png"
316-
Delete "$INSTDIR\share\qgis\themes\default\file_new.png"
317-
Delete "$INSTDIR\share\qgis\themes\default\fileprint.png"
318-
Delete "$INSTDIR\share\qgis\themes\default\export_map_server.png"
319-
Delete "$INSTDIR\share\qgis\themes\default\exit.png"
320-
Delete "$INSTDIR\share\qgis\themes\default\digitising_polygon.png"
321-
Delete "$INSTDIR\share\qgis\themes\default\digitising_point.png"
322-
Delete "$INSTDIR\share\qgis\themes\default\digitising_line.png"
323-
Delete "$INSTDIR\share\qgis\themes\default\digitising_general.png"
324-
Delete "$INSTDIR\share\qgis\themes\default\contexthelp.png"
325-
Delete "$INSTDIR\share\qgis\themes\default\check_version.png"
326-
Delete "$INSTDIR\share\qgis\themes\default\attribute_table.png"
327-
Delete "$INSTDIR\share\qgis\themes\default\add_vector_layer.png"
328-
Delete "$INSTDIR\share\qgis\themes\default\add_raster_layer.png"
329-
Delete "$INSTDIR\share\qgis\themes\default\add_pg_layer.png"
330-
Delete "$INSTDIR\share\qgis\themes\default\add_all_to_overview.png"
331-
Delete "$INSTDIR\share\qgis\svg\symbol\Star3.svg"
332-
Delete "$INSTDIR\share\qgis\svg\symbol\Star2.svg"
333-
Delete "$INSTDIR\share\qgis\svg\symbol\Star1.svg"
334-
Delete "$INSTDIR\share\qgis\svg\symbol\Cross6.svg"
335-
Delete "$INSTDIR\share\qgis\svg\symbol\Cross5.svg"
336-
Delete "$INSTDIR\share\qgis\svg\symbol\Cross4.svg"
337-
Delete "$INSTDIR\share\qgis\svg\symbol\Cross2.svg"
338-
Delete "$INSTDIR\share\qgis\svg\symbol\Cross1.svg"
339-
Delete "$INSTDIR\share\qgis\svg\north_arrows\NorthArrow6.svg"
340-
Delete "$INSTDIR\share\qgis\svg\north_arrows\NorthArrow5.svg"
341-
Delete "$INSTDIR\share\qgis\svg\north_arrows\NorthArrow4.svg"
342-
Delete "$INSTDIR\share\qgis\svg\north_arrows\NorthArrow3.svg"
343-
Delete "$INSTDIR\share\qgis\svg\north_arrows\NorthArrow2.svg"
344-
Delete "$INSTDIR\share\qgis\svg\north_arrows\NorthArrow1.svg"
345-
Delete "$INSTDIR\share\qgis\svg\north_arrows\default.svg"
346-
Delete "$INSTDIR\share\qgis\svg\icon\golfcourse.svg"
347-
Delete "$INSTDIR\share\qgis\svg\gpsicons\walker.svg"
348-
Delete "$INSTDIR\share\qgis\svg\gpsicons\tree.svg"
349-
Delete "$INSTDIR\share\qgis\svg\gpsicons\teepee.svg"
350-
Delete "$INSTDIR\share\qgis\svg\gpsicons\table.svg"
351-
Delete "$INSTDIR\share\qgis\svg\gpsicons\swimmer.svg"
352-
Delete "$INSTDIR\share\qgis\svg\gpsicons\skull.svg"
353-
Delete "$INSTDIR\share\qgis\svg\gpsicons\skier.svg"
354-
Delete "$INSTDIR\share\qgis\svg\gpsicons\shipwreck.svg"
355-
Delete "$INSTDIR\share\qgis\svg\gpsicons\question.svg"
356-
Delete "$INSTDIR\share\qgis\svg\gpsicons\point.svg"
357-
Delete "$INSTDIR\share\qgis\svg\gpsicons\plane.svg"
358-
Delete "$INSTDIR\share\qgis\svg\gpsicons\phone.svg"
359-
Delete "$INSTDIR\share\qgis\svg\gpsicons\parachute.svg"
360-
Delete "$INSTDIR\share\qgis\svg\gpsicons\house.svg"
361-
Delete "$INSTDIR\share\qgis\svg\gpsicons\h.svg"
362-
Delete "$INSTDIR\share\qgis\svg\gpsicons\golf.svg"
363-
Delete "$INSTDIR\share\qgis\svg\gpsicons\gas.svg"
364-
Delete "$INSTDIR\share\qgis\svg\gpsicons\food.svg"
365-
Delete "$INSTDIR\share\qgis\svg\gpsicons\flag.svg"
366-
Delete "$INSTDIR\share\qgis\svg\gpsicons\fish.svg"
367-
Delete "$INSTDIR\share\qgis\svg\gpsicons\dollar.svg"
368-
Delete "$INSTDIR\share\qgis\svg\gpsicons\deer.svg"
369-
Delete "$INSTDIR\share\qgis\svg\gpsicons\cross.svg"
370-
Delete "$INSTDIR\share\qgis\svg\gpsicons\couple.svg"
371-
Delete "$INSTDIR\share\qgis\svg\gpsicons\city_building.svg"
372-
Delete "$INSTDIR\share\qgis\svg\gpsicons\car.svg"
373-
Delete "$INSTDIR\share\qgis\svg\gpsicons\camera.svg"
374-
Delete "$INSTDIR\share\qgis\svg\gpsicons\boat.svg"
375-
Delete "$INSTDIR\share\qgis\svg\gpsicons\anchor.svg"
376-
Delete "$INSTDIR\share\qgis\svg\geometric\Triangle1.svg"
377-
Delete "$INSTDIR\share\qgis\svg\geometric\Square2.svg"
378-
Delete "$INSTDIR\share\qgis\svg\geometric\Square1.svg"
379-
Delete "$INSTDIR\share\qgis\svg\biology\Flower.svg"
380-
Delete "$INSTDIR\share\qgis\svg\biology\Deciduous.svg"
381-
Delete "$INSTDIR\share\qgis\svg\biology\Coniferous.svg"
382-
Delete "$INSTDIR\share\qgis\images\splash\splash.png"
383-
Delete "$INSTDIR\share\qgis\images\north_arrows\default.png"
384-
Delete "$INSTDIR\share\qgis\images\icons\qgis-icon2.png"
385-
Delete "$INSTDIR\share\qgis\images\icons\qgis_win322.ico"
386-
Delete "$INSTDIR\share\qgis\images\icons\qgis-icon.png"
387-
Delete "$INSTDIR\share\qgis\images\icons\pyramid.png"
388-
Delete "$INSTDIR\share\qgis\images\icons\no_pyramid.png"
389-
Delete "$INSTDIR\share\qgis\images\icons\inoverview.png"
390-
Delete "$INSTDIR\share\qgis\i18n\qgis_zh_CN.qm"
391-
Delete "$INSTDIR\share\qgis\i18n\qgis_se.qm"
392-
Delete "$INSTDIR\share\qgis\i18n\qgis_ru.qm"
393-
Delete "$INSTDIR\share\qgis\i18n\qgis_pt_BR.qm"
394-
Delete "$INSTDIR\share\qgis\i18n\qgis_nl.qm"
395-
Delete "$INSTDIR\share\qgis\i18n\qgis_it.qm"
396-
Delete "$INSTDIR\share\qgis\i18n\qgis_fr.qm"
397-
Delete "$INSTDIR\share\qgis\i18n\qgis_de.qm"
398-
Delete "$INSTDIR\share\qgis\doc\userguide.pdf"
399-
Delete "$INSTDIR\share\qgis\doc\README"
400-
Delete "$INSTDIR\share\qgis\doc\qgisdoc.css"
401-
Delete "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer\pluginmanager.png"
402-
Delete "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer\index.html"
403-
Delete "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer\bufferresult.png"
404-
Delete "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer\buffericon.png"
405-
Delete "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer\bufferdialog.png"
406-
Delete "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer\buffer.png"
407-
Delete "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer\alaska_pglayer.png"
408-
Delete "$INSTDIR\share\qgis\doc\plugins\delimited_text\toolbar_icon.png"
409-
Delete "$INSTDIR\share\qgis\doc\plugins\delimited_text\plugin_manager.png"
410-
Delete "$INSTDIR\share\qgis\doc\plugins\delimited_text\index.html"
411-
Delete "$INSTDIR\share\qgis\doc\plugins\delimited_text\dialog.png"
412-
Delete "$INSTDIR\share\qgis\doc\install_guide\WARNINGS"
413-
Delete "$INSTDIR\share\qgis\doc\install_guide\up_g.png"
414-
Delete "$INSTDIR\share\qgis\doc\install_guide\up.png"
415-
Delete "$INSTDIR\share\qgis\doc\install_guide\prev_g.png"
416-
Delete "$INSTDIR\share\qgis\doc\install_guide\prev.png"
417-
Delete "$INSTDIR\share\qgis\doc\install_guide\nx_grp_g.png"
418-
Delete "$INSTDIR\share\qgis\doc\install_guide\node9.html"
419-
Delete "$INSTDIR\share\qgis\doc\install_guide\node8.html"
420-
Delete "$INSTDIR\share\qgis\doc\install_guide\node7.html"
421-
Delete "$INSTDIR\share\qgis\doc\install_guide\node6.html"
422-
Delete "$INSTDIR\share\qgis\doc\install_guide\node5.html"
423-
Delete "$INSTDIR\share\qgis\doc\install_guide\node4.html"
424-
Delete "$INSTDIR\share\qgis\doc\install_guide\node3.html"
425-
Delete "$INSTDIR\share\qgis\doc\install_guide\node20.html"
426-
Delete "$INSTDIR\share\qgis\doc\install_guide\node2.html"
427-
Delete "$INSTDIR\share\qgis\doc\install_guide\node19.html"
428-
Delete "$INSTDIR\share\qgis\doc\install_guide\node18.html"
429-
Delete "$INSTDIR\share\qgis\doc\install_guide\node17.html"
430-
Delete "$INSTDIR\share\qgis\doc\install_guide\node16.html"
431-
Delete "$INSTDIR\share\qgis\doc\install_guide\node15.html"
432-
Delete "$INSTDIR\share\qgis\doc\install_guide\node14.html"
433-
Delete "$INSTDIR\share\qgis\doc\install_guide\node13.html"
434-
Delete "$INSTDIR\share\qgis\doc\install_guide\node12.html"
435-
Delete "$INSTDIR\share\qgis\doc\install_guide\node11.html"
436-
Delete "$INSTDIR\share\qgis\doc\install_guide\node10.html"
437-
Delete "$INSTDIR\share\qgis\doc\install_guide\node1.html"
438-
Delete "$INSTDIR\share\qgis\doc\install_guide\next_g.png"
439-
Delete "$INSTDIR\share\qgis\doc\install_guide\next.png"
440-
Delete "$INSTDIR\share\qgis\doc\install_guide\labels.pl"
441-
Delete "$INSTDIR\share\qgis\doc\install_guide\internals.pl"
442-
Delete "$INSTDIR\share\qgis\doc\install_guide\install.html"
443-
Delete "$INSTDIR\share\qgis\doc\install_guide\install.css"
444-
Delete "$INSTDIR\share\qgis\doc\install_guide\index.html"
445-
Delete "$INSTDIR\share\qgis\doc\install_guide\contents.png"
446-
Delete "$INSTDIR\share\qgis\doc\install.pdf"
447-
Delete "$INSTDIR\share\qgis\doc\index.html"
448-
Delete "$INSTDIR\share\qgis\doc\images\qgis_new_80pct.png"
449-
Delete "$INSTDIR\share\qgis\doc\favicon.ico"
450-
Delete "$INSTDIR\lib\qgis\spit.dll"
451-
Delete "$INSTDIR\lib\qgis\scale_bar.dll"
452-
Delete "$INSTDIR\lib\qgis\postgres.dll"
453-
Delete "$INSTDIR\lib\qgis\ogr.dll"
454-
Delete "$INSTDIR\lib\qgis\north_arrow.dll"
455-
; Delete "$INSTDIR\qgis\http_server.dll"
456-
Delete "$INSTDIR\lib\qgis\grid_maker.dll"
457-
Delete "$INSTDIR\lib\qgis\gpx.dll"
458-
Delete "$INSTDIR\lib\qgis\gps_importer.dll"
459-
Delete "$INSTDIR\lib\qgis\delimited_text.dll"
460-
Delete "$INSTDIR\lib\qgis\delimitedtext.dll"
461-
Delete "$INSTDIR\lib\qgis\copyright_label.dll"
462-
Delete "$INSTDIR\qgis.exe"
463-
Delete "$INSTDIR\gdal12.dll"
464-
Delete "$INSTDIR\qt-mtnc321.dll"
465-
Delete "$INSTDIR\msvcp80.dll"
466-
Delete "$INSTDIR\msvcr80.dll"
467-
Delete "$INSTDIR\msvcp70.dll"
468-
Delete "$INSTDIR\msvcr70.dll"
469-
470-
Delete "$SMPROGRAMS\Quantum GIS\Uninstall.lnk"
471-
Delete "$SMPROGRAMS\Quantum GIS\Website.lnk"
154+
Delete "$INSTDIR\*.exe"
155+
Delete "$INSTDIR\*.dll"
156+
;----------------- icons and shortcuts
157+
Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
158+
Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
472159
Delete "$DESKTOP\Quantum GIS.lnk"
473-
Delete "$SMPROGRAMS\Quantum GIS\Quantum GIS.lnk"
160+
Delete "$SMPROGRAMS\$ICONS_GROUP\Quantum GIS.lnk"
161+
RMDir "$SMPROGRAMS\$ICONS_GROUP"
474162

475-
RMDir "$SMPROGRAMS\Quantum GIS"
476-
RMDir "$INSTDIR\share\qgis\themes\default"
477-
RMDir "$INSTDIR\share\qgis\svg\symbol"
478-
RMDir "$INSTDIR\share\qgis\svg\north_arrows"
479-
RMDir "$INSTDIR\share\qgis\svg\icon"
480-
RMDir "$INSTDIR\share\qgis\svg\gpsicons"
481-
RMDir "$INSTDIR\share\qgis\svg\geometric"
482-
RMDir "$INSTDIR\share\qgis\svg\biology"
483-
RMDir "$INSTDIR\share\qgis\images\splash"
484-
RMDir "$INSTDIR\share\qgis\images\north_arrows"
485-
RMDir "$INSTDIR\share\qgis\images\icons"
486-
RMDir "$INSTDIR\share\qgis\i18n"
487-
RMDir "$INSTDIR\share\qgis\doc\plugins\geoprocessing\buffer"
488-
RMDir "$INSTDIR\share\qgis\doc\plugins\geoprocessing"
489-
RMDir "$INSTDIR\share\qgis\doc\plugins\delimited_text"
490-
RMDir "$INSTDIR\share\qgis\doc\plugins"
491-
RMDir "$INSTDIR\share\qgis\doc\install_guide"
492-
RMDir "$INSTDIR\share\qgis\doc\images"
493-
RMDir "$INSTDIR\share\qgis\doc"
494-
RMDir "$INSTDIR\share\qgis\images"
495-
RMDir "$INSTDIR\share\qgis\themes"
496-
RMDir "$INSTDIR\share\qgis\svg"
497-
RMDir "$INSTDIR\share\qgis"
498-
RMDir "$INSTDIR\share"
499-
RMDir "$INSTDIR\lib\qgis"
500-
RMDir "$INSTDIR\lib"
163+
;RMDir "$INSTDIR\plugins"
501164
RMDir "$INSTDIR"
502165

166+
503167
DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
504168
DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
505169
SetAutoClose true

‎win_build/qgis64x64.ico

2.19 KB
Binary file not shown.

‎win_build/sidebar.bmp

85.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)
Please sign in to comment.