Commit Graph

616 Commits

Author SHA1 Message Date
jonathan adamczewski
769279c0d9 Add plugin directories as search dirs for dynamic dependency resolution
When AutomationTool is built by RunUAT (or otherwise outside of UE5.sln), plugin dependencies are not copied to the AutomationTool.exe output dir. This change will ensure plugin output dirs will be searched for dependent assemblies.

#jira UE-103411

[CL 15855921 by jonathan adamczewski in ue5-main branch]
2021-03-29 17:55:13 -04:00
Andrew Grant
6b79000495 Fix various shortcomings with archiving builds via BuildCookRun
- Fixed issue where -archive did not work with -skippackage for several platforms.

- Modified behaviour of -archive -archivedirectory so <path> will only become <path>/<CookedPlatform> *IF* <path> does not already contain CookedPlatform or PlatformName

Both of these issues allow greater flexibility in build scripts.

Specifically the first allows -package and -archive to be performed in separate steps which is necessary for scripts that want to "do stuff" before archiving or have different per-platform logic before archiving.

The second gives scripts flexibility in selecing directory structures without adding unncessary components.

E.g. a script can now archive development builds to <BuildDir>/<Project>/PS4/Development/<Project>.pkg without it becoming <BuildDir>/<Project>/PS4/Development/PS4/<Project>.pkg

#jira nojira
#rb swarm
#review-15847235 @jeff.farris, @yuriy.odonnell @josh.adams @jeff.newquist

(Checked in prior to feedback due to being a prerequisite for some Frosty tests)

[CL 15848176 by Andrew Grant in ue5-main branch]
2021-03-28 22:50:39 -04:00
Luke Thatcher
6bd0f41a33 Add platform option to disable the Manifest_*_.txt files in staged builds
- Some platforms don't make use of these files, so their generation is unnecessary.

#jira UE-103275
#rb Ben.Marsh

[CL 15771665 by Luke Thatcher in ue5-main branch]
2021-03-22 20:02:49 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
Luke Thatcher
eaea736558 Remove unused GetTitleSettings() function from PlatformFeatures.
Add "-originalreleaseversion" command line switch in UAT. This is required by some platforms for patching / updates.

#rb Jeff.Newquist, Ryan.Hairyes
#jira UE-103275

[CL 15676775 by Luke Thatcher in ue5-main branch]
2021-03-11 11:17:55 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00
ben marsh
13e1ec7819 Add the legacy unzip functionality back into UAT. BPT currently stored in a zip that isn't compatible with NET ZipArchive class.
#jira UE-110075
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 15624643 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15624654 by ben marsh in ue5-main branch]
2021-03-05 11:36:37 -04:00
Ryan Durand
12cd2ae577 Make sure to create the output directory when zipping.
#rnx
#rb none
#jira none

[CL 15623912 by Ryan Durand in ue5-main branch]
2021-03-05 10:16:02 -04:00
ben marsh
a4d4c5c295 Fix for missing file permissions on Mac.
Switches the default zip utility to be the built in NET ZipArchive class. Adds additional support for storing permission bits by P/Invoking libSystem.dylib and adding the flags from stat64() to the ZipArchiveEntry. Also restores the permissions on unzip. One less dependency on Ionic.Zip. :)

#jira UE-109089
[FYI] Jonathan.Adamczewski
#rb none

#ROBOMERGE-SOURCE: CL 15620859 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v777-15581079)

[CL 15620862 by ben marsh in ue5-main branch]
2021-03-04 22:18:07 -04:00
ben marsh
9069e1d681 Fix UAT no longer respecting the -nocompileeditor argument.
#jira UE-108806
#rb none

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

[CL 15480575 by ben marsh in ue5-main branch]
2021-02-19 19:58:21 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
ben marsh
886b1311e0 Ignore abandoned mutex exception
#jira UE-103793
#rb none

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

[CL 15454181 by ben marsh in ue5-main branch]
2021-02-18 13:09:51 -04:00
axel riffard
0c5f041391 Fix DeviceInfo substring for iOS and tvOS
Fix deployment error when there is a space in the project path
#rb Jack.Porter
#fyi josh.adams, nuno.leiria
#jira UE-103878

[CL 15451286 by axel riffard in ue5-main branch]
2021-02-18 04:43:31 -04:00
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