diff --git a/Util/BuildTools/Linux.mk b/Util/BuildTools/Linux.mk index 7d68395f1..ef2811856 100644 --- a/Util/BuildTools/Linux.mk +++ b/Util/BuildTools/Linux.mk @@ -12,7 +12,7 @@ launch-only: import: CarlaUE4Editor @${CARLA_BUILD_TOOLS_FOLDER}/Import.py $(ARGS) -package: CarlaUE4Editor PythonAPI +package: CarlaUE4Editor PythonAPI build.utils @${CARLA_BUILD_TOOLS_FOLDER}/Package.sh $(ARGS) docs: diff --git a/Util/BuildTools/Package.sh b/Util/BuildTools/Package.sh index e48c29bcf..b8e4865ce 100755 --- a/Util/BuildTools/Package.sh +++ b/Util/BuildTools/Package.sh @@ -131,6 +131,7 @@ if ${DO_CARLA_RELEASE} ; then 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/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/agents/" "${DESTINATION}/PythonAPI/carla/agents" diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh index 237cc6894..e3bb17a1e 100755 --- a/Util/BuildTools/Setup.sh +++ b/Util/BuildTools/Setup.sh @@ -309,7 +309,8 @@ RECAST_BASENAME=recast-${RECAST_HASH}-${CXX_TAG} RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include 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." else rm -Rf \ @@ -354,6 +355,12 @@ else 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 # ==============================================================================