Fix GTK warnings in Waypoint window

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

diff --git a/win32/installer.bat b/win32/installer.bat
index 39145a9fdb1f3ab059c13c35f77da68bf315b508..9df95e03af8c4dbf077b94b30884b3288be26a9a 100644 (file)
--- a/win32/installer.bat
+++ b/win32/installer.bat
@@ -50,11 +50,17 @@ if not exist "%MINGW%" (
 \r
 set MINGW_BIN=%MINGW%\Bin\r
 \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
 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
        %MYCOPY% "%MINGW%\COPYING_curl.txt" %DESTINATION%\r

-\r

 ) else (\r
        echo %LIBCURL% does not exist\r
        goto Tidy\r
 ) else (\r
        echo %LIBCURL% does not exist\r
        goto Tidy\r


@@ -90,6 +96,13 @@ if exist "%LIBSQL3%" (
        echo Required %LIBSQL3% does not exist\r
        goto Tidy\r
 )\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
 \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


@@ -114,31 +127,30 @@ 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
 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 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
 \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
 ) 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
 :Tidy\r

+echo Tidy Up

 rmdir /S /Q %DESTINATION%\r
 rmdir /S /Q %DESTINATION%\r