Move 'PythonClient' to 'Util/TestingClient'

2017-10-26 14:12:06 +02:00 · 2017-10-26 14:12:06 +02:00 · 0f8cc3c6b8
parent bcf0257b15
commit 0f8cc3c6b8
14 changed files with 3 additions and 3 deletions
--- a/2
+++ b/2
@ -1,5 +1,5 @@
 INSTALL_FOLDER=$(CURDIR)/Unreal/CarlaUE4/Plugins/Carla/CarlaServer
-PYTHON_CLIENT_FOLDER=$(CURDIR)/PythonClient/test
+PYTHON_CLIENT_FOLDER=$(CURDIR)/Util/TestingClient/test
 BASE_BUILD_FOLDER=$(CURDIR)/Util/Build/carlaserver-build
 MY_CMAKE_FOLDER=$(CURDIR)/Util/cmake
 MY_CMAKE_FLAGS=-B"$(BUILD_FOLDER)" -DCMAKE_INSTALL_PREFIX="$(INSTALL_FOLDER)"
--- a/Util/Protoc.bat
+++ b/Util/Protoc.bat
@ -2,7 +2,7 @@

 set PROTOBUF_SRC_DIR=Proto
 set PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-set PROTOBUF_PY_OUT_DIR=../PythonClient/carla
+set PROTOBUF_PY_OUT_DIR=TestingClient/carla
 set PROTO_BASENAME=carla_server

 if "%1" == "--clean" (
--- a/Util/Protoc.sh
+++ b/Util/Protoc.sh
@ -7,7 +7,7 @@ pushd "$SCRIPT_DIR" >/dev/null

 PROTOBUF_SRC_DIR=Proto
 PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-PROTOBUF_PY_OUT_DIR=../PythonClient/carla
+PROTOBUF_PY_OUT_DIR=TestingClient/carla
 PROTO_BASENAME=carla_server

 if [ "$1" == "--clean" ]; then
--- a/Util/TestingClient/init.py
+++ b/Util/TestingClient/init.py
--- a/Util/TestingClient/carla/init.py
+++ b/Util/TestingClient/carla/init.py
--- a/Util/TestingClient/carla/client.py
+++ b/Util/TestingClient/carla/client.py
--- a/Util/TestingClient/carla/console.py
+++ b/Util/TestingClient/carla/console.py
--- a/Util/TestingClient/carla/settings.py
+++ b/Util/TestingClient/carla/settings.py
--- a/Util/TestingClient/carla/tcp.py
+++ b/Util/TestingClient/carla/tcp.py
--- a/Util/TestingClient/carla/util.py
+++ b/Util/TestingClient/carla/util.py
--- a/Util/TestingClient/client_example.py
+++ b/Util/TestingClient/client_example.py
--- a/Util/TestingClient/test/test_client.py
+++ b/Util/TestingClient/test/test_client.py
--- a/Util/TestingClient/test/test_suite.py
+++ b/Util/TestingClient/test/test_suite.py
--- a/Util/TestingClient/test/unit_tests/Basic.py
+++ b/Util/TestingClient/test/unit_tests/Basic.py