Commit Graph

603 Commits

Author SHA1 Message Date
josh adams
13682c6497 - Renamed FileRetriever class to ITurnkeyContext
- Enhanced Turnkey error reporting to the editor (TurnkeyContext now has Log and ReportError)
- Improved the SDK display in the editor
- Various bug fixes
- Renamed GetAutoSDKDirectoryForMasterVersion() to GetAutoSDKDirectoryForMainVersion()
#rb brian.white

#ROBOMERGE-SOURCE: CL 15357339 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15360341 by josh adams in ue5-main branch]
2021-02-08 17:07:27 -04:00
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Josh Adams
a3869f12d5 - Android Turnkey support for prerequisites (making sure Android Studio has been installed and run once sdk directory creation)
- Updated versioning to pass to SetupAndroid scripts instead of the script hardcoding it
- Added idea of code-based "FileSource" objects that can be used to install an SDK without needing to copy an installer, it's all in the SDKInstall command
- Prereqs are not working yet for Mac/Linux (logic will need to be ported on those platforms to get it right)
#rb chris.babcock

[CL 15298669 by Josh Adams in ue5-main branch]
2021-02-03 14:18:15 -04:00
Josh Adams
b0e4357576 - UBT Code changes to remove 32-bit Windows support (C++ code for 32-bit still exists)
#rb marc.audy (concept, not each file)

[CL 15265424 by Josh Adams in ue5-main branch]
2021-01-31 15:09:58 -04:00
Josh Adams
fe52551c2a - Removed deprecated XboxOne platform
- Removed PostSplashScreen plugin that was only whitelisted for XboxOne (if we just remove the whitelist, it would build for all platforms, which we don't want)
#rb Marc.Audy (concept, not each file)
#fyi david.harvey

[CL 15265407 by Josh Adams in ue5-main branch]
2021-01-31 14:34:28 -04:00
Ben Marsh
ab5822fd36 Fix non-deterministic use of GetHashCode() in ProjectUtils.cs.
#rb none
#rnx

[CL 15214570 by Ben Marsh in ue5-main branch]
2021-01-26 22:40:11 -04:00
Ryan Durand
6998aa2c2b When shelling to chmod fails, try invoking chmod directly.
#rnx
#rb none
#jira UE-106905

[CL 15209555 by Ryan Durand in ue5-main branch]
2021-01-26 14:04:00 -04:00
Josh Adams
f1b16e7ee5 Turnkey for device management and SDK apis for platforms coming online soon:
- Retooled some turnkey device management (DeviceInfo now knows its platform, so we don't need to associate a platform externally)
- Changed Control command to use Gauntlet devices to do the PowerOn etc type stuff since there is already support for device control in Gauntlet. Now Turnkey is more of an interactive/scriptable frontend to Gauntlet
- Allow for a platform to do a manual Sdk installation, which doesn't depend on finding a Turnkey file source
- Allow for a platform SDK to return custom versions. This is solely used by platform-specific code
#rb brandon.schaefer

[CL 15201829 by Josh Adams in ue5-main branch]
2021-01-26 05:30:58 -04:00
Joakim Lindqvist
6aa4eb29a4 Fixed issue with global mutexes in UBT not being deterministic after net core transition, as GetHashCode for strings is not deterministic in net core (was never a guarantee to be).
Also fixed similar case in UAT.

#jira UE-105044
#rb ben.marsh

[CL 15177623 by Joakim Lindqvist in ue5-main branch]
2021-01-25 10:08:22 -04:00
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