Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge pull request #3274 from Project-OSRM/customize-tool-root

Browse Source 
Improve support for customized build directory
This commit is contained in:
Dane Springmeyer 2016-11-11 13:54:11 -08:00 committed by GitHub
commit 8137e95fbb
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -137,7 +137,8 @@ install:
if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
./scripts/check_taginfo.py taginfo.json profiles/car.lua ./scripts/check_taginfo.py taginfo.json profiles/car.lua
fi fi
- mkdir build && pushd build - export OSRM_BUILD_DIR="$(pwd)/build-osrm"
- mkdir ${OSRM_BUILD_DIR} && pushd ${OSRM_BUILD_DIR}
- export CC=${CCOMPILER} CXX=${CXXCOMPILER} - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
- cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_MASON=${ENABLE_MASON:-OFF} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} -DBUILD_TOOLS=ON -DBUILD_COMPONENTS=${BUILD_COMPONENTS:-OFF} -DENABLE_CCACHE=ON - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_MASON=${ENABLE_MASON:-OFF} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} -DBUILD_TOOLS=ON -DBUILD_COMPONENTS=${BUILD_COMPONENTS:-OFF} -DENABLE_CCACHE=ON
- echo "travis_fold:start:MAKE" - echo "travis_fold:start:MAKE"
@ -172,7 +173,7 @@ script:
- echo "travis_fold:end:BENCHMARK" - echo "travis_fold:end:BENCHMARK"
- ./example/build/osrm-example test/data/monaco.osrm - ./example/build/osrm-example test/data/monaco.osrm
# All tests assume to be run from the build directory # All tests assume to be run from the build directory
- pushd build - pushd ${OSRM_BUILD_DIR}
- ./unit_tests/library-tests ../test/data/monaco.osrm - ./unit_tests/library-tests ../test/data/monaco.osrm
- ./unit_tests/extractor-tests - ./unit_tests/extractor-tests
- ./unit_tests/engine-tests - ./unit_tests/engine-tests

8
test/data/Makefile
View File

@ -1,12 +1,12 @@
DATA_NAME:=monaco DATA_NAME:=monaco
DATA_URL:=https://s3.amazonaws.com/mapbox/osrm/testing/$(DATA_NAME).osm.pbf DATA_URL:=https://s3.amazonaws.com/mapbox/osrm/testing/$(DATA_NAME).osm.pbf
DATA_POLY_URL:=https://s3.amazonaws.com/mapbox/osrm/testing/$(DATA_NAME).poly DATA_POLY_URL:=https://s3.amazonaws.com/mapbox/osrm/testing/$(DATA_NAME).poly
TOOL_ROOT:=../../build OSRM_BUILD_DIR?=../../build
PROFILE_ROOT:=../../profiles PROFILE_ROOT:=../../profiles
SCRIPT_ROOT:=../../scripts SCRIPT_ROOT:=../../scripts
OSRM_EXTRACT:=$(TOOL_ROOT)/osrm-extract OSRM_EXTRACT:=$(OSRM_BUILD_DIR)/osrm-extract
OSRM_CONTRACT:=$(TOOL_ROOT)/osrm-contract OSRM_CONTRACT:=$(OSRM_BUILD_DIR)/osrm-contract
OSRM_ROUTED:=$(TOOL_ROOT)/osrm-routed OSRM_ROUTED:=$(OSRM_BUILD_DIR)/osrm-routed
POLY2REQ:=$(SCRIPT_ROOT)/poly2req.js POLY2REQ:=$(SCRIPT_ROOT)/poly2req.js
TIMER:=$(SCRIPT_ROOT)/timer.sh TIMER:=$(SCRIPT_ROOT)/timer.sh
PROFILE:=$(PROFILE_ROOT)/car.lua PROFILE:=$(PROFILE_ROOT)/car.lua