Skip to content

Commit eb97895

Browse files
author
timlinux
committed
Dont install sample data by default since it requires a net connection
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@6712 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 9bf9976 commit eb97895

File tree

1 file changed

+24
-9
lines changed

1 file changed

+24
-9
lines changed

win_build/qgis.nsi

+24-9
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ ShowUnInstDetails show
9292
Section "Quantum GIS Application" SEC01
9393
;this section is mandatory
9494
SectionIn RO
95+
;Added by Tim to install for all users not just the logged in user..
96+
;make sure this is at the top of the section
97+
SetShellVarContext all
98+
9599

96100
;Set the reg key so we get default toolbar layout
97101
!include qgis_window_geometry.nsh
@@ -135,7 +139,13 @@ Section "Quantum GIS Application" SEC01
135139

136140
SectionEnd
137141

138-
Section "Sample Data - Spearfish (GRASS)" SEC02
142+
Section "Development headers" SEC02
143+
SetOutPath "$INSTDIR\include"
144+
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\include\*.h"
145+
SectionEnd
146+
147+
; /o means unchecked by default
148+
Section /o "Sample Data - Spearfish (GRASS)" SEC03
139149
SetOutPath "$INSTDIR\SampleData\"
140150
NSISdl::download http://grass.itc.it/sampledata/spearfish_grass60data-0.3.zip spearfish.zip
141151
!insertmacro ZIPDLL_EXTRACT "$INSTDIR\SampleData\spearfish.zip" "$INSTDIR\SampleData\" "<ALL>"
@@ -149,12 +159,8 @@ Section "Sample Data - Spearfish (GRASS)" SEC02
149159

150160
SectionEnd
151161

152-
Section "Development headers" SEC03
153-
SetOutPath "$INSTDIR\include"
154-
File "C:\Program Files\qgis${PRODUCT_VERSION_NUMBER}\include\*.h"
155-
SectionEnd
156-
157-
Section "Sample Data - Alaska (Non GRASS)" SEC04
162+
; /o means unchecked by default
163+
Section /o "Sample Data - Alaska (Non GRASS)" SEC04
158164
SetOutPath "$INSTDIR\SampleData\Alaska\"
159165
NSISdl::download http://qgis.org/uploadfiles/qgis_sample_data.zip alaska.zip
160166
!insertmacro ZIPDLL_EXTRACT "$INSTDIR\SampleData\Alaska\alaska.zip" "$INSTDIR\SampleData\Alaska" "<ALL>"
@@ -165,6 +171,10 @@ SectionEnd
165171

166172

167173
Section -AdditionalIcons
174+
;Added by Tim to install for all users not just the logged in user..
175+
;make sure this is at the top of the section
176+
SetShellVarContext all
177+
168178
SetOutPath $INSTDIR
169179
!insertmacro MUI_STARTMENU_WRITE_BEGIN Application
170180
WriteIniStr "$INSTDIR\${PRODUCT_NAME}.url" "InternetShortcut" "URL" "${PRODUCT_WEB_SITE}"
@@ -187,8 +197,9 @@ SectionEnd
187197
; Section descriptions
188198
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
189199
!insertmacro MUI_DESCRIPTION_TEXT ${SEC01} "Main application files - you really need this!"
190-
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "20mb Download of sample data in GRASS format (not required if you have your own data already)"
191-
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "20mb Download of sample shapefiles and TIFF data for Alaska (not required if you have your own data already)"
200+
!insertmacro MUI_DESCRIPTION_TEXT ${SEC02} "Header files for developers."
201+
!insertmacro MUI_DESCRIPTION_TEXT ${SEC03} "20mb Download of sample data in GRASS format (not required if you have your own data already)"
202+
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "20mb Download of sample shapefiles and TIFF data for Alaska (not required if you have your own data already)"
192203
!insertmacro MUI_FUNCTION_DESCRIPTION_END
193204

194205

@@ -204,6 +215,10 @@ FunctionEnd
204215

205216

206217
Section Uninstall
218+
;Added by Tim to install for all users not just the logged in user..
219+
;make sure this is at the top of the section
220+
SetShellVarContext all
221+
207222
# remove the variable
208223
Push PROJ_LIB
209224
Call un.DeleteEnvStr

0 commit comments

Comments
 (0)