提交 24670037 编写于 作者: M Martin Jansa 提交者: Liu Jiaming

scripts: use APOLLO_BIN_PREFIX needed for runtime container

* binaries in runtime container aren't in /apollo/bazel-bin subdirectory
* change map/routing scripts to use this variable instead of hardcoding bazel-bin directory
Signed-off-by: NMartin Jansa <Martin.Jansa@gmail.com>
上级 99b9459a
......@@ -34,5 +34,5 @@ else
fi
echo "--map_dir=modules/map/data/${MAP}" >> modules/common/data/global_flagfile.txt
./scripts/generate_routing_topo_graph.sh
./bazel-bin/modules/map/tools/sim_map_generator --map_dir=modules/map/data/${MAP} --output_dir=modules/map/data/${MAP}
${APOLLO_BIN_PREFIX}/modules/map/tools/sim_map_generator --map_dir=modules/map/data/${MAP} --output_dir=modules/map/data/${MAP}
fi
......@@ -90,7 +90,7 @@ generate_map() {
python ${APOLLO_ROOT_DIR}/modules/tools/map_gen/map_gen_single_lane.py $xy_file $dir_name/base_map.txt 1.0
echo "--map_dir=${dir_name}" >> modules/common/data/global_flagfile.txt
bash ${APOLLO_ROOT_DIR}/scripts/generate_routing_topo_graph.sh
${APOLLO_ROOT_DIR}/bazel-bin/modules/map/tools/sim_map_generator --map_dir=${dir_name} --output_dir=${dir_name}
${APOLLO_BIN_PREFIX}/modules/map/tools/sim_map_generator --map_dir=${dir_name} --output_dir=${dir_name}
}
generate_map $g_xy_file $map_name $left_lane_num $right_lane_num
......@@ -21,6 +21,6 @@ DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${DIR}/apollo_base.sh"
# generate routing_map.bin in map directory.
/apollo/bazel-bin/modules/routing/topo_creator/topo_creator \
${APOLLO_BIN_PREFIX}/modules/routing/topo_creator/topo_creator \
--flagfile=modules/routing/conf/routing.conf \
-alsologtostderr $@
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册