@@ -27,6 +27,7 @@ RequestExecutionLevel admin
27
27
28
28
; NSIS Includes
29
29
30
+ !include " x64.nsh"
30
31
!include " MUI.nsh"
31
32
!include " LogicLib.nsh"
32
33
@@ -60,6 +61,14 @@ OutFile "${INSTALLER_NAME}"
60
61
; Define installation folder
61
62
InstallDir " $PROGRAMFILES\${QGIS_BASE}"
62
63
64
+ ${If} ${RunningX64}
65
+ DetailPrint " Installer running on 64-bit host"
66
+ ; disable registry redirection (enable access to 64-bit portion of registry)
67
+ SetRegView 64
68
+ ; change install dir
69
+ StrCpy $INSTDIR " $PROGRAMFILES64\${QGIS_BASE}"
70
+ ${EndIf}
71
+
63
72
; Tell the installer to show Install and Uninstall details as default
64
73
ShowInstDetails show
65
74
ShowUnInstDetails show
@@ -270,7 +279,7 @@ Section "QGIS" SecQGIS
270
279
271
280
SectionIn RO
272
281
273
- ; Added by Tim to set the reg key so we get default plugin loading
282
+ ; Added by Tim to set the reg key so we get default plugin loading
274
283
!include plugins.nsh
275
284
; Added by Tim to set the reg key so we get default python & py plugins
276
285
!include python_plugins.nsh
@@ -334,7 +343,7 @@ Section "QGIS" SecQGIS
334
343
335
344
; Create the Desktop Shortcut
336
345
SetShellVarContext current
337
-
346
+
338
347
; Create the Windows Start Menu Shortcuts
339
348
SetShellVarContext all
340
349
@@ -355,24 +364,6 @@ RebootNecessary:
355
364
SetRebootFlag true
356
365
357
366
NoRebootNecessary:
358
- Delete " $DESKTOP\QGIS (${VERSION_NUMBER}).lnk"
359
- Delete " $SMPROGRAMS\${QGIS_BASE}\QGIS (${VERSION_NUMBER}).lnk"
360
-
361
- Delete " $DESKTOP\QGIS Desktop (${VERSION_NUMBER}).lnk"
362
- CreateShortCut " $DESKTOP\QGIS Desktop (${VERSION_NUMBER}).lnk" " $INSTALL_DIR\bin\nircmd.exe" ' exec hide "$INSTALL_DIR\bin\${SHORTNAME}.bat"' \
363
- " $INSTALL_DIR\icons\QGIS.ico" " " SW_SHOWNORMAL " " " Launch ${COMPLETE_NAME}"
364
-
365
- Delete " $SMPROGRAMS\${QGIS_BASE}\QGIS Desktop (${VERSION_NUMBER}).lnk"
366
- CreateShortCut " $SMPROGRAMS\${QGIS_BASE}\QGIS Desktop (${VERSION_NUMBER}).lnk" " $INSTALL_DIR\bin\nircmd.exe" ' exec hide "$INSTALL_DIR\bin\${SHORTNAME}.bat"' \
367
- " $INSTALL_DIR\icons\QGIS.ico" " " SW_SHOWNORMAL " " " Launch ${COMPLETE_NAME}"
368
-
369
- Delete " $DESKTOP\QGIS Browser (${VERSION_NUMBER}).lnk"
370
- CreateShortCut " $DESKTOP\QGIS Browser (${VERSION_NUMBER}).lnk" " $INSTALL_DIR\bin\nircmd.exe" ' exec hide "$INSTALL_DIR\bin\${SHORTNAME}-browser.bat"' \
371
- " $INSTALL_DIR\icons\QGIS.ico" " " SW_SHOWNORMAL " " " Launch ${COMPLETE_NAME}"
372
-
373
- Delete " $SMPROGRAMS\${QGIS_BASE}\QGIS Browser (${VERSION_NUMBER}).lnk"
374
- CreateShortCut " $SMPROGRAMS\${QGIS_BASE}\QGIS Browser (${VERSION_NUMBER}).lnk" " $INSTALL_DIR\bin\nircmd.exe" ' exec hide "$INSTALL_DIR\bin\${SHORTNAME}-browser.bat"' \
375
- " $INSTALL_DIR\icons\QGIS.ico" " " SW_SHOWNORMAL " " " Launch ${COMPLETE_NAME}"
376
367
377
368
SectionEnd
378
369
@@ -406,7 +397,7 @@ Function DownloadDataSet
406
397
Pop $0
407
398
StrCmp $0 " success" untar_ok untar_failed
408
399
409
- untar_ok:
400
+ untar_ok:
410
401
Rename " $GIS_DATABASE\$ORIGINAL_UNTAR_FOLDER" " $GIS_DATABASE\$CUSTOM_UNTAR_FOLDER"
411
402
Delete " $TEMP\$ARCHIVE_NAME"
412
403
Goto end
@@ -434,7 +425,7 @@ Section /O "North Carolina Data Set" SecNorthCarolinaSDB
434
425
435
426
; Set the size (in KB) of the unpacked archive file
436
427
AddSize 293314
437
-
428
+
438
429
StrCpy $HTTP_PATH " http://grass.osgeo.org/sampledata"
439
430
StrCpy $ARCHIVE_NAME " nc_spm_latest.tar.gz"
440
431
StrCpy $EXTENDED_ARCHIVE_NAME " North Carolina"
0 commit comments