%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
%MYCOPY% ..\data\latlontz.txt %DESTINATION%\data\r
\r
echo Copying Libraries\r
-set MINGW=%SystemDrive%:\MinGW\r
+set MINGW=%SystemDrive%\MinGW
if not exist "%MINGW%" (\r
echo Required %MINGW% does not exist\r
goto Tidy\r
\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
echo Required %LIBSQL3% does not exist\r
goto Tidy\r
)\r
+set LIBZIP=%MINGW_BIN%\libzip.dll\r
+if exist "%LIBZIP%" (\r
+ %MYCOPY% "%LIBZIP%" %DESTINATION%\r
+) else (\r
+ echo Required %LIBZIP% does not exist\r
+ goto Tidy\r
+)\r
\r
:: TODO Maybe embed http://gtk-win.sourceforge.net/home/index.php/Main/EmbeddingGTK directly in NSIS?\r
:: Best to use the same GTK version as we built against in prepare.bat!!\r
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.2-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
if exist "%ProgramFiles%\NSIS" (\r
- "%ProgramFiles%\NSIS\makensis.exe" viking-installer.nsi\r
+ "%ProgramFiles%\NSIS\makensis.exe" /X"SetCompressor /SOLID lzma" viking-installer.nsi\r
) else (\r
echo NSIS Not installed in known location\r
)\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