Added support for UE version in build pipeline

microsoft · Nov 7, 2018 · cdcee67 · cdcee67
1 parent 0d14015
commit cdcee67
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Unreal/Environments/Blocks/package.bat b/Unreal/Environments/Blocks/package.bat
@@ -5,8 +5,14 @@ set ROOT_DIR=%~dp0
 
 set OutPath=%1
 set ToolPath=%2
+set UEVer=%3
+
+if "%UEVer%"=="" set "UEVer=4.18"
+
+set "_ToolPath=%PROGRAMFILES%\Epic Games\UE_%UEVer%\Engine\Build\BatchFiles"
+if "%ToolPath%"=="" set ToolPath=%_ToolPath%
+if "%ToolPath%"=="""" set ToolPath=%_ToolPath%
 
-if "%ToolPath%"=="" set "ToolPath=%PROGRAMFILES%\Epic Games\UE_4.18\Engine\Build\BatchFiles"
 IF NOT EXIST "%ToolPath%" (
 	echo "Unreal Engine build path %ToolPath% was not found"
 	goto :failed
@@ -48,7 +54,7 @@ goto :done
 
 :failed
 echo "Error occured while packaging"
-echo "Usage: package.bat <path\to\output> <path to Engine\Build\BatchFiles>"
+echo "Usage: package.bat <path\to\output> <path to Engine\Build\BatchFiles> <UE Version>"
 exit /b 1
 
 :done

diff --git a/build_all_ue_projects.bat b/build_all_ue_projects.bat
@@ -11,6 +11,8 @@ REM Output folder where the builds would be stored
 set OutputPath=%3
 REM folder containing AirSim repo
 set AirSimPath=%4
+REM path for UE toolset
+set ToolPath=%5
 
 REM set defaults if ars are not supplied
 if "%UnrealProjsPath%"=="" set "UnrealProjsPath=D:\vso\msresearch\Theseus"
@@ -29,7 +31,6 @@ if "%RebuildAirSim%"=="true" (
 
 IF NOT EXIST "%OutputPath%" mkdir "%OutputPath%"
 
-REM call:doOneProject "Warehouse"
 call:doOneProject "TalkingHeads"
 call:doOneProject "ZhangJiaJie"
 call:doOneProject "AirSimEnvNH"
@@ -40,10 +41,13 @@ call:doOneProject "Forest"
 call:doOneProject "Coastline"
 call:doOneProject "TrapCamera"
 call:doOneProject "CityEnviron"
+call:doOneProject "Warehouse"
+call:doOneProject "Plains" "" 4.19
 
 goto :done
 
 :doOneProject
+REM args: OutputPath ToolPath UEVer
 if "%~2"=="" (
  cd /D "%UnrealProjsPath%\%~1"
 ) else (
@@ -56,7 +60,7 @@ robocopy "%AirSimPath%\Unreal\Environments\Blocks" . *.bat  /njh /njs /ndl /np
 CALL update_from_git.bat "%AirSimPath%"
 if ERRORLEVEL 1 goto :failed
 
-CALL package.bat "%OutputPath%"
+CALL package.bat "%OutputPath%" "%ToolPath%" %~3
 if ERRORLEVEL 1 goto :failed
 
 goto :done