[osmium-tool] 89/97: Update appveyor conf similar to the one from libosmium.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to tag v1.0.0
in repository osmium-tool.

commit 778f08d5d50eaa4489a94113c38435e5f1cfd97d
Author: Jochen Topf <jochen at topf.org>
Date:   Wed Feb 11 22:05:21 2015 +0100

    Update appveyor conf similar to the one from libosmium.
---
 appveyor.yml | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index ff94391..424f46c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -6,8 +6,8 @@
 
 environment:
   matrix:
-  - configuration: Dev
-  - configuration: Release
+  - config: Dev
+  - config: RelWithDebInfo
 
 # branches to build
 branches:
@@ -27,8 +27,12 @@ clone_folder: c:\projects\osmium-tool
 platform: x64
 
 install:
+  # show all availble env vars
+  - SET
+  - ECHO cmake on AppVeyor
   - cmake -version
   - CALL "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64
+  - SET PATH=c:\projects\libosmium\cmake-3.1.0-win32-x86\bin;%PATH%
   - SET LODEPSDIR=c:\projects\osmium-tool\libosmium-deps
   #libexpat.dll
   - SET PATH=%LODEPSDIR%\expat\lib;%PATH%
@@ -38,11 +42,15 @@ install:
   #cmake cannot find it otherwise
   - SET LIBBZIP2=%LODEPSDIR%\bzip2\lib\libbz2.lib
   - SET LIBBZIP2=%LIBBZIP2:\=/%
+  - ps: Start-FileDownload https://mapnik.s3.amazonaws.com/deps/cmake-3.1.0-win32-x86.7z -FileName cm.7z
   - ps: Start-FileDownload https://mapnik.s3.amazonaws.com/dist/dev/libosmium-deps-win-14.0-x64.7z -FileName lodeps.7z
+  - 7z x cm.7z > nul
   - 7z x lodeps.7z > nul
   - echo %LODEPSDIR%
   - dir %LODEPSDIR%
   #- tree %LODEPSDIR%
+  - ECHO our own cmake
+  - cmake -version
   - cd c:\projects
   - git clone https://github.com/osmcode/libosmium.git
 
@@ -50,6 +58,9 @@ build_script:
   - cd c:\projects\osmium-tool
   - mkdir build
   - cd build
-  - cmake .. -LA -G "NMake Makefiles" -DOsmium_DEBUG=TRUE -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBOOST_ROOT=%LODEPSDIR%\boost -DBoost_PROGRAM_OPTIONS_LIBRARY=%LODEPSDIR%\boost\lib\libboost_program_options-vc140-mt-1_57.lib -DOSMPBF_LIBRARY=%LODEPSDIR%\osmpbf\lib\osmpbf.lib -DOSMPBF_INCLUDE_DIR=%LODEPSDIR%\osmpbf\include -DPROTOBUF_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf.lib -DPROTOBUF_LITE_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf-lite.lib -DPROTOBUF_INCLUDE_DIR=%LODEPSDIR%\protobu [...]
-  - nmake VERBOSE=1
+  - echo %config%
+  - cmake .. -LA -G "Visual Studio 14 Win64" -DOsmium_DEBUG=TRUE -DCMAKE_BUILD_TYPE=%config% -DBOOST_ROOT=%LODEPSDIR%\boost -DBoost_PROGRAM_OPTIONS_LIBRARY=%LODEPSDIR%\boost\lib\libboost_program_options-vc140-mt-1_57.lib -DOSMPBF_LIBRARY=%LODEPSDIR%\osmpbf\lib\osmpbf.lib -DOSMPBF_INCLUDE_DIR=%LODEPSDIR%\osmpbf\include -DPROTOBUF_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf.lib -DPROTOBUF_LITE_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf-lite.lib -DPROTOBUF_INCLUDE_DIR=%LODEPSDIR%\protobu [...]
+  - msbuild osmium-tool.sln /p:Configuration=%config% /toolsversion:14.0 /p:Platform=x64 /p:PlatformToolset=v140
+#  - cmake .. -LA -G "NMake Makefiles" -DOsmium_DEBUG=TRUE -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBOOST_ROOT=%LODEPSDIR%\boost -DBoost_PROGRAM_OPTIONS_LIBRARY=%LODEPSDIR%\boost\lib\libboost_program_options-vc140-mt-1_57.lib -DOSMPBF_LIBRARY=%LODEPSDIR%\osmpbf\lib\osmpbf.lib -DOSMPBF_INCLUDE_DIR=%LODEPSDIR%\osmpbf\include -DPROTOBUF_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf.lib -DPROTOBUF_LITE_LIBRARY=%LODEPSDIR%\protobuf\lib\libprotobuf-lite.lib -DPROTOBUF_INCLUDE_DIR=%LODEPSDIR%\protob [...]
+#  - nmake VERBOSE=1
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git