Skip to content
This repository was archived by the owner on Jun 8, 2024. It is now read-only.

[do not merge] 4.9.1 debug geometry #140

Closed
wants to merge 11 commits into from
Closed

[do not merge] 4.9.1 debug geometry #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d90215d
Use v4.9.0 osrm-backend tag
TheMarex Dec 24, 2015
432b529
Merge pull request #130 from Project-OSRM/4.9.0
Dec 24, 2015
6dc0e36
[publish binary]
TheMarex Dec 24, 2015
6cb4c10
travis build with node version 4 and 5 on osx
ronhippler Dec 27, 2015
7139c7b
Merge pull request #131 from ronhippler/osx_node_v5
Dec 28, 2015
d9f9d48
[republish binary] Add v4/v5 for Mac OS X
TheMarex Dec 28, 2015
21fb0a8
v4.9.0 -> v4.9.1
TheMarex Jan 20, 2016
511d631
Update changelog
TheMarex Jan 20, 2016
d5ecc44
[publish binary]
TheMarex Jan 20, 2016
1c54e1e
Add DEBUG_GEOMETRY build flag
freenerd Feb 4, 2016
9ba4a55
[publish binary]
freenerd Feb 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@ matrix:
compiler: gcc
env: NODE_VERSION="0.10" TARGET=Debug NPM_FLAGS="--debug"
# OS X
- os: osx
compiler: clang
env: NODE_VERSION="5" TARGET=Release
- os: osx
compiler: clang
env: NODE_VERSION="4" TARGET=Release
- os: osx
compiler: clang
env: NODE_VERSION="0.12" TARGET=Release
Expand All @@ -61,7 +67,7 @@ matrix:
env:
global:
- JOBS: "3"
- OSRM_RELEASE: "develop"
- OSRM_RELEASE: "v4.9.1"
- secure: KitzGZjoDblX/3heajcvssGz0JnJ/k02dr2tu03ksUV+6MogC3RSQudqyKY57+f8VyZrcllN/UOlJ0Q/3iG38Oz8DljC+7RZxtkVmE1SFBoOezKCdhcvWM12G3uqPs7hhrRxuUgIh0C//YXEkulUrqa2H1Aj2xeen4E3FAqEoy0=
- secure: WLGmxl6VTVWhXGm6X83GYNYzPNsvTD+9usJOKM5YBLAdG7cnOBQBNiCCUKc9OZMMZVUr3ec2/iigakH5Y8Yc+U6AlWKzlORyqWLuk4nFuoedu62x6ocQkTkuOc7mHiYhKd21xTGMYauaZRS6kugv4xkpGES2UjI2T8cjZ+LN2jU=

Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
## node-osrm changelog

### 4.9.1
- Uses OSRM 4.9.1

### 4.9.0
- Uses OSRM 4.9.0
- `table` now supports `sources` and `destinations` options for asymmetric queries
Expand Down
5 changes: 3 additions & 2 deletions bootstrap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.1"}
OSRM_REPO=${OSRM_REPO:-"https://github.com/Project-OSRM/osrm-backend.git"}
OSRM_DIR=deps/osrm-backend-${TARGET}

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"url": "https://github.com/Project-OSRM/node-osrm",
"homepage": "http://project-osrm.org",
"author": "Dane Springmeyer <springmeyer>",
"version": "4.9.0-develop.0",
"version": "4.9.1",
"main": "./lib/osrm.js",
"license": "BSD",
"bugs": {
Expand Down