From 7374804542ce1796ddfc022ef91603f526d2cf68 Mon Sep 17 00:00:00 2001
From: bernat <bernatx@gmail.com>
Date: Tue, 22 Dec 2020 11:08:27 +0100
Subject: [PATCH] Adding plugins to the package

---
 Jenkinsfile                 | 6 +++++-
 Util/BuildTools/Package.bat | 1 +
 Util/BuildTools/Package.sh  | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1f607559d..154d43201 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -54,6 +54,7 @@ pipeline
                                 sh 'make LibCarla'
                                 sh 'make PythonAPI ARGS="--python-version=3.7,2"'
                                 sh 'make CarlaUE4Editor ARGS="--carsim"'
+                                sh 'make plugins'
                                 sh 'make examples'
                             }
                             post
@@ -257,6 +258,10 @@ pipeline
                                     call ../setEnv64.bat
                                     make CarlaUE4Editor ARGS="--carsim"
                                 """
+                                bat """
+                                    call ../setEnv64.bat
+                                    make plugins
+                                """
                             }
                             post
                             {
@@ -287,7 +292,6 @@ pipeline
                                 """
                                 bat """
                                     call ../setEnv64.bat
-                                    make package ARGS="--packages=AdditionalMaps --target-archive=AdditionalMaps --clean-intermediate"
                                     make package ARGS="--packages=AdditionalMaps,Town06_Opt,Town07_Opt,Town10HD_Opt --target-archive=AdditionalMaps --clean-intermediate"
                                 """
                             }
diff --git a/Util/BuildTools/Package.bat b/Util/BuildTools/Package.bat
index 7656ff09c..5d34f3682 100644
--- a/Util/BuildTools/Package.bat
+++ b/Util/BuildTools/Package.bat
@@ -175,6 +175,7 @@ if %DO_COPY_FILES%==true (
     echo f | xcopy /y "!XCOPY_FROM!PythonAPI\carla\dist\*.egg"                      "!XCOPY_TO!PythonAPI\carla\dist\"
     echo f | xcopy /y /s "!XCOPY_FROM!PythonAPI\carla\data\*"                          "!XCOPY_TO!PythonAPI\carla\data\"
     echo d | xcopy /y /s "!XCOPY_FROM!Co-Simulation"                                "!XCOPY_TO!Co-Simulation"
+    echo d | xcopy /y /s "!XCOPY_FROM!Plugins"                                      "!XCOPY_TO!Plugins"
     echo d | xcopy /y /s "!XCOPY_FROM!PythonAPI\carla\agents"                       "!XCOPY_TO!PythonAPI\carla\agents"
     echo f | xcopy /y "!XCOPY_FROM!PythonAPI\carla\scene_layout.py"                 "!XCOPY_TO!PythonAPI\carla\"
     echo f | xcopy /y "!XCOPY_FROM!PythonAPI\carla\requirements.txt"                "!XCOPY_TO!PythonAPI\carla\"
diff --git a/Util/BuildTools/Package.sh b/Util/BuildTools/Package.sh
index d899f74d1..b25b22225 100755
--- a/Util/BuildTools/Package.sh
+++ b/Util/BuildTools/Package.sh
@@ -163,6 +163,8 @@ if ${DO_CARLA_RELEASE} ; then
 
   copy_if_changed "./Co-Simulation/" "${DESTINATION}/Co-Simulation/"
 
+  copy_if_changed "./Plugins/" "${DESTINATION}/Plugins/"
+
   copy_if_changed "./Unreal/CarlaUE4/Content/Carla/HDMaps/*.pcd" "${DESTINATION}/HDMaps/"
   copy_if_changed "./Unreal/CarlaUE4/Content/Carla/HDMaps/Readme.md" "${DESTINATION}/HDMaps/README"