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

Fix 'make hard-clean'

This commit is contained in:
nsubiron 2018-10-27 13:21:35 +02:00
parent 61ad44497f
commit 7e9656ede3
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Util/BuildTools/BuildCarlaUE4.sh
View File

@ -70,22 +70,6 @@ pushd "${CARLAUE4_ROOT_FOLDER}" >/dev/null
# -- Clean CarlaUE4 ------------------------------------------------------------
# ==============================================================================
if ${REMOVE_INTERMEDIATE} ; then
log "Cleaning intermediate files and folders."
UE4_INTERMEDIATE_FOLDERS="Binaries Build Intermediate DerivedDataCache"
rm -Rf ${UE4_INTERMEDIATE_FOLDERS}
pushd "${CARLAUE4_PLUGIN_ROOT_FOLDER}" >/dev/null
rm -Rf ${UE4_INTERMEDIATE_FOLDERS}
popd >/dev/null
fi
if ${HARD_CLEAN} ; then
if [ ! -f Makefile ]; then
@ -100,8 +84,20 @@ fi
if ${REMOVE_INTERMEDIATE} ; then
log "Cleaning intermediate files and folders."
UE4_INTERMEDIATE_FOLDERS="Binaries Build Intermediate DerivedDataCache"
rm -Rf ${UE4_INTERMEDIATE_FOLDERS}
pushd "${CARLAUE4_PLUGIN_ROOT_FOLDER}" >/dev/null
rm -Rf ${UE4_INTERMEDIATE_FOLDERS}
rm -f Makefile
popd >/dev/null
fi
# ==============================================================================

6
Util/BuildTools/Linux.mk
View File

@ -26,9 +26,11 @@ rebuild: setup
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --rebuild
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --rebuild
hard-clean: clean
@rm -Rf ${CARLA_BUILD_FOLDER}
hard-clean:
@${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.sh --hard-clean
@${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.sh --clean
@${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.sh --clean
@echo "To force recompiling dependencies run: rm -Rf ${CARLA_BUILD_FOLDER}"
check: LibCarla.server PythonAPI
@${CARLA_BUILD_TOOLS_FOLDER}/Check.sh --all $(ARGS)