Commit Graph

57 Commits

Author SHA1 Message Date
David Harvey
b1769c8472 Preserve the ERRORLEVEL from AutomationTool if we apply Turnkey variables.
#rnx
#jira none
#rb Martin.Sevigny
#preflight 62f50052185b21882a31c2bc

[CL 21335116 by David Harvey in ue5-main branch]
2022-08-11 09:31:16 -04:00
Ben Marsh
9cbeb052b3 Remove more spam from RunUAT.bat caused by Turnkey hooks not correctly handling paths with spaces.
#fyi Josh.Adams
#preflight none

[CL 19772022 by Ben Marsh in ue5-main branch]
2022-04-15 12:17:30 -04:00
Ben Marsh
85e4d6a6ea Fix spam running RunUAT.bat ("Environment variable PkgDefApplicationConfigFile not defined"), caused by command not correctly clearing environment variable.
#preflight none
#fyi Josh.Adams, Jonathan.Adamczewski

[CL 19771878 by Ben Marsh in ue5-main branch]
2022-04-15 12:11:22 -04:00
jonathan adamczewski
466777ec90 RunUAT.bat: Force-uppercase the drive letter, to ensure consistency between 'dotnet msbuild AutomationTool.csproj' and AutomationTool's compilation of script modules.
#jira none
#rnx
#preflight 624f695a11261bc7b2199cc3

[CL 19681172 by jonathan adamczewski in ue5-main branch]
2022-04-07 19:02:44 -04:00
Josh Adams
ee26770d72 - RunuAT now unsets some CVars that VisualStudio sets, which was causing UAT, when run from the editor that was run from VS, to have compile errors
#jria none
#rb jonathan.adamczewski
#preflight 624f24fd7255d8c16941c1a2

[CL 19673962 by Josh Adams in ue5-main branch]
2022-04-07 14:13:25 -04:00
Josh Adams
60251bf403 - RunUAT will now use bundled dotnet even with installed builds or -nocompileuat
#preflight 624ef5a13c2aff69c54b045d
#rb jonathan.adamczewski
#jira none

[CL 19669154 by Josh Adams in ue5-main branch]
2022-04-07 10:49:32 -04:00
aurel cordonnier
34f55d3a4a Merge from Release-Engine-Test @ 17946149 to UE5/Main
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17949667 by aurel cordonnier in ue5-main branch]
2021-10-27 15:14:40 -04:00
jonathan adamczewski
d0b43049bd RunUAT.bat: Always build AutomationTool with msbuild
Avoid problem where insufficient dependency checking would fail to rebuild AutomationTool (and dependent projects) when needed.

#jira none
#rb ryan.durand

[CL 17505693 by jonathan adamczewski in ue5-main branch]
2021-09-14 12:20:48 -04:00
jonathan adamczewski
76461c5f0b AutomationTool:
Rename -NoCompile as -NoCompileUAT, to work around problems with HordeAgent's use of the former.

#jira FORT-406905

[CL 17404240 by jonathan adamczewski in ue5-main branch]
2021-09-02 12:01:10 -04:00
jonathan adamczewski
3ca628dc59 AutomationTool:
Re-add -NoCompile to prevent compilation of AutomationTool or script modules

#jira none

[CL 17403069 by jonathan adamczewski in ue5-main branch]
2021-09-02 10:33:36 -04:00
jonathan adamczewski
8dc68a7f85 AutomationTool: Compile script modules within the application
Add a layer of caching to avoid running msbuild as much as possible.

#jira UE-109181
#rb ben.marsh

[CL 17102399 by jonathan adamczewski in ue5-main branch]
2021-08-09 10:39:09 -04:00
Leon Huang
26a324719a Fixed Turnkey not being able to find batch file to update
environment variables
#rb: Josh.Adams
#rnx

[CL 16996915 by Leon Huang in ue5-main branch]
2021-07-29 12:31:27 -04:00
ben marsh
60ac8174c8 Hardening validation of command line arguments for RunUAT.bat. Removes need to escape arguments with parentheses.
#rb none
[FYI] Andrew.Grant

#ROBOMERGE-SOURCE: CL 15668827 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v779-15635321)

[CL 15670582 by ben marsh in ue5-main branch]
2021-03-10 17:58:04 -04:00
Joakim Lindqvist
21c8c9e829 Switched over to dotnet msbuild from dotnet build (which just calls msbuild anyway).
This has less verbose output when a build is successful (nothing) but still outputs errors when something is wrong, which means we can remove the redirection of stdout so we actually can see compile errors from UBT when running GenerateProjects.

#rb none

[CL 14842937 by Joakim Lindqvist in ue5-main branch]
2020-12-03 07:08:20 -04:00
Joakim Lindqvist
1b63b507be Reduced verbosity on RunUAT back to expected levels and removed msbuild logo when invoking it to clean up the output a bit.
#rb none

[CL 14834497 by Joakim Lindqvist in ue5-main branch]
2020-12-02 08:10:50 -04:00
Joakim Lindqvist
8769374226 Build UBT before running UAT, this should not be needed but testing to see if this resolves our incremental horde build issue.
#rb none

[CL 14834471 by Joakim Lindqvist in ue5-main branch]
2020-12-02 07:54:31 -04:00
Joakim Lindqvist
145c291d1c Temporarily increased msbuild verbosity to debug issues when starting incremental builds in horde
[CL 14834417 by Joakim Lindqvist in ue5-main branch]
2020-12-02 07:30:58 -04:00
Joakim Lindqvist
e7039d3d35 UBT and UAT now use .NET Core instead of Framework and Mono. This means that we use the same runtime on Windows, Linux and Mac. Further benefits including newer C# features and a lot of intresting features for the future around AOT and Tiered compilation.
Some behavior changes:
Output paths - Both tools are now output to a subdirectory of Binaries/Dotnet, I believe most hardcoded paths have been fixed up but there may be tools that will fail because of this.
UAT Plugin Building - As .NET Core does not support AppDomain unloading, how we build the plugins has changed quite a bit, these are now built before UAT is started rather then by UAT itself. If you just start UAT via RunUAT.bat/sh this should just continue to work.

#rb ben.marsh

[CL 14834347 by Joakim Lindqvist in ue5-main branch]
2020-12-02 06:57:13 -04:00
Joakim Lindqvist
55025e031c Moved UAT plugin building to a seperate step controlled by AutomationTool.proj, this makes the process of building addins identical for installed builds and engine builds (but we still apply seperate logic to them).
Added CopyLocalLockFileAssemblies to some addins that added new dependencies (nuget packages) to make sure these gets added to the output folder.

UAT now have a dependency on WindowsForms (on Windows) to enable the WinForms usage in Gauntlet and Turnkey, but is still a console application so just making sure the right assemblies are referenced.

Fixed up shootergame csproj were I had accidentally removed EngineDir props which would have prevented it from working for installed builds as a foreign project.

#rb ben.marsh

[CL 14773885 by Joakim Lindqvist in ue5-main branch]
2020-11-18 08:46:54 -04:00
Joakim Lindqvist
4a3312078d -Compile for UAT is now handled by the batchfiles rather then inside UAT itself when running netcore version (as netcore does not support shadow copy so we can not update the assemblies we are running)
Also removed usages of automationtool launcher in netcore as we no longer need it.

#rb ben.marsh
#jira UE-102151

[CL 14663048 by Joakim Lindqvist in ue5-main branch]
2020-11-05 09:07:32 -04:00
Joakim Lindqvist
f90e40ffb0 UAT can now build as a netcore application.
Added a NET_CORE define to allow us to have changes side by side.
The AWS S3 changes are required due to us requiring to upgrade the S3 assembly version to get net core support (which made all methods async).
The ACL checks for files are not available in the system libraries of net core, as such the api is a bit different.

AutomationToolLauncher now just spawns a subprocess when used in netcore, as netcore does not support custom AppDomains and shadow copying. We will generally need to revisit this for netcore as this whole feature of building the source for UAT in UAT is not really possible.

To enable this set environment variable "UE_USE_DOTNET=1", note that with netcore all applications change their output path so this will likely break a bit of tooling when enabled.

#rb ben.marsh

[CL 14572339 by Joakim Lindqvist in ue5-main branch]
2020-10-26 06:08:59 -04:00
Josh Adams
d7a9c8edeb - Turnkey from Editor support (install Sdk, flash devices as needed, storing Sdk info in DDPI for display in Launch On menu, etc)
- There is a second Launch dropdown button for now, the original is still there for now (quick launch of previous device will not do Turnkey at this time)
- Various platform turnkey support updates

[CL 13653953 by Josh Adams in ue5-main branch]
2020-06-09 16:36:54 -04:00
Ben Marsh
99be00dcdb Merging latest from Private-Starship.
[CL 13192225 by Ben Marsh in ue5-main branch]
2020-05-05 18:50:52 -04:00
ryan durand
c11c085cf5 (Integrating from Dev-EngineMerge to Main)
Second batch of remaining Engine copyright updates.

#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: robert.manuszewski
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10871196 in //UE4/Main/...
#ROBOMERGE-BOT: CORE (Main -> Dev-Core) (v626-10872990)

[CL 10902202 by ryan durand in Dev-Core branch]
2020-01-08 03:04:20 -05:00
Martin Ridgers
87cc3f5749 Native MSBuild implementation of UnrealBuildTool's discovery of platform extensions.
#rb josh.adams, ben.marsh

(ushell-p4-cherrypick of 7973988 by Martin.Ridgers)

(ushell-p4-cherrypick of 8124246 by Martin.Ridgers)

[CL 10889764 by Martin Ridgers in Dev-Core branch]
2020-01-07 06:58:43 -05:00