[WINDOWS] Enable optional install of GPSBabel 1.5.1

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

diff --git a/win32/prepare.bat b/win32/prepare.bat
index cc5ec60be8d35c0c9c9f3ede4c6880aae4021041..602096bc9a32810d33154d95a6a7f9da1e4142f9 100644 (file)
--- a/win32/prepare.bat
+++ b/win32/prepare.bat
@@ -229,25 +229,20 @@ if not exist "%MINGW_BIN%\xgettext.exe" (
 echo =+=+=
 echo Checking libcurl...\r
 echo =+=+=\r
 echo =+=+=
 echo Checking libcurl...\r
 echo =+=+=\r

-set CURL_TAR=libcurl-7.14.0_nossl-1sid.tar\r
-set CURL_BZ2=%CURL_TAR%.bz2\r
+REM Win32 - Generic - http://curl.haxx.se/download.html
+set CURL=curl-7.34.0-devel-mingw32
+set CURL_ZIP=%CURL%.zip

 if not exist "%MINGW_BIN%\libcurl.dll" (\r
 if not exist "%MINGW_BIN%\libcurl.dll" (\r

-       if not exist %CURL_BZ2% (\r
-               wget http://downloads.sourceforge.net/devpaks/libcurl-7.14.0_nossl-1sid.DevPak?download\r
-               move libcurl-7.14.0_nossl-1sid.DevPak %CURL_BZ2%\r
-       )\r
+       call :Download %CURL_ZIP% http://curl.haxx.se/gknw.net/7.34.0/dist-w32/%CURL_ZIP%

        echo Extracting libcurl...\r
        echo Extracting libcurl...\r

-       7z e %CURL_BZ2%\r
-       7z x %CURL_TAR% -o"libcurl"\r
+       7z x -y %CURL_ZIP% -o"libcurl"

        if ERRORLEVEL 1 goto Error\r
        @echo ON\r
        if ERRORLEVEL 1 goto Error\r
        @echo ON\r

-       move libcurl\include "%MinGW%\include\curl\r
-       copy /Y libcurl\bin\*.* "%MinGW_BIN%"\r
-       copy /Y libcurl\lib\*.* "%MinGW%\lib"\r
-       copy /Y libcurl\docs\*.* "%MinGW%\doc"\r
-       copy /Y COPYING.txt "%MinGW%\COPYING_curl.txt"\r
+       xcopy /S /Y libcurl\%CURL%\include\*.* "%MinGW%\include"
+       xcopy /S /Y libcurl\%CURL%\bin\*.* "%MinGW_BIN%"
+       xcopy /S /Y libcurl\%CURL%\lib\*.a "%MinGW%\lib"
+       copy /Y libcurl\%CURL%\COPYING "%MinGW%\COPYING_curl.txt"

        rmdir /S /Q libcurl\r
        rmdir /S /Q libcurl\r

-       del %CURL_TAR%\r

        @echo OFF\r
 )\r
 \r
        @echo OFF\r
 )\r
 \r


@@ -423,16 +418,10 @@ if not exist "%MINGW_BIN%\iconv.dll" (
 :: Note GPSBabel can not be directly downloaded via wget\r
 :: ATM get it manually from here:\r
 ::   http://www.gpsbabel.org/download.html\r
 :: Note GPSBabel can not be directly downloaded via wget\r
 :: ATM get it manually from here:\r
 ::   http://www.gpsbabel.org/download.html\r

-set GPSBABEL_INST=GPSBabel-1.4.4-Setup.exe\r
-if not exist "%ProgramFiles%\GPSBabel" (\r
-       echo Installing GPSBabel...\r
-       if exist %GPSBABEL_INST% (\r
-               %GPSBABEL_INST% /silent\r
-               if ERRORLEVEL 1 goto Error\r
-       ) else (
-               echo Required %GPSBABEL_INST% not found. Exitting
-               exit /b
-       )\r
+set GPSBABEL_INST=GPSBabel-1.5.1-Setup.exe
+if not exist %GPSBABEL_INST% (
+       echo Required %GPSBABEL_INST% not found. Exitting
+       exit /b

 )\r
 \r
 echo =+=+=\r
 )\r
 \r
 echo =+=+=\r