diff --git a/tools/unix/generate_mwm.sh b/tools/unix/generate_mwm.sh index 836bfbdf90..6dc4191793 100755 --- a/tools/unix/generate_mwm.sh +++ b/tools/unix/generate_mwm.sh @@ -9,7 +9,7 @@ # - Data path with classificators etc. should be present in $OMIM_PATH/data # Inside it should be at least: categories.txt, classificator.txt, types.txt, drules_proto.bin # - Compiled generator_tool somewhere in omim/../build/out/whatever, or supply BUILD_PATH -# - For routing, compiled OSRM binaries in omim/3party/osrm/osrm-backend/build, or supply OSRM_BUILD_PATH +# - For routing, compiled OSRM binaries in omim/../osrm-backend-release, or supply OSRM_BUILD_PATH # - Target path for mwm is the same as o5m path, or supply TARGET # Cross-borders routing index is not created, since we don't assume @@ -113,7 +113,7 @@ fi if [ $# -gt 1 ]; then # Create .mwm.routing file OSRM_PATH="${OSRM_PATH:-$OMIM_PATH/3party/osrm/osrm-backend}" - OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OSRM_PATH/build}" + OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OMIM_PATH/../osrm-backend-release}" [ ! -x "$OSRM_BUILD_PATH/osrm-extract" -a -x "$SCRIPT_PATH/bin/osrm-extract" ] && OSRM_BUILD_PATH="$SCRIPT_PATH/bin" [ ! -x "$OSRM_BUILD_PATH/osrm-extract" ] && fail "Please compile OSRM binaries to $OSRM_BUILD_PATH" [ ! -r "$TARGET/$BASE_NAME.mwm" ] && fail "Please build mwm file beforehand" diff --git a/tools/unix/generate_planet_routing.sh b/tools/unix/generate_planet_routing.sh index 1eaadb6702..0d15fb2cd1 100755 --- a/tools/unix/generate_planet_routing.sh +++ b/tools/unix/generate_planet_routing.sh @@ -60,7 +60,7 @@ elif [ "$1" == "prepare" ]; then rm -f "$OSRM_FLAG" [ -z "$(ls "$INTDIR"/*.pbf)" ] && fail "Please build PBF files first" OSRM_PATH="${OSRM_PATH:-$OMIM_PATH/3party/osrm/osrm-backend}" - OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OSRM_PATH/build}" + OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OMIM_PATH/../osrm-backend-release}" [ ! -x "$OSRM_BUILD_PATH/osrm-extract" ] && fail "Please compile OSRM binaries to $OSRM_BUILD_PATH" OSRM_THREADS=${OSRM_THREADS:-15} @@ -132,7 +132,7 @@ elif [ "$1" == "online" ]; then "$OSMCTOOLS/osmconvert" "$PLANET" --hash-memory=2000 --out-pbf -o="$PBF" OSRM_PATH="${OSRM_PATH:-$OMIM_PATH/3party/osrm/osrm-backend}" - OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OSRM_PATH/build}" + OSRM_BUILD_PATH="${OSRM_BUILD_PATH:-$OMIM_PATH/../osrm-backend-release}" [ ! -x "$OSRM_BUILD_PATH/osrm-extract" ] && fail "Please compile OSRM binaries to $OSRM_BUILD_PATH" OSRM_THREADS=${OSRM_THREADS:-15} diff --git a/tools/unix/osrm_online_server_generator.sh b/tools/unix/osrm_online_server_generator.sh index c52b6a043f..a419d1188a 100755 --- a/tools/unix/osrm_online_server_generator.sh +++ b/tools/unix/osrm_online_server_generator.sh @@ -7,7 +7,7 @@ export STXXLCFG=~/.stxxl PLANET_FILE="$HOME/planet/planet-latest.o5m" OSRM_PATH=~/omim/3party/osrm/osrm-backend PROFILE="$OSRM_PATH/profiles/car.lua" -BIN_PATH="$OSRM_PATH/build" +BIN_PATH=~/osrm-backend-release EXTRACT="$BIN_PATH/osrm-extract" EXTRACT_CFG="$OSRM_PATH/../extractor.ini" PREPARE="$BIN_PATH/osrm-prepare"