[WINDOWS] Enable optional install of GPSBabel 1.5.1

[andy/viking.git] / win32 / installer.bat

diff --git a/win32/installer.bat b/win32/installer.bat
index 85a9939403407451032b55eb3a668d50ae4cd61c..44b8dab490f00f6c7b1112c7456da510e0eb0915 100644 (file)
--- a/win32/installer.bat
+++ b/win32/installer.bat
@@ -33,6 +33,8 @@ echo Copying Viking
 %MYCOPY% cache\ChangeLog.txt %DESTINATION%\r
 :: ATM this relies on being generated by an external system\r
 %MYCOPY% ..\help\C\viking.pdf %DESTINATION%\r
+:: Python cache converter tool\r
+%MYCOPY% ..\tools\viking-cache.py %DESTINATION%\r
 \r
 echo Copying Extension Configuration Data\r
 mkdir %DESTINATION%\data\r
@@ -40,7 +42,7 @@ mkdir %DESTINATION%\data
 %MYCOPY% ..\data\latlontz.txt %DESTINATION%\data\r
 \r
 echo Copying Libraries\r
-set MINGW=C:\MinGW\r
+set MINGW=%SystemDrive%\MinGW
 if not exist "%MINGW%" (\r
        echo Required %MINGW% does not exist\r
        goto Tidy\r
@@ -48,11 +50,17 @@ if not exist "%MINGW%" (
 \r
 set MINGW_BIN=%MINGW%\Bin\r
 \r
+REM Curl 7.17+ has quite a few dependencies for SSL support
 set LIBCURL=%MINGW_BIN%\libcurl.dll\r
 if exist "%LIBCURL%" (\r
        %MYCOPY% "%LIBCURL%" %DESTINATION%\r
+       %MYCOPY% "%MINGW_BIN%\libeay32.dll" %DESTINATION%
+       %MYCOPY% "%MINGW_BIN%\librtmp.dll" %DESTINATION%
+       %MYCOPY% "%MINGW_BIN%\libssh2.dll" %DESTINATION%
+       %MYCOPY% "%MINGW_BIN%\libidn-11.dll" %DESTINATION%
+       %MYCOPY% "%MINGW_BIN%\ssleay32.dll" %DESTINATION%
+::     %MYCOPY% "%MINGW_BIN%\zlib1.dll" %DESTINATION%
        %MYCOPY% "%MINGW%\COPYING_curl.txt" %DESTINATION%\r
-\r
 ) else (\r
        echo %LIBCURL% does not exist\r
        goto Tidy\r
@@ -112,21 +120,15 @@ set /p PWD=<tmp.tmp
 del tmp.tmp\r
 cache\%GTK_RUNTIME% /sideeffects=no /setpath=no /dllpath=root /translations=no /compatdlls=yes /S /D=%PWD%\%DESTINATION%\r
 \r
+echo Copying GPSBabel Installer
+mkdir %DESTINATION%\Optional
+%MYCOPY% cache\GPSBabel-1.5.1-Setup.exe %DESTINATION%\Optional
+if ERRORLEVEL 1 goto Error
+
 ::\r
 echo Copying Translations\r
 %MYCOPY% installer\translations\*nsh %DESTINATION%\r
-\r
-echo Copying GPSBabel\r
-:: Install it from http://www.gpsbabel.org/download.html\r
-::  Thus GPSBabel should be here\r
-:: NB GPSBabel has standard GPL2 COPYING.txt file so don't need another copy\r
-if exist "%ProgramFiles%\GPSBabel\gpsbabel.exe" (\r
-       %MYCOPY% "%ProgramFiles%\GPSBabel\gpsbabel.exe" %DESTINATION%\r
-       %MYCOPY% "%ProgramFiles%\GPSBabel\libexpat.dll" %DESTINATION%\r
-) else (\r
-       echo GPSBabel missing\r
-       goto Tidy\r
-)\r
+if ERRORLEVEL 1 goto Error
 \r
 echo Running NSIS (command line version)\r
 pushd installer\r
@@ -137,6 +139,11 @@ if exist "%ProgramFiles%\NSIS" (
 )\r
 popd\r
 \r
-echo Tidy Up\r
+goto Tidy
+
+:Error
+echo Exitting due to error: %ERRORLEVEL%
+
 :Tidy\r
+echo Tidy Up
 rmdir /S /Q %DESTINATION%\r