From f570ee2bc0dac52b9bba9a193b7ba48e64f797ed Mon Sep 17 00:00:00 2001
From: Rob Norris <rw_norris@hotmail.com>
Date: Wed, 15 Oct 2014 00:11:18 +0100
Subject: [PATCH] [WINDOWS] Enable optional install of GPSBabel 1.5.1

Package and run the GPSBabel setup installer directly.
---
 win32/installer.bat                      | 25 ++++++++++++------------
 win32/installer/langmacros.nsh           |  2 ++
 win32/installer/translations/english.nsh |  2 ++
 win32/installer/translations/french.nsh  |  2 ++
 win32/installer/translations/spanish.nsh |  2 ++
 win32/installer/viking-installer.nsi     | 10 ++++++++++
 win32/prepare.bat                        | 14 ++++---------
 7 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/win32/installer.bat b/win32/installer.bat
index 56bd33fc..44b8dab4 100644
--- a/win32/installer.bat
+++ b/win32/installer.bat
@@ -120,21 +120,15 @@ set /p PWD=<tmp.tmp
 del tmp.tmp
 cache\%GTK_RUNTIME% /sideeffects=no /setpath=no /dllpath=root /translations=no /compatdlls=yes /S /D=%PWD%\%DESTINATION%
 
+echo Copying GPSBabel Installer
+mkdir %DESTINATION%\Optional
+%MYCOPY% cache\GPSBabel-1.5.1-Setup.exe %DESTINATION%\Optional
+if ERRORLEVEL 1 goto Error
+
 ::
 echo Copying Translations
 %MYCOPY% installer\translations\*nsh %DESTINATION%
-
-echo Copying GPSBabel
-:: Install it from http://www.gpsbabel.org/download.html
-::  Thus GPSBabel should be here
-:: NB GPSBabel has standard GPL2 COPYING.txt file so don't need another copy
-if exist "%ProgramFiles%\GPSBabel\gpsbabel.exe" (
-	%MYCOPY% "%ProgramFiles%\GPSBabel\gpsbabel.exe" %DESTINATION%
-	%MYCOPY% "%ProgramFiles%\GPSBabel\libexpat.dll" %DESTINATION%
-) else (
-	echo GPSBabel missing
-	goto Tidy
-)
+if ERRORLEVEL 1 goto Error
 
 echo Running NSIS (command line version)
 pushd installer
@@ -145,6 +139,11 @@ if exist "%ProgramFiles%\NSIS" (
 )
 popd
 
-echo Tidy Up
+goto Tidy
+
+:Error
+echo Exitting due to error: %ERRORLEVEL%
+
 :Tidy
+echo Tidy Up
 rmdir /S /Q %DESTINATION%
diff --git a/win32/installer/langmacros.nsh b/win32/installer/langmacros.nsh
index 70cee956..e4822cf6 100644
--- a/win32/installer/langmacros.nsh
+++ b/win32/installer/langmacros.nsh
@@ -42,11 +42,13 @@
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_DESKTOP_SHORTCUT_SECTION_TITLE ${CUR_LANG}
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_STARTMENU_SHORTCUT_SECTION_TITLE	${CUR_LANG}
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_FILE_ASSOCIATION_SECTION_TITLE	${CUR_LANG}
+  !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_GPSBABEL_SECTION_TITLE	${CUR_LANG}
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_SECTION_DESCRIPTION		${CUR_LANG}
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_SHORTCUTS_SECTION_DESCRIPTION	${CUR_LANG}
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_DESKTOP_SHORTCUT_DESC		${CUR_LANG}
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_STARTMENU_SHORTCUT_DESC	${CUR_LANG}
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_FILE_ASSOCIATION_DESC	${CUR_LANG}
+  !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_INSTALL_GPSBABEL_DESC	${CUR_LANG}
 
   ; Installer Finish Page
   !insertmacro VIKING_MACRO_LANGSTRING_INSERT VIKING_FINISH_VISIT_WEB_SITE		${CUR_LANG}
diff --git a/win32/installer/translations/english.nsh b/win32/installer/translations/english.nsh
index beefa160..841c3f63 100644
--- a/win32/installer/translations/english.nsh
+++ b/win32/installer/translations/english.nsh
@@ -25,6 +25,7 @@
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menu"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_FILE_ASSOCIATION_SECTION_TITLE	"File association"
+!insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_GPSBABEL_SECTION_TITLE	"GPSBabel 1.5.1"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_SECTION_DESCRIPTION		"Core Viking files and dlls"
 !insertmacro VIKING_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Viking"
 
@@ -32,6 +33,7 @@
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_DESKTOP_SHORTCUT_DESC		"Create a shortcut to Viking on the Desktop"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_STARTMENU_SHORTCUT_DESC		"Create a Start Menu entry for Viking"
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_FILE_ASSOCIATION_DESC	  "Associate .vik files with Viking"
+!insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_INSTALL_GPSBABEL_DESC	  "Install GPSBabel Program"
 
 ; Installer Finish Page
 !insertmacro VIKING_MACRO_DEFAULT_STRING VIKING_FINISH_VISIT_WEB_SITE		"Visit the Viking Web Page"
diff --git a/win32/installer/translations/french.nsh b/win32/installer/translations/french.nsh
index fae5d582..4f3537d8 100644
--- a/win32/installer/translations/french.nsh
+++ b/win32/installer/translations/french.nsh
@@ -28,11 +28,13 @@
 !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Démarrer"
 !define VIKING_FILE_ASSOCIATION_SECTION_TITLE	"Extension .vik"
 !define VIKING_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Viking"
+!define VIKING_GPSBABEL_SECTION_TITLE	"GPSBabel 1.5.1"
 
 !define VIKING_SHORTCUTS_SECTION_DESCRIPTION	"Raccourcis pour lancer Viking"
 !define VIKING_DESKTOP_SHORTCUT_DESC		"Créer un raccourci pour Viking sur le bureau"
 !define VIKING_STARTMENU_SHORTCUT_DESC		"Créer un raccourci pour Viking dans le menu Démarrer"
 !define VIKING_FILE_ASSOCIATION_DESC    "Associer Viking avec l'extension .vik"
+!define VIKING_INSTALL_GPSBABEL_DESC	"Installer GPSBabel Programme"
 
 ; Installer Finish Page
 !define VIKING_FINISH_VISIT_WEB_SITE		"Visitez la page web de Viking" 
diff --git a/win32/installer/translations/spanish.nsh b/win32/installer/translations/spanish.nsh
index a6630330..041eac4b 100644
--- a/win32/installer/translations/spanish.nsh
+++ b/win32/installer/translations/spanish.nsh
@@ -27,11 +27,13 @@
 !define VIKING_STARTMENU_SHORTCUT_SECTION_TITLE	"Menú Inicio"
 !define VIKING_FILE_ASSOCIATION_SECTION_TITLE	"Extensión.vik"
 !define VIKING_SECTION_DESCRIPTION		"Ficheros y DLLs de base de Viking"
+!define VIKING_GPSBABEL_SECTION_TITLE	"GPSBabel 1.5.1"
 
 !define VIKING_SHORTCUTS_SECTION_DESCRIPTION	"Accesos directos para lanzar Viking"
 !define VIKING_DESKTOP_SHORTCUT_DESC		"Crear un acceso directo a Viking en el escritorio"
 !define VIKING_STARTMENU_SHORTCUT_DESC		"Crear un acceso directo a Viking en el menú de inicio"
 !define VIKING_FILE_ASSOCIATION_DESC    "Asociar Viking con la extensión .vik"
+!define VIKING_INSTALL_GPSBABEL_DESC	"Instalar GPSBabel Programa"
 
 ; Installer Finish Page
 !define VIKING_FINISH_VISIT_WEB_SITE		"Visite la página web de Viking" 
diff --git a/win32/installer/viking-installer.nsi b/win32/installer/viking-installer.nsi
index a3fe94d0..9e01fce1 100644
--- a/win32/installer/viking-installer.nsi
+++ b/win32/installer/viking-installer.nsi
@@ -288,6 +288,14 @@ Section $(VIKING_FILE_ASSOCIATION_SECTION_TITLE) SecFileAssociation
   ${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
@@ -355,6 +363,8 @@ SectionEnd ; end of uninstall section
         $(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
 
diff --git a/win32/prepare.bat b/win32/prepare.bat
index 81602e0f..602096bc 100644
--- a/win32/prepare.bat
+++ b/win32/prepare.bat
@@ -418,16 +418,10 @@ if not exist "%MINGW_BIN%\iconv.dll" (
 :: Note GPSBabel can not be directly downloaded via wget
 :: ATM get it manually from here:
 ::   http://www.gpsbabel.org/download.html
-set GPSBABEL_INST=GPSBabel-1.4.4-Setup.exe
-if not exist "%ProgramFiles%\GPSBabel" (
-	echo Installing GPSBabel...
-	if exist %GPSBABEL_INST% (
-		%GPSBABEL_INST% /silent
-		if ERRORLEVEL 1 goto Error
-	) else (
-		echo Required %GPSBABEL_INST% not found. Exitting
-		exit /b
-	)
+set GPSBABEL_INST=GPSBabel-1.5.1-Setup.exe
+if not exist %GPSBABEL_INST% (
+	echo Required %GPSBABEL_INST% not found. Exitting
+	exit /b
 )
 
 echo =+=+=
-- 
2.39.5