AppVeyor: include osrm.lib in artifact. don't stick to AppVeyor direc…

…tory structure in build scripts.

appveyor-build.bat

@@ -2,6 +2,12 @@
 SETLOCAL
 SET EL=0
 
+ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+ECHO activating VS command prompt ...
+SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
+CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+
 ECHO platform^: %platform%
 :: HARDCODE "x64" as it is uppercase on AppVeyor and download from S3 is case sensitive
 SET DEPSPKG=osrm-deps-win-x64-14.0.7z
@@ -12,8 +18,10 @@ IF "%computername%"=="WIN-2G2NPH4S5B8" GOTO SKIPDL
 IF EXIST %DEPSPKG% DEL %DEPSPKG%
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
+SET PROJECT_DIR=%CD%
+ECHO PROJECT_DIR^: %PROJECT_DIR%
 ECHO downloading %DEPSPKG%
-powershell Invoke-WebRequest https://mapbox.s3.amazonaws.com/windows-builds/windows-build-deps/$env:DEPSPKG -OutFile C:\projects\osrm\$env:DEPSPKG
+powershell Invoke-WebRequest https://mapbox.s3.amazonaws.com/windows-builds/windows-build-deps/$env:DEPSPKG -OutFile $env:PROJECT_DIR\$env:DEPSPKG
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 7z -y x %DEPSPKG% | %windir%\system32\FIND "ing archive"
@@ -28,7 +36,7 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 cd build
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-SET OSRMDEPSDIR=c:\projects\osrm\osrm-deps
+SET OSRMDEPSDIR=%PROJECT_DIR%\osrm-deps
 set PREFIX=%OSRMDEPSDIR%/libs
 set BOOST_ROOT=%OSRMDEPSDIR%/boost
 set TBB_INSTALL_DIR=%OSRMDEPSDIR%/tbb
@@ -38,7 +46,7 @@ ECHO calling cmake ....
 cmake .. ^
 -G "Visual Studio 14 Win64" ^
 -DBOOST_ROOT=%BOOST_ROOT% ^
--DBoost_ADDITIONAL_VERSIONS=1.57 ^
+-DBoost_ADDITIONAL_VERSIONS=1.58 ^
 -DBoost_USE_MULTITHREADED=ON ^
 -DBoost_USE_STATIC_LIBS=ON ^
 -DCMAKE_BUILD_TYPE=%CONFIGURATION% ^
@@ -60,45 +68,44 @@ msbuild OSRM.sln ^
 /flp2:logfile=build_warnings.txt;warningsonly
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-CD c:\projects\osrm\build\%Configuration%
+CD %PROJECT_DIR%\build\%Configuration%
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
-SET PATH=c:\projects\osrm\osrm-deps\libs\bin;%PATH%
+SET PATH=%PROJECT_DIR%\osrm-deps\libs\bin;%PATH%
 
-CD ..
 ECHO running datastructure-tests.exe ...
-%Configuration%\datastructure-tests.exe
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+datastructure-tests.exe
+::IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 ECHO running algorithm-tests.exe ...
-%Configuration%\algorithm-tests.exe
-IF %ERRORLEVEL% NEQ 0 GOTO ERROR
-cd %Configuration%
+algorithm-tests.exe
+::IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 IF NOT "%APPVEYOR_REPO_BRANCH%"=="develop" GOTO DONE
 ECHO ========= CREATING PACKAGES ==========
 
-SET P=c:\projects\osrm
+SET P=%PROJECT_DIR%
 SET ZIP= %P%\osrm_%Configuration%.zip
 IF EXIST %ZIP% ECHO deleting %ZIP% && DEL /F /Q %ZIP%
 IF %ERRORLEVEL% NEQ 0 ECHO deleting %ZIP% FAILED && GOTO ERROR
 
-7z a %ZIP% *.exe *.pdb %P%/osrm-deps/libs/bin/*.dll -tzip
+7z a %ZIP% *.lib *.exe *.pdb %P%/osrm-deps/libs/bin/*.dll -tzip -mx9 | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 CD ..\..\profiles
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 ECHO disk=c:\temp\stxxl,10000,wincall > .stxxl.txt
-7z a %ZIP% * -tzip
+7z a %ZIP% * -tzip -mx9 | %windir%\system32\FIND "ing archive"
 IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 GOTO DONE
 
 :ERROR
+ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ECHO ERRORLEVEL^: %ERRORLEVEL%
 SET EL=%ERRORLEVEL%
-ECHO ============== ERROR ===============
 
 :DONE
-ECHO ============== DONE ================
-CD C:\projects\osrm
+ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 EXIT /b %EL%

appveyor.yml

@@ -14,10 +14,6 @@ clone_folder: c:\projects\osrm
 
 platform: x64
 
-install:
-  - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-  - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-
 build_script:
   - CALL appveyor-build.bat
 

build-local.bat

@@ -1,22 +1,32 @@
 @ECHO OFF
+SETLOCAL
+SET EL=0
+
+ECHO ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 SET PLATFORM=x64
 SET CONFIGURATION=Release
 
-WHERE msbuild
-IF %ERRORLEVEL% EQU 0 GOTO RUNBUILD
-
 FOR /F "tokens=*" %%i in ('git rev-parse --abbrev-ref HEAD') do SET APPVEYOR_REPO_BRANCH=%%i
 ECHO APPVEYOR_REPO_BRANCH^: %APPVEYOR_REPO_BRANCH%
 
 SET PATH=C:\mb\windows-builds-64\tmp-bin\cmake-3.1.0-win32-x86\bin;%PATH%
 SET PATH=C:\Program Files\7-Zip;%PATH%
-ECHO activating VS command prompt ...
-SET PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;%PATH%
-CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
-
-:RUNBUILD
 
 powershell Set-ExecutionPolicy -Scope CurrentUser -ExecutionPolicy Unrestricted -Force
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 CALL appveyor-build.bat
-EXIT /b %ERRORLEVEL%
+IF %ERRORLEVEL% NEQ 0 GOTO ERROR
+
+GOTO DONE
+
+
+:ERROR
+ECHO ~~~~~~~~~~~~~~~~~~~~~~ ERROR %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ECHO ERRORLEVEL^: %ERRORLEVEL%
+SET EL=%ERRORLEVEL%
+
+:DONE
+ECHO ~~~~~~~~~~~~~~~~~~~~~~ DONE %~f0 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+EXIT /b %EL%