Commit Graph

644 Commits

Author SHA1 Message Date
brian white
5af388b31d [Turnkey] Add the ability to specify the target of RunExternalCommand requires administrative elevation. For use when the target is known to need elevation and may not return the correct error code to trigger automatic elevation.
#rb Josh.Adams

[CL 15166084 by brian white in ue5-main branch]
2021-01-22 15:26:45 -04:00
Ryan Durand
fbf3ab66bd Log out actual command used to fix unzipped file.
#rnx
#rb none
#jira none

[CL 15165437 by Ryan Durand in ue5-main branch]
2021-01-22 14:19:13 -04:00
Ryan Durand
ee8dc32b39 Improve logging for failures to chmod.
#rnx
#rb none
#jira UE-106905

[CL 15160015 by Ryan Durand in ue5-main branch]
2021-01-21 18:19:23 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
brian white
76666ef361 [Turnkey] Add the ability to print a message before installing and SDK. Add 'PauseForUser' action to facilitate displaying a message (without capturing input). It displays a prompt to the user and waits for acknowledgement.
#rb Josh.Adams
#rnx

[CL 15149541 by brian white in ue5-main branch]
2021-01-20 19:02:02 -04:00
Josh Adams
2752e9a381 - Started work on "Control" command that can be used to execute basic functionality that is currently in C++ (poweron, reboot, etc). Work in progress
- Some Turnkey utilities cleanup/refactor for getting platforms/devices from commandline, and generic method for getting options from commandline or user
- Allow multiple Turnkey executions on a single RunUAT commandline (RunUAT Turnkey -command=Control -operation=Reboot Turnkey -command=Control -operation=Disconnect)
#rb sebastian.nordgren

[CL 15144469 by Josh Adams in ue5-main branch]
2021-01-20 10:20:37 -04:00
Joakim Lindqvist
4477d7c295 Fixed issue were ubt was being spawned with the wrong path and via mono when creating a installed engine build
#jira UE-104425

[CL 15019201 by Joakim Lindqvist in ue5-main branch]
2021-01-08 09:42:20 -04:00
Ben Marsh
89691e43c6 Make LogIndentScope independent of the logger being used. Any loggers that want to use this state for additional formatting can do so with an enricher.
#rb none
#rnx

[CL 14967662 by Ben Marsh in ue5-main branch]
2020-12-28 17:45:35 -04:00
Marc Audy
7ffda0c0b2 Add missing copyright
[CL 14963133 by Marc Audy in ue5-main branch]
2020-12-22 13:50:38 -04:00
Ben Marsh
c8b5181f77 Include entire Engine/Binaries/DotNET/AutomationTool folder in UAT build products.
#rb none
#rnx

[CL 14962789 by Ben Marsh in ue5-main branch]
2020-12-22 09:58:39 -04:00
Ben Marsh
7d1c61be8c Remove reference to DotNETUtilities from AddUBTAndUATFilesToBuildProducts().
#rb none
#rnx

[CL 14962131 by Ben Marsh in ue5-main branch]
2020-12-21 23:35:04 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Ben Marsh
64651ad903 Remove references to FastJSON functionality in DotNETCommon. Use a duplicate copy in AutomationScripts called Json_DEPRECATED instead.
#rb none
#rnx

[CL 14962028 by Ben Marsh in ue5-main branch]
2020-12-21 22:05:50 -04:00
Ben Marsh
10515a2c1b Move HashCollection out of DotNETCommon.
#rb none
#rnx

[CL 14962007 by Ben Marsh in ue5-main branch]
2020-12-21 20:42:55 -04:00
Ben Marsh
69646e6e96 Convert fastJSON into a standalone thirdparty dependency. Allows converting the DotNETUtilities and BuildUtilities folders to NET Core 3.1.
#rb none
#rnx

[CL 14961920 by Ben Marsh in ue5-main branch]
2020-12-21 19:26:55 -04:00
Josh Adams
60c8673e12 - Updated Turnkey studio settings (split into separate .xml file so it can be read without trying to hunt down server files, added idea of what platforms are supported by the studio). Set Epic settings
- Return more info from Turnkey so callers can know if Turnkey can install full or autosdks (based on studio settings)
- Added idea of project settings having custom builds that can be run from Turnkey (and with a later checkin, Platforms menu in the editor)
#rb ben.marsh (just the code that chains Automation commands, as seen in ExecuteBuild)

[CL 14916239 by Josh Adams in ue5-main branch]
2020-12-14 14:46:33 -04:00
Marc Audy
ada7c144fa Merge //UE5/Release-Engine-Staging @14903491 to //UE5/Main
[CL 14906022 by Marc Audy in ue5-main branch]
2020-12-11 14:21:20 -04:00
Phillip Kavan
11c00323ea Remove exposed parts of the Blueprint nativization feature (deprecated), and decouple it from the editor/cooking phase.
#jira UE-103261
#rb Michael.Noland

[CL 14882147 by Phillip Kavan in ue5-main branch]
2020-12-08 16:28:03 -04:00
Joakim Lindqvist
be533b7d58 Brought back -nocompile and -compile options in UAT even if they are not used, to avoid erroring out when these gets forward by the batch file which will not remove already handled flags.
#jira UE-103979
#rb none

[CL 14842976 by Joakim Lindqvist in ue5-main branch]
2020-12-03 07:27:51 -04:00
Joakim Lindqvist
017048f505 Changed pdb format to not use portable pdbs (which is the default in net core) and instead back to our old pdb configuration.
This resolves a issue with PCBs were pdbcopy failed to run because it does not support portable pdbs.

#rb none

[CL 14837521 by Joakim Lindqvist in ue5-main branch]
2020-12-02 14:54:53 -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
Brandon Schaefer
b85212d00a Fix Linux for turnkey.
Assume p4 is in the $PATH somewhere

#jira none
#rb Josh.Adams

[CL 14831290 by Brandon Schaefer in ue5-main branch]
2020-12-01 17:42:21 -04:00
Josh Adams
0e77401f63 - Added support for a platform to use the Staging type and also filename in some circumstances the filename (could change to ONLY have the filename version of the function)
#rb andrew.grant

[CL 14822029 by Josh Adams in ue5-main branch]
2020-11-30 14:10:35 -04:00
Joakim Lindqvist
1b4f6b3ac9 Changed output directory for UAT projects under netcore, now outputting to a seperate directory for each addin. This avoids the risk of output stomping each other breaking incremental builds. Furthermore it makes it easier to understand who adds what dependency to the output.
Also cleaned up some output assemblies, preventing all transative references from being outputed (as we assume they build directly to the output directory instead). Unfortunatley the UBT references still cause tranastive dependencies to be copied as this is also a executable that needs to work outside of UAT as well, we should eventually move all UBT referenced code into BuildUtilities.

#rb none
#fyi ben.marsh

[CL 14775171 by Joakim Lindqvist in ue5-main branch]
2020-11-18 10:18:50 -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