X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/b7477cb391069ace023db444949e84ab47487fdd..02468bf10a1db541843fb089135585ea4fdcd4e2:/win32/installer.bat

diff --git a/win32/installer.bat b/win32/installer.bat
index 9a420fec..699019ad 100644
--- a/win32/installer.bat
+++ b/win32/installer.bat
@@ -33,6 +33,8 @@ echo Copying Viking
 %MYCOPY% cache\ChangeLog.txt %DESTINATION%
 :: ATM this relies on being generated by an external system
 %MYCOPY% ..\help\C\viking.pdf %DESTINATION%
+:: Python cache converter tool
+%MYCOPY% ..\tools\viking-cache.py %DESTINATION%
 
 echo Copying Extension Configuration Data
 mkdir %DESTINATION%\data
@@ -40,7 +42,7 @@ mkdir %DESTINATION%\data
 %MYCOPY% ..\data\latlontz.txt %DESTINATION%\data
 
 echo Copying Libraries
-set MINGW=%SystemDrive%:\MinGW
+set MINGW=%SystemDrive%\MinGW
 if not exist "%MINGW%" (
 	echo Required %MINGW% does not exist
 	goto Tidy
@@ -48,11 +50,17 @@ if not exist "%MINGW%" (
 
 set MINGW_BIN=%MINGW%\Bin
 
+REM Curl 7.17+ has quite a few dependencies for SSL support
 set LIBCURL=%MINGW_BIN%\libcurl.dll
 if exist "%LIBCURL%" (
 	%MYCOPY% "%LIBCURL%" %DESTINATION%
+	%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%
-
 ) else (
 	echo %LIBCURL% does not exist
 	goto Tidy
@@ -88,6 +96,13 @@ if exist "%LIBSQL3%" (
 	echo Required %LIBSQL3% does not exist
 	goto Tidy
 )
+set LIBZIP=%MINGW_BIN%\libzip.dll
+if exist "%LIBZIP%" (
+	%MYCOPY% "%LIBZIP%" %DESTINATION%
+) else (
+	echo Required %LIBZIP% does not exist
+	goto Tidy
+)
 
 :: TODO Maybe embed http://gtk-win.sourceforge.net/home/index.php/Main/EmbeddingGTK directly in NSIS?
 :: Best to use the same GTK version as we built against in prepare.bat!!
@@ -112,21 +127,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.2-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
@@ -137,6 +146,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%