From d90215dc6da55da1235e4a776a76bfc577412076 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 24 Dec 2015 11:39:06 +0100 Subject: [PATCH 1/5] Use v4.9.0 osrm-backend tag --- .travis.yml | 2 +- bootstrap.sh | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4d3e540..f89a0ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "develop" + - OSRM_RELEASE: "v4.9.0" - secure: KitzGZjoDblX/3heajcvssGz0JnJ/k02dr2tu03ksUV+6MogC3RSQudqyKY57+f8VyZrcllN/UOlJ0Q/3iG38Oz8DljC+7RZxtkVmE1SFBoOezKCdhcvWM12G3uqPs7hhrRxuUgIh0C//YXEkulUrqa2H1Aj2xeen4E3FAqEoy0= - secure: WLGmxl6VTVWhXGm6X83GYNYzPNsvTD+9usJOKM5YBLAdG7cnOBQBNiCCUKc9OZMMZVUr3ec2/iigakH5Y8Yc+U6AlWKzlORyqWLuk4nFuoedu62x6ocQkTkuOc7mHiYhKd21xTGMYauaZRS6kugv4xkpGES2UjI2T8cjZ+LN2jU= diff --git a/bootstrap.sh b/bootstrap.sh index 12ec790..a6d5281 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -10,7 +10,7 @@ CURRENT_DIR=$(pwd) # default to clang CXX=${CXX:-clang++} TARGET=${TARGET:-Release} -OSRM_RELEASE=${OSRM_RELEASE:-"develop"} +OSRM_RELEASE=${OSRM_RELEASE:-"v4.9.0"} OSRM_REPO=${OSRM_REPO:-"https://github.com/Project-OSRM/osrm-backend.git"} OSRM_DIR=deps/osrm-backend-${TARGET} diff --git a/package.json b/package.json index da1b275..bc9571c 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "url": "https://github.com/Project-OSRM/node-osrm", "homepage": "http://project-osrm.org", "author": "Dane Springmeyer ", - "version": "4.9.0-develop.0", + "version": "4.9.0", "main": "./lib/osrm.js", "license": "BSD", "bugs": { From 6dc0e3603b33498e0f3f27136fa2747162263a07 Mon Sep 17 00:00:00 2001 From: Patrick Niklaus Date: Thu, 24 Dec 2015 12:06:50 +0100 Subject: [PATCH 2/5] [publish binary] From 1e58259ec83f0f4dbff41f0915ecb05d73a7a1d3 Mon Sep 17 00:00:00 2001 From: Freenerd Date: Thu, 4 Feb 2016 13:40:53 +0100 Subject: [PATCH 3/5] Add DEBUG_GEOMETRY build flag [publish binary] --- bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap.sh b/bootstrap.sh index a6d5281..882df7a 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -79,7 +79,8 @@ function build_osrm() { -DCMAKE_INCLUDE_PATH=${MASON_HOME}/include \ -DCMAKE_LIBRARY_PATH=${MASON_HOME}/lib \ -DCMAKE_BUILD_TYPE=${TARGET} \ - -DCMAKE_EXE_LINKER_FLAGS="${LINK_FLAGS}" + -DCMAKE_EXE_LINKER_FLAGS="${LINK_FLAGS}" \ + -DDEBUG_GEOMETRY=ON make -j${JOBS} && make install popd From a54f93dfbaad4cd0ebe09bdc695e89726ac681c3 Mon Sep 17 00:00:00 2001 From: Freenerd Date: Thu, 4 Feb 2016 15:06:45 +0100 Subject: [PATCH 4/5] node-osrm package.json 4.9.0-traffic-data.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index bc9571c..e623350 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "url": "https://github.com/Project-OSRM/node-osrm", "homepage": "http://project-osrm.org", "author": "Dane Springmeyer ", - "version": "4.9.0", + "version": "4.9.0-traffic-data.1", "main": "./lib/osrm.js", "license": "BSD", "bugs": { From da50a1b7cf0e12e19fd63de312c3992370de5bbf Mon Sep 17 00:00:00 2001 From: Freenerd Date: Thu, 4 Feb 2016 15:12:02 +0100 Subject: [PATCH 5/5] Use osrm-backend#prune_distance_search --- .travis.yml | 2 +- bootstrap.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f89a0ab..0a2ecc4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -61,7 +61,7 @@ matrix: env: global: - JOBS: "3" - - OSRM_RELEASE: "v4.9.0" + - OSRM_RELEASE: "60a06e0ee79ab429bc1131beae13459d4bf00693" - secure: KitzGZjoDblX/3heajcvssGz0JnJ/k02dr2tu03ksUV+6MogC3RSQudqyKY57+f8VyZrcllN/UOlJ0Q/3iG38Oz8DljC+7RZxtkVmE1SFBoOezKCdhcvWM12G3uqPs7hhrRxuUgIh0C//YXEkulUrqa2H1Aj2xeen4E3FAqEoy0= - secure: WLGmxl6VTVWhXGm6X83GYNYzPNsvTD+9usJOKM5YBLAdG7cnOBQBNiCCUKc9OZMMZVUr3ec2/iigakH5Y8Yc+U6AlWKzlORyqWLuk4nFuoedu62x6ocQkTkuOc7mHiYhKd21xTGMYauaZRS6kugv4xkpGES2UjI2T8cjZ+LN2jU= diff --git a/bootstrap.sh b/bootstrap.sh index 882df7a..3e82fa6 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -10,7 +10,7 @@ CURRENT_DIR=$(pwd) # default to clang CXX=${CXX:-clang++} TARGET=${TARGET:-Release} -OSRM_RELEASE=${OSRM_RELEASE:-"v4.9.0"} +OSRM_RELEASE=${OSRM_RELEASE:-"60a06e0ee79ab429bc1131beae13459d4bf00693"} OSRM_REPO=${OSRM_REPO:-"https://github.com/Project-OSRM/osrm-backend.git"} OSRM_DIR=deps/osrm-backend-${TARGET}