[WINDOWS] Enable optional install of GPSBabel 1.5.1

[andy/viking.git] / win32 / installer / viking-installer.nsi

diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index 2ce49dcb0428b77de17183765a0b24222c716bd5..9e01fce1975c8b881bf0ce2ab6676e2216ecac65 100644 (file)
--- a/win32/installer/viking-installer.nsi
+++ b/win32/installer/viking-installer.nsi
@@ -10,7 +10,7 @@ Var name
 ;--------------------------------
 ;Configuration
 ;Needs to be 4 numbers:  W.X.Y.Z
 ;--------------------------------
 ;Configuration
 ;Needs to be 4 numbers:  W.X.Y.Z

-!define VIKING_VERSION  "1.4.0.0"
+!define VIKING_VERSION  "1.5.0.0"

 
 ;The name var is set in .onInit
 Name $name
 
 ;The name var is set in .onInit
 Name $name


@@ -288,6 +288,14 @@ Section $(VIKING_FILE_ASSOCIATION_SECTION_TITLE) SecFileAssociation
   ${registerExtension} "$INSTDIR\viking.exe" ".vik" "Viking File"
 SectionEnd
 
   ${registerExtension} "$INSTDIR\viking.exe" ".vik" "Viking File"
 SectionEnd
 

+;--------------------------------
+; GPSBabel Install Section
+;
+Section $(VIKING_GPSBABEL_SECTION_TITLE) SecGPSBabel
+  File "bin\Optional\GPSBabel-1.5.1-Setup.exe"
+  ExecWait '"$INSTDIR\GPSBabel-1.5.1-Setup.exe" /SILENT'
+  Delete "$INSTDIR\GPSBabel-1.5.1-Setup.exe"
+SectionEnd

 
 ;--------------------------------
 ;Uninstaller Section
 
 ;--------------------------------
 ;Uninstaller Section


@@ -355,6 +363,8 @@ SectionEnd ; end of uninstall section
         $(VIKING_STARTMENU_SHORTCUT_DESC)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssociation} \
         $(VIKING_FILE_ASSOCIATION_DESC)
         $(VIKING_STARTMENU_SHORTCUT_DESC)
   !insertmacro MUI_DESCRIPTION_TEXT ${SecFileAssociation} \
         $(VIKING_FILE_ASSOCIATION_DESC)

+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGPSBabel} \
+        $(VIKING_INSTALL_GPSBABEL_DESC)

 
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
 !insertmacro MUI_FUNCTION_DESCRIPTION_END