Skip to content

Commit

Permalink
add after-build test
Browse files Browse the repository at this point in the history
  • Loading branch information
chongyangma committed Feb 12, 2017
1 parent 71974b1 commit c59d3d2
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 25 deletions.
24 changes: 7 additions & 17 deletions .appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,53 +1,43 @@
# Specify version format
version: "{build}"

# Operating system (build VM template)
os: Visual Studio 2015

# build platform, i.e. Win32 (instead of x86), x64, Any CPU. This setting is optional.
platform:
- Win32
#- x64

# specify custom environment variables
environment:
MSVC_DEFAULT_OPTIONS: ON
BOOST_ROOT: C:\Libraries\boost_1_59_0
BOOST_LIBRARYDIR: C:\Libraries\boost_1_59_0\lib32-msvc-14.0

# build configuration, i.e. Debug, Release, etc.
configuration:
- Debug
#- Debug
- Release

# scripts that are called at very beginning, before repo cloning
init:
- cmd: cmake --version
- cmd: msbuild /version

# clone directory
clone_folder: C:\projects\LevelSyn

# branches to build
branches:
only:
- master

# scripts to run before build
before_build:
- cmd: cd C:\projects\LevelSyn
- cmd: md build
- cmd: cd build
# We generate project files for Visual Studio 12 because the boost binaries installed on the test server are for Visual Studio 12.
- cmd: if "%platform%"=="Win32" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015
- cmd: if "%platform%"=="x64" set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64
- cmd: cmake -G "%CMAKE_GENERATOR_NAME%" -DCMAKE_BUILD_TYPE=%configuration% -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_LIBRARYDIR%" -DBoost_USE_STATIC_LIBS="ON" ../

build:
project: C:\projects\LevelSyn\build\LevelSyn.sln # path to Visual Studio solution or project
parallel: true # enable MSBuild parallel builds
# verbosity: quiet # MSBuild verbosity level (quiet|minimal|normal|detailed)
project: C:\projects\LevelSyn\build\LevelSyn.sln
parallel: true
# verbosity: quiet

test: off
#test_script:
# - cmd: ctest --build-config %configuration% --parallel 4 --output-on-failure
after_build:
- cd C:\projects\LevelSyn\build\Release
- levels.exe ..\..\data\planar_graph_fig1.xml ..\..\data\building_blocks_fig1.xml ..\..\data\config.txt 10
6 changes: 4 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ os:
- linux
- osx

compiler:
compiler:
- gcc
- clang

Expand All @@ -18,4 +18,6 @@ before_script:
- cd build
- cmake ..

script: make
script:
- make
- ./levels ../data/planar_graph_fig1.xml ../data/building_blocks_fig1.xml ../data/config.txt 10
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ This repository contains the source code and example data of the following publi
## Requirements

The code is cross-platform and has been tested under Windows (MSVC), Linux (Ubuntu) and Mac OS X. Compiling from scratch requires the installation of [CMake](https://cmake.org/) and [Boost C++ Libraries](http://www.boost.org/). Additional dependencies (already included in this repo) are:
The code is cross-platform and has been tested under Windows (MSVC), Linux and Mac OS X. Compiling from scratch requires the installation of [CMake](https://cmake.org/) and [Boost C++ Libraries](http://www.boost.org/). Additional dependencies (already included in this repo) are:
* [Clipper 6.4](http://www.angusj.com/delphi/clipper.php) for polygon intersection computation
* [tinyxml 2.6.2](http://www.grinninglizard.com/tinyxml/) for xml parsing

Expand Down
10 changes: 5 additions & 5 deletions tinyxml/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
PROJECT(tinyxml)

SET(TINYXML_SOURCES
SET(TINYXML_SOURCES
tinystr.cpp
tinyxml.cpp
tinyxmlerror.cpp
tinyxmlparser.cpp
)
SET(TINYXML_HEADERS

SET(TINYXML_HEADERS
tinystr.h
tinyxml.h
)

ADD_LIBRARY(tinyxml STATIC ${TINYXML_SOURCES} ${TINYXML_HEADERS})

SET_TARGET_PROPERTIES(tinyxml PROPERTIES DEBUG_POSTFIX "-d")
SET_TARGET_PROPERTIES(tinyxml PROPERTIES VERSION "2.6.1")
SET_TARGET_PROPERTIES(tinyxml PROPERTIES VERSION "2.6.2")

INSTALL(TARGETS tinyxml
RUNTIME DESTINATION ${CMAKE_SOURCE_DIR}/bin
Expand Down

0 comments on commit c59d3d2

Please sign in to comment.