From 2362f7121638e99303bccabe28774beace799c01 Mon Sep 17 00:00:00 2001 From: Jacopo Bartiromo Date: Wed, 11 Dec 2019 10:15:30 +0100 Subject: [PATCH] Removing traces of old make TrafficManager --- Jenkinsfile | 1 - Util/BuildTools/Linux.mk | 6 ------ Util/BuildTools/Vars.mk | 1 - 3 files changed, 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 05294f12a..7d8856c26 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,6 @@ pipeline { steps { sh 'make LibCarla' sh 'make PythonAPI' - sh 'make TrafficManager' sh 'make CarlaUE4Editor' sh 'make examples' } diff --git a/Util/BuildTools/Linux.mk b/Util/BuildTools/Linux.mk index e40a5d4b9..d698789ee 100644 --- a/Util/BuildTools/Linux.mk +++ b/Util/BuildTools/Linux.mk @@ -59,12 +59,6 @@ check.PythonAPI.2: PythonAPI.2 check.PythonAPI.3: PythonAPI.3 @${CARLA_BUILD_TOOLS_FOLDER}/Check.sh --python-api-3 $(ARGS) -.PHONY: TrafficManager -TrafficManager: LibCarla.client.release - @rm -rf TrafficManager/build - @mkdir TrafficManager/build - @cd TrafficManager/build && cmake -DLIBCARLA_LOCATION=${LIBCARLA_ROOT_FOLDER} -DCARLA_LOCATION=${CARLA_ROOT_FOLDER} .. && make -j - benchmark: LibCarla.release @${CARLA_BUILD_TOOLS_FOLDER}/Check.sh --benchmark $(ARGS) @cat profiler.csv diff --git a/Util/BuildTools/Vars.mk b/Util/BuildTools/Vars.mk index c6278f05d..ab107a55d 100644 --- a/Util/BuildTools/Vars.mk +++ b/Util/BuildTools/Vars.mk @@ -25,4 +25,3 @@ CMAKE_CONFIG_FILE=${CARLA_BUILD_FOLDER}/CMakeLists.txt.in LIBCARLA_TEST_CONTENT_FOLDER=${CARLA_BUILD_FOLDER}/test-content CARLA_EXAMPLES_FOLDER=${CURDIR}/Examples -TRAFFICMANAGER_FOLDER=${CURDIR}/TrafficManager