Merge branch 'develop'

.gitignore

@@ -36,8 +36,8 @@ Thumbs.db
 # build related files #
 #######################
 /build/
-/Util/finger_print.cpp
-/Util/git_sha.cpp
+/util/fingerprint_impl.hpp
+/util/git_sha.cpp
 /cmake/postinst
 
 # Eclipse related files #
@@ -53,25 +53,8 @@ Thumbs.db
 stxxl.log
 stxxl.errlog
 
-# compiled protobuffers #
-#########################
-/DataStructures/pbf-proto/*.pb.h
-/DataStructures/pbf-proto/*.pb.cc
-
-# External Libs #
-#################
-/lib/
-/win/lib
-
-# Visual Studio Temp + build Files #
+# Compiled Binary Files #
 ####################################
-/win/*.user
-/win/*.ncb
-/win/*.suo
-/win/Debug/
-/win/Release/
-/win/bin/
-/win/bin-debug/
 /osrm-extract
 /osrm-io-benchmark
 /osrm-components

.travis.yml

@@ -10,6 +10,7 @@ install:
  - sudo apt-get -q install protobuf-compiler libprotoc-dev libprotobuf7 libprotobuf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev
  - sudo apt-get -q install g++-4.8
  - sudo apt-get install libboost1.54-all-dev
+ - sudo apt-get install libgdal-dev
  # luabind
  - curl https://gist.githubusercontent.com/DennisOSRM/f2eb7b948e6fe1ae319e/raw/install-luabind.sh | sudo bash
  # osmosis
@@ -24,10 +25,11 @@ before_script:
  - bundle install
  - mkdir build
  - cd build
- - cmake .. $CMAKEOPTIONS
+ - cmake .. $CMAKEOPTIONS -DBUILD_TOOLS=1
 script:
- - make -j 2
- - make -j 2 tests
+ - make
+ - make tests
+ - make benchmarks
  - ./datastructure-tests
  - cd ..
  - cucumber -p verify
@@ -44,7 +46,9 @@ cache:
 env:
  - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5000 OSRM_TIMEOUT=60
  - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Debug -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5010 OSRM_TIMEOUT=60
+ - CMAKEOPTIONS="-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DCMAKE_CXX_COMPILER=g++-4.8" OSRM_PORT=5020 OSRM_TIMEOUT=60
 notifications:
+ slack: mapbox:4A6euphDwfxAQnhLurXbu6A1
  irc:
   channels:
     - irc.oftc.net#osrm

Gemfile

@@ -4,4 +4,4 @@ gem "cucumber"
 gem "rake"
 gem "osmlib-base"
 gem "sys-proctable"
-gem "rspec-expectations"
+gem "rspec-expectations"

LICENCE.TXT

@@ -1,4 +1,4 @@
-Copyright (c) 2013, Project OSRM, Dennis Luxen, others
+Copyright (c) 2015, Project OSRM contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,