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

Removing traces of old make TrafficManager

This commit is contained in:
Jacopo Bartiromo 2019-12-11 10:15:30 +01:00 committed by bernat
parent f794f939f6
commit 2362f71216
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Jenkinsfile vendored
View File

@ -21,7 +21,6 @@ pipeline {
steps { steps {
sh 'make LibCarla' sh 'make LibCarla'
sh 'make PythonAPI' sh 'make PythonAPI'
sh 'make TrafficManager'
sh 'make CarlaUE4Editor' sh 'make CarlaUE4Editor'
sh 'make examples' sh 'make examples'
} }

6
Util/BuildTools/Linux.mk
View File

@ -59,12 +59,6 @@ check.PythonAPI.2: PythonAPI.2
check.PythonAPI.3: PythonAPI.3 check.PythonAPI.3: PythonAPI.3
@${CARLA_BUILD_TOOLS_FOLDER}/Check.sh --python-api-3 $(ARGS) @${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 benchmark: LibCarla.release
@${CARLA_BUILD_TOOLS_FOLDER}/Check.sh --benchmark $(ARGS) @${CARLA_BUILD_TOOLS_FOLDER}/Check.sh --benchmark $(ARGS)
@cat profiler.csv @cat profiler.csv

1
Util/BuildTools/Vars.mk
View File

@ -25,4 +25,3 @@ CMAKE_CONFIG_FILE=${CARLA_BUILD_FOLDER}/CMakeLists.txt.in
LIBCARLA_TEST_CONTENT_FOLDER=${CARLA_BUILD_FOLDER}/test-content LIBCARLA_TEST_CONTENT_FOLDER=${CARLA_BUILD_FOLDER}/test-content
CARLA_EXAMPLES_FOLDER=${CURDIR}/Examples CARLA_EXAMPLES_FOLDER=${CURDIR}/Examples
TRAFFICMANAGER_FOLDER=${CURDIR}/TrafficManager