From 1849f33a466c7ce99f8dbedcb2d00827c41b6b0c Mon Sep 17 00:00:00 2001
From: nsubiron <nsubiron@cvc.uab.es>
Date: Sat, 18 Nov 2017 17:58:54 +0100
Subject: [PATCH] #32 Remove what is left of TestingClient

---
 Makefile                             | 2 +-
 Util/Protoc.bat                      | 9 +++------
 Util/Protoc.sh                       | 9 +++------
 Util/TestingClient/carla/__init__.py | 0
 4 files changed, 7 insertions(+), 13 deletions(-)
 delete mode 100644 Util/TestingClient/carla/__init__.py

diff --git a/Makefile b/Makefile
index b187fd454..41e50596c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 INSTALL_FOLDER=$(CURDIR)/Unreal/CarlaUE4/Plugins/Carla/CarlaServer
-PYTHON_CLIENT_FOLDER=$(CURDIR)/Util/TestingClient/test
+PYTHON_CLIENT_FOLDER=$(CURDIR)/PythonClient/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)"
diff --git a/Util/Protoc.bat b/Util/Protoc.bat
index 96d7a574d..551811f29 100644
--- a/Util/Protoc.bat
+++ b/Util/Protoc.bat
@@ -2,16 +2,14 @@
 
 set PROTOBUF_SRC_DIR=Proto
 set PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-set PROTOBUF_PY_OUT_DIR0=../PythonClient/carla/protoc
-set PROTOBUF_PY_OUT_DIR1=TestingClient/carla
+set PROTOBUF_PY_OUT_DIR=../PythonClient/carla
 set PROTO_BASENAME=carla_server
 
 if "%1" == "--clean" (
   rem Delete existing ones.
   rm -f %PROTOBUF_CPP_OUT_DIR%/carla_server.pb.h
   rm -f %PROTOBUF_CPP_OUT_DIR%/carla_server.pb.cc
-  rm -f %PROTOBUF_PY_OUT_DIR0%/carla_server_pb2.py
-  rm -f %PROTOBUF_PY_OUT_DIR1%/carla_server_pb2.py
+  rm -f %PROTOBUF_PY_OUT_DIR%/carla_server_pb2.py
   goto end
 )
 
@@ -24,8 +22,7 @@ if exist %PROTOC% (
   %PROTOC% ^
       -I=%PROTOBUF_SRC_DIR% ^
       --cpp_out=%PROTOBUF_CPP_OUT_DIR% ^
-      --python_out=%PROTOBUF_PY_OUT_DIR0% ^
-      --python_out=%PROTOBUF_PY_OUT_DIR1% ^
+      --python_out=%PROTOBUF_PY_OUT_DIR% ^
     %PROTOBUF_SRC_DIR%/%PROTO_BASENAME%.proto
 
   echo done.
diff --git a/Util/Protoc.sh b/Util/Protoc.sh
index 4e717d423..8dd7a5ad2 100755
--- a/Util/Protoc.sh
+++ b/Util/Protoc.sh
@@ -7,15 +7,13 @@ pushd "$SCRIPT_DIR" >/dev/null
 
 PROTOBUF_SRC_DIR=Proto
 PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-PROTOBUF_PY_OUT_DIR0=../PythonClient/carla/protoc
-PROTOBUF_PY_OUT_DIR1=TestingClient/carla
+PROTOBUF_PY_OUT_DIR=../PythonClient/carla
 PROTO_BASENAME=carla_server
 
 if [ "$1" == "--clean" ]; then
   # Delete existing ones.
   rm -f ${PROTOBUF_CPP_OUT_DIR}/*.pb.h ${PROTOBUF_CPP_OUT_DIR}/*.pb.cc
-  rm -f ${PROTOBUF_PY_OUT_DIR0}/*_pb2.py
-  rm -f ${PROTOBUF_PY_OUT_DIR1}/*_pb2.py
+  rm -f ${PROTOBUF_PY_OUT_DIR}/*_pb2.py
   exit 0
 fi
 
@@ -33,8 +31,7 @@ echo "Compiling ${PROTO_BASENAME}.proto..."
 ${PROTOC} \
     -I=${PROTOBUF_SRC_DIR} \
     --cpp_out=${PROTOBUF_CPP_OUT_DIR} \
-    --python_out=${PROTOBUF_PY_OUT_DIR0} \
-    --python_out=${PROTOBUF_PY_OUT_DIR1} \
+    --python_out=${PROTOBUF_PY_OUT_DIR} \
   ${PROTOBUF_SRC_DIR}/${PROTO_BASENAME}.proto
 
 popd >/dev/null
diff --git a/Util/TestingClient/carla/__init__.py b/Util/TestingClient/carla/__init__.py
deleted file mode 100644
index e69de29bb..000000000