Merges node-osrm into repo.

.gitignore

@@ -47,6 +47,9 @@ Thumbs.db
 /build/
 /example/build/
 /test/data/monaco*
+/test/data/ch
+/test/data/corech
+/test/data/mld
 /cmake/postinst
 
 # Eclipse related files #
@@ -86,7 +89,6 @@ stxxl.errlog
 /test/cache
 /test/speeds.csv
 /test/penalties.csv
-/test/data/monaco.*
 node_modules
 
 # Deprecated config file #
@@ -96,4 +98,7 @@ node_modules
 *.swp
 
 # local lua debugging file
-debug.lua
+debug.lua
+
+# node-osrm artifacts
+lib/binding

.npmignore

@@ -0,0 +1,10 @@
+*
+!README.md
+!CHANGELOG.md
+!CONTRIBUTING.MD
+!LICENCE.TXT
+!package.json
+!example
+!lib/*.js
+!profiles/*
+!profiles/lib/*

.travis.yml

@@ -58,7 +58,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON
+      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON ENABLE_SANITIZER=ON ENABLE_NODE_BINDINGS=ON
 
     # Release Builds
     - os: linux
@@ -67,7 +67,7 @@ matrix:
         apt:
           sources: ['ubuntu-toolchain-r-test']
           packages: ['libstdc++-5-dev']
-      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON
+      env: CLANG_VERSION='4.0.0' BUILD_TYPE='Release' ENABLE_MASON=ON RUN_CLANG_FORMAT=ON ENABLE_LTO=ON ENABLE_NODE_BINDINGS=ON
 
     - os: linux
       compiler: "gcc-6-release"
@@ -81,7 +81,7 @@ matrix:
       compiler: "gcc-6-release-i686"
       env: >
         TARGET_ARCH='i686' CCOMPILER='gcc-6' CXXCOMPILER='g++-6' BUILD_TYPE='Release'
-        CFLAGS='-m32 -msse2 -mfpmath=sse' CXXFLAGS='-m32 -msse2 -mfpmath=sse' CHECK_HEADERS=yes
+        CFLAGS='-m32 -msse2 -mfpmath=sse' CXXFLAGS='-m32 -msse2 -mfpmath=sse'
 
     - os: linux
       compiler: "gcc-4.9-release"
@@ -142,7 +142,7 @@ before_install:
   - echo "Using ${JOBS} jobs"
   - source ./scripts/install_node.sh 4
   - npm install -g "npm@>=3" # Upgrade to npm >v2 to reduce size of downloaded dependencies
-  - npm install
+  - npm install --ignore-scripts
     # Bootstrap cmake to be able to run mason
   - CMAKE_URL="https://mason-binaries.s3.amazonaws.com/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}.tar.gz"
   - CMAKE_DIR="mason_packages/${TRAVIS_OS_NAME}-x86_64/cmake/${CMAKE_VERSION}"
@@ -173,7 +173,7 @@ install:
   - export OSRM_BUILD_DIR="$(pwd)/build-osrm"
   - mkdir ${OSRM_BUILD_DIR} && pushd ${OSRM_BUILD_DIR}
   - export CC=${CCOMPILER} CXX=${CXXCOMPILER}
-  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_MASON=${ENABLE_MASON:-OFF} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} -DBUILD_TOOLS=ON -DENABLE_CCACHE=ON
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DENABLE_MASON=${ENABLE_MASON:-OFF} -DENABLE_ASSERTIONS=${ENABLE_ASSERTIONS:-OFF} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS:-OFF} -DENABLE_COVERAGE=${ENABLE_COVERAGE:-OFF} -DENABLE_SANITIZER=${ENABLE_SANITIZER:-OFF} -DBUILD_TOOLS=ON -DENABLE_CCACHE=ON -DENABLE_NODE_BINDINGS=${ENABLE_NODE_BINDINGS:-OFF}
   - echo "travis_fold:start:MAKE"
   - make --jobs=${JOBS}
   - make tests --jobs=${JOBS}
@@ -185,7 +185,6 @@ install:
     if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
       sudo ldconfig
     fi
-  - if [[ ${CHECK_HEADERS} == yes ]] ; then make check-headers ; fi
   - popd
   - mkdir example/build && pushd example/build
   - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE}
@@ -196,7 +195,7 @@ install:
 script:
   - if [[ $TARGET_ARCH == armhf ]] ; then echo "Skip tests for $TARGET_ARCH" && exit 0 ; fi
   - make -C test/data benchmark
-  - ./example/build/osrm-example test/data/monaco_CH.osrm
+  - ./example/build/osrm-example test/data/ch/monaco.osrm
   # All tests assume to be run from the build directory
   - pushd ${OSRM_BUILD_DIR}
   - ./unit_tests/library-tests
@@ -213,3 +212,11 @@ after_success:
     if [ -n "${ENABLE_COVERAGE}" ]; then
       bash <(curl -s https://codecov.io/bash)
     fi
+
+  - |
+    if [ -n "${ENABLE_NODE_BINDINGS}" ]; then
+      nvm install 4
+      nvm use 4
+      source ./scripts/travis/build.sh
+      ./scripts/travis/publish.sh
+    fi

CHANGELOG.md

@@ -1,5 +1,7 @@
 # 5.7.0
   - Changes from 5.6
+    - NodeJs Bindings
+      - Merged https://github.com/Project-OSRM/node-osrm into repository. Build via `cmake .. -DCMAKE_BUILD_TYPE=Release -DENABLE_NODE_BINDINGS=On -DENABLE_MASON=On`.
     - Internals
       - Shared memory notification via conditional variables on Linux or semaphore queue on OS X and Windows with a limit of 128 OSRM Engine instances
     - Files

CMakeLists.txt

@@ -24,6 +24,7 @@ option(ENABLE_SANITIZER "Use memory sanitizer for Debug build" OFF)
 option(ENABLE_LTO "Use LTO if available" OFF)
 option(ENABLE_FUZZING "Fuzz testing using LLVM's libFuzzer" OFF)
 option(ENABLE_GOLD_LINKER "Use GNU gold linker if available" ON)
+option(ENABLE_NODE_BINDINGS "Build NodeJs bindings" OFF)
 
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
@@ -800,6 +801,11 @@ add_custom_target(uninstall
 add_subdirectory(unit_tests)
 add_subdirectory(src/benchmarks)
 
+if (ENABLE_NODE_BINDINGS)
+  add_subdirectory(src/nodejs)
+endif()
+
+
 if (ENABLE_FUZZING)
   # Requires libosrm being built with sanitizers; make configurable and default to ubsan
   set(FUZZ_SANITIZER "undefined" CACHE STRING "Sanitizer to be used for Fuzz testing")
@@ -815,18 +821,21 @@ if (ENABLE_FUZZING)
 endif ()
 
 
-## add headers sanity check target that includes all headers independently
-set(check_headers_dir "${PROJECT_BINARY_DIR}/check-headers")
-file(GLOB_RECURSE headers_to_check
-  ${PROJECT_BINARY_DIR}/*.hpp
-  ${PROJECT_SOURCE_DIR}/include/*.hpp)
-foreach(header ${headers_to_check})
-  get_filename_component(filename ${header} NAME_WE)
-  set(filename "${check_headers_dir}/${filename}.cpp")
-  if (NOT EXISTS ${filename})
-    file(WRITE ${filename} "#include \"${header}\"\n")
-  endif()
-  list(APPEND sources ${filename})
-endforeach()
-add_library(check-headers STATIC EXCLUDE_FROM_ALL ${sources})
-set_target_properties(check-headers PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${check_headers_dir})
+# add headers sanity check target that includes all headers independently
+# make sure we have all deps for the nodejs sub project's includes (nan, node)
+if (ENABLE_NODE_BINDINGS)
+  set(check_headers_dir "${PROJECT_BINARY_DIR}/check-headers")
+  file(GLOB_RECURSE headers_to_check
+    ${PROJECT_BINARY_DIR}/*.hpp
+    ${PROJECT_SOURCE_DIR}/include/*.hpp)
+  foreach(header ${headers_to_check})
+    get_filename_component(filename ${header} NAME_WE)
+    set(filename "${check_headers_dir}/${filename}.cpp")
+    if (NOT EXISTS ${filename})
+      file(WRITE ${filename} "#include \"${header}\"\n")
+    endif()
+    list(APPEND sources ${filename})
+  endforeach()
+  add_library(check-headers STATIC EXCLUDE_FROM_ALL ${sources})
+  set_target_properties(check-headers PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${check_headers_dir})
+endif()

appveyor-build.bat

@@ -134,21 +134,22 @@ IF %ERRORLEVEL% NEQ 0 GOTO ERROR
 
 ECHO running library-tests.exe ...
 SET test_region=monaco
+SET test_region_ch=ch\monaco
+SET test_region_corech=corech\monaco
+SET test_region_mld=mld\monaco
 SET test_osm=%test_region%.osm.pbf
-SET test_osm_ch=%test_region%_CH.osm.pbf
-SET test_osm_corech=%test_region%_CoreCH.osm.pbf
-SET test_osm_mld=%test_region%_MLD.osm.pbf
 IF NOT EXIST %test_osm% powershell Invoke-WebRequest https://s3.amazonaws.com/mapbox/osrm/testing/monaco.osm.pbf -OutFile %test_osm%
-COPY %test_osm% %test_osm_ch%
-COPY %test_osm% %test_osm_corech%
-COPY %test_osm% %test_osm_mld%
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm_ch%
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm_corech%
-%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm_mld%
+%Configuration%\osrm-extract.exe -p ../profiles/car.lua %test_osm%
+MKDIR ch
+XCOPY %test_region%.osrm %test_region%.osrm.* ch\
+MKDIR corech
+XCOPY %test_region%.osrm %test_region%.osrm.* corech\
+MKDIR mld
+XCOPY %test_region%.osrm %test_region%.osrm.* mld\
 %Configuration%\osrm-contract.exe %test_region_ch%.osrm
 %Configuration%\osrm-contract.exe --core 0.8 %test_region_corech%.osrm
-%Configuration%\osrm-contract.exe %test_region_mld%.osrm
 %Configuration%\osrm-partition.exe %test_region_mld%.osrm
+%Configuration%\osrm-customize.exe %test_region_mld%.osrm
 unit_tests\%Configuration%\library-tests.exe
 
 IF NOT "%APPVEYOR_REPO_BRANCH%"=="master" GOTO DONE

appveyor.yml

@@ -23,8 +23,8 @@ build_script:
 before_test:
   - node --version
   - npm --version
-  - npm install
-  - npm link
+  - npm install --ignore-scripts
+  - npm link --ignore-scripts
   - SET PATH=%CD%\osrm-deps\libs\bin;%PATH%
   - SET OSRM_BUILD_DIR=build\%Configuration%
   - npm test