From 27e3733020dbb9777447e1a5c0d8e5bc77536b08 Mon Sep 17 00:00:00 2001
From: bernat <bernatx@gmail.com>
Date: Thu, 19 Mar 2020 17:26:35 +0100
Subject: [PATCH] Upgrading windows scripts to 4.24

---
 Jenkinsfile                          | 4 ++--
 Util/BuildTools/Package.bat          | 2 +-
 Util/BuildTools/Windows.mk           | 4 ++--
 Util/Docker/Prerequisites.Dockerfile | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 9c20f1500..5d05687d9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline
                     agent { label "ubuntu && build && ${JOB_ID}" }
                     environment
                     {
-                        UE4_ROOT = '/home/jenkins/UnrealEngine_4.22'
+                        UE4_ROOT = '/home/jenkins/UnrealEngine_4.24'
                     }
                     stages
                     {
@@ -201,7 +201,7 @@ pipeline
                     agent { label "windows && build && ${JOB_ID}" }
                     environment
                     {
-                        UE4_ROOT = 'C:\\Program Files\\Epic Games\\UE_4.22'
+                        UE4_ROOT = 'C:\\Program Files\\Epic Games\\UE_4.24'
                     }
                     stages
                     {
diff --git a/Util/BuildTools/Package.bat b/Util/BuildTools/Package.bat
index af7cf7429..3d6357c7b 100644
--- a/Util/BuildTools/Package.bat
+++ b/Util/BuildTools/Package.bat
@@ -23,7 +23,7 @@ set DO_COPY_FILES=true
 set DO_TARBALL=true
 set DO_CLEAN=false
 
-set UE_VERSION=4.22
+set UE_VERSION=4.24
 set PACKAGES=Carla
 
 
diff --git a/Util/BuildTools/Windows.mk b/Util/BuildTools/Windows.mk
index aa2a5e0a1..3db8f4b29 100644
--- a/Util/BuildTools/Windows.mk
+++ b/Util/BuildTools/Windows.mk
@@ -26,14 +26,14 @@ launch-only:
 	@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch
 
 package: PythonAPI
-	@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.22 $(ARGS)
+	@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.24 $(ARGS)
 
 docs:
 	@doxygen
 	@echo "Documentation index at ./Doxygen/html/index.html"
 
 clean:
-	@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.22
+	@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.24
 	@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --clean
 
 	@"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --clean
diff --git a/Util/Docker/Prerequisites.Dockerfile b/Util/Docker/Prerequisites.Dockerfile
index 123a2b8d7..c5b5c8b62 100644
--- a/Util/Docker/Prerequisites.Dockerfile
+++ b/Util/Docker/Prerequisites.Dockerfile
@@ -1,4 +1,4 @@
-ARG UE4_V=4.22.2
+ARG UE4_V=4.24.3
 FROM adamrehn/ue4-source:${UE4_V}-opengl
 
 USER root