From dfe984b678eecc933f47ac012212341214500c7d Mon Sep 17 00:00:00 2001
From: nsubiron <nsubiron@cvc.uab.es>
Date: Fri, 27 Oct 2017 11:05:07 +0200
Subject: [PATCH] Fix PythonClient missing protobuf generated file

---
 PythonClient/carla/protoc/__init__.py | 2 +-
 Setup.sh                              | 4 +++-
 Util/Protoc.bat                       | 9 ++++++---
 Util/Protoc.sh                        | 9 ++++++---
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/PythonClient/carla/protoc/__init__.py b/PythonClient/carla/protoc/__init__.py
index 597214d9d..9650c1101 100644
--- a/PythonClient/carla/protoc/__init__.py
+++ b/PythonClient/carla/protoc/__init__.py
@@ -1,2 +1,2 @@
-from .carla_pack_pb2 import  SceneDescription,EpisodeStart,EpisodeReady,Control,Measurements,RequestNewEpisode
+from .carla_server_pb2 import  SceneDescription,EpisodeStart,EpisodeReady,Control,Measurements,RequestNewEpisode
 
diff --git a/Setup.sh b/Setup.sh
index e248b0baf..13ebabb9c 100755
--- a/Setup.sh
+++ b/Setup.sh
@@ -167,7 +167,7 @@ popd >/dev/null
 popd >/dev/null
 
 # ==============================================================================
-# -- Copy CarlaSettings.ini ----------------------------------------------------
+# -- Other CARLA files ---------------------------------------------------------
 # ==============================================================================
 
 popd >/dev/null
@@ -178,6 +178,8 @@ if [[ ! -f $CARLA_SETTINGS_FILE ]]; then
   cp -v ./Docs/Example.CarlaSettings.ini $CARLA_SETTINGS_FILE
 fi
 
+./Util/Protoc.sh
+
 # ==============================================================================
 # -- ...and we are done --------------------------------------------------------
 # ==============================================================================
diff --git a/Util/Protoc.bat b/Util/Protoc.bat
index d19b909dc..96d7a574d 100644
--- a/Util/Protoc.bat
+++ b/Util/Protoc.bat
@@ -2,14 +2,16 @@
 
 set PROTOBUF_SRC_DIR=Proto
 set PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-set PROTOBUF_PY_OUT_DIR=TestingClient/carla
+set PROTOBUF_PY_OUT_DIR0=../PythonClient/carla/protoc
+set PROTOBUF_PY_OUT_DIR1=TestingClient/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_DIR%/carla_server_pb2.py
+  rm -f %PROTOBUF_PY_OUT_DIR0%/carla_server_pb2.py
+  rm -f %PROTOBUF_PY_OUT_DIR1%/carla_server_pb2.py
   goto end
 )
 
@@ -22,7 +24,8 @@ if exist %PROTOC% (
   %PROTOC% ^
       -I=%PROTOBUF_SRC_DIR% ^
       --cpp_out=%PROTOBUF_CPP_OUT_DIR% ^
-      --python_out=%PROTOBUF_PY_OUT_DIR% ^
+      --python_out=%PROTOBUF_PY_OUT_DIR0% ^
+      --python_out=%PROTOBUF_PY_OUT_DIR1% ^
     %PROTOBUF_SRC_DIR%/%PROTO_BASENAME%.proto
 
   echo done.
diff --git a/Util/Protoc.sh b/Util/Protoc.sh
index f71f4e853..4e717d423 100755
--- a/Util/Protoc.sh
+++ b/Util/Protoc.sh
@@ -7,13 +7,15 @@ pushd "$SCRIPT_DIR" >/dev/null
 
 PROTOBUF_SRC_DIR=Proto
 PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-PROTOBUF_PY_OUT_DIR=TestingClient/carla
+PROTOBUF_PY_OUT_DIR0=../PythonClient/carla/protoc
+PROTOBUF_PY_OUT_DIR1=TestingClient/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_DIR}/*_pb2.py
+  rm -f ${PROTOBUF_PY_OUT_DIR0}/*_pb2.py
+  rm -f ${PROTOBUF_PY_OUT_DIR1}/*_pb2.py
   exit 0
 fi
 
@@ -31,7 +33,8 @@ echo "Compiling ${PROTO_BASENAME}.proto..."
 ${PROTOC} \
     -I=${PROTOBUF_SRC_DIR} \
     --cpp_out=${PROTOBUF_CPP_OUT_DIR} \
-    --python_out=${PROTOBUF_PY_OUT_DIR} \
+    --python_out=${PROTOBUF_PY_OUT_DIR0} \
+    --python_out=${PROTOBUF_PY_OUT_DIR1} \
   ${PROTOBUF_SRC_DIR}/${PROTO_BASENAME}.proto
 
 popd >/dev/null