[generator] KEEP_INTDIR flag to not remove tmp files (default=1)

This commit is contained in:
Ilya Zverev 2015-06-11 14:14:49 +03:00 committed by Alex Zolotarev
parent 79aa90b0f7
commit bcda845f04
2 changed files with 6 additions and 3 deletions

View file

@ -119,6 +119,7 @@ MERGE_COASTS_DELAY_SEC=2400
NODE_STORAGE=${NODE_STORAGE:-${NS:-mem}}
ASYNC_PBF=${ASYNC_PBF-}
NUM_PROCESSES=${NUM_PROCESSES:-$(expr $(nproc || echo 8) - 1)}
KEEP_INTDIR=${KEEP_INTDIR-1}
STATUS_FILE="$INTDIR/status"
OSRM_FLAG="${OSRM_FLAG:-$INTDIR/osrm_done}"
@ -162,6 +163,7 @@ export OSRM_FLAG
export PLANET
export OSMCTOOLS
export NUM_PROCESSES
export KEEP_INTDIR
export REGIONS= # Routing script might expect something in this variable
export BORDERS_PATH="$TARGET/borders" # Also for the routing script
@ -244,7 +246,7 @@ if [ "$MODE" == "coast" ]; then
done
# make a working copy of generated coastlines file
[ -n "$OPT_WORLD" ] && cp "$INTCOASTSDIR/WorldCoasts.mwm.tmp" "$INTDIR"
rm -r "$INTCOASTSDIR"
[ -n "$KEEP_INTDIR" ] && rm -r "$INTCOASTSDIR"
MODE=inter
fi
@ -362,6 +364,6 @@ if [ "$MODE" == "resources" ]; then
fi
# Cleaning up temporary directories
# rm -r "$INTDIR"
rm "$STATUS_FILE" "$OSRM_FLAG"
[ -n "$KEEP_INTDIR" ] && rm -r "$INTDIR"
log "STATUS" "Done"

View file

@ -28,6 +28,7 @@ TARGET="${TARGET:-$OMIM_PATH/data}"
INTDIR="${INTDIR:-$TARGET/intermediate_data}"
mkdir -p "$INTDIR"
NUM_PROCESSES=${NUM_PROCESSES:-8}
KEEP_INTDIR=${KEEP_INTDIR-}
OSRM_FLAG="${OSRM_FLAG:-$INTDIR/osrm_done}"
echo "[$(date +%Y/%m/%d\ %H:%M:%S)] $0 $1"
@ -81,7 +82,7 @@ elif [ "$1" == "prepare" ]; then
"$OSRM_BUILD_PATH/osrm-prepare" --config "$PREPARE_CFG" --profile "$PROFILE" "$OSRM_FILE"
"$OSRM_BUILD_PATH/osrm-mapsme" -i "$OSRM_FILE"
if [ -s "$OSRM_FILE" ]; then
rm -f "$PBF"
[ -n "$KEEP_INTDIR" ] && rm -f "$PBF"
ONE_OSRM_READY=1
else
echo "Failed to create $OSRM_FILE"