p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added RecastBuilder to linux package

This commit is contained in:
Marc Garcia Puig 2020-02-24 14:12:04 +01:00
parent 28396910ff
commit 9cdf00155e
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Util/BuildTools/Linux.mk
View File

@ -12,7 +12,7 @@ launch-only:
import: CarlaUE4Editor import: CarlaUE4Editor
@${CARLA_BUILD_TOOLS_FOLDER}/Import.py $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/Import.py $(ARGS)
package: CarlaUE4Editor PythonAPI package: CarlaUE4Editor PythonAPI build.utils
@${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS)
docs: docs:

1
Util/BuildTools/Package.sh
View File

@ -131,6 +131,7 @@ if ${DO_CARLA_RELEASE} ; then
copy_if_changed "./Docs/python_api.md" "${DESTINATION}/PythonAPI/python_api.md" copy_if_changed "./Docs/python_api.md" "${DESTINATION}/PythonAPI/python_api.md"
copy_if_changed "./Util/Docker/Release.Dockerfile" "${DESTINATION}/Dockerfile" copy_if_changed "./Util/Docker/Release.Dockerfile" "${DESTINATION}/Dockerfile"
copy_if_changed "./Util/ImportAssets.sh" "${DESTINATION}/ImportAssets.sh" copy_if_changed "./Util/ImportAssets.sh" "${DESTINATION}/ImportAssets.sh"
copy_if_changed "./Util/DockerUtils/dist/RecastBuilder" "${DESTINATION}/Tools/"
copy_if_changed "./PythonAPI/carla/dist/*.egg" "${DESTINATION}/PythonAPI/carla/dist/" copy_if_changed "./PythonAPI/carla/dist/*.egg" "${DESTINATION}/PythonAPI/carla/dist/"
copy_if_changed "./PythonAPI/carla/agents/" "${DESTINATION}/PythonAPI/carla/agents" copy_if_changed "./PythonAPI/carla/agents/" "${DESTINATION}/PythonAPI/carla/agents"

9
Util/BuildTools/Setup.sh
View File

@ -309,7 +309,8 @@ RECAST_BASENAME=recast-${RECAST_HASH}-${CXX_TAG}
RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include
RECAST_LIBPATH=${PWD}/${RECAST_BASENAME}-install/lib RECAST_LIBPATH=${PWD}/${RECAST_BASENAME}-install/lib
if [[ -d "${RECAST_BASENAME}-install" ]] ; then if [[ -d "${RECAST_BASENAME}-install" &&
-f "${RECAST_BASENAME}-install/bin/RecastBuilder" ]] ; then
log "${RECAST_BASENAME} already installed." log "${RECAST_BASENAME} already installed."
else else
rm -Rf \ rm -Rf \
@ -354,6 +355,12 @@ else
fi fi
# make sure the RecastBuilder is corrctly copied
RECAST_INSTALL_DIR="${CARLA_BUILD_FOLDER}/../Util/DockerUtils/dist"
if [[ ! -f "${RECAST_INSTALL_DIR}/RecastBuilder" ]]; then
cp "${RECAST_BASENAME}-install/bin/RecastBuilder" "${RECAST_INSTALL_DIR}/"
fi
unset RECAST_BASENAME unset RECAST_BASENAME
# ============================================================================== # ==============================================================================