Commit Graph

2967 Commits

Author SHA1 Message Date
Josh Adams
9314095bc6 - Fixed linux crash in Turnkey in GDI mono
#rb brandon.schaefer
#jira UE-103152

[CL 14823307 by Josh Adams in ue5-main branch]
2020-11-30 16:42:33 -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
d5792b5c7c Disable ionic zip for build graph archives under net core, this was causing crashes on Mac builds in Horde when netcore was enabled.
Also slightly refactored how we start these parallel zip threads to avoid potential fallout due to variable captures.

#rb ben.marsh

[CL 14815610 by Joakim Lindqvist in ue5-main branch]
2020-11-26 06:28:23 -04:00
Marc Audy
a7f9391231 Merge UE5/Release-Engine-Staging @ 14811410 to UE5/Main
This represents UE4/Main @ 14768117

For ReleaseObjectVersion.h
#lockdown Marcus.Wassmer

[CL 14811440 by Marc Audy in ue5-main branch]
2020-11-24 18:42:39 -04:00
Jerome Delattre
4d865f6c0b Editgrate 14600524
Avoid redundant error report in the log by implementing a new property LogWarningsAndErrorsAfterSummary to ITestNode

#jira none
#rnx
#rb josh.engebretson, andrew.grant

[CL 14809680 by Jerome Delattre in ue5-main branch]
2020-11-24 11:10:24 -04:00
will damon
b053295696 Fix BundleId for iOS/tvOS packaged products.
#rb josh.adams
#jira none
#rnx

[CL 14807413 by will damon in ue5-main branch]
2020-11-23 15:25:32 -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
Josh Adams
1b005bb5aa - Missed a p4 command ExtraGlobalOptions
#jira UE-103147
#rb trivial

[CL 14763804 by Josh Adams in ue5-main branch]
2020-11-17 11:47:20 -04:00
Joakim Lindqvist
4aa9d3dddf Hololens fixes in UBT and UAT under netcore
This was using net framework specific apis, found corresponding apis under net core and switched to them.

#jira UE-103000

[CL 14763785 by Joakim Lindqvist in ue5-main branch]
2020-11-17 11:43:58 -04:00
Joakim Lindqvist
e3c4578ff0 Fixedup path to UAT for netcore projects
#rb none

[CL 14753033 by Joakim Lindqvist in ue5-main branch]
2020-11-16 09:47:02 -04:00
Jeff Farris
96f162e5dd UAT: fix SyncProject's handling of p4 commands and improvements to global p4 option handling in general (collab with Josh)
#rb Josh.Adams

[CL 14746262 by Jeff Farris in ue5-main branch]
2020-11-13 17:53:33 -04:00
brian white
19c266e185 [Turnkey] When using cached files in GoogleDriveCopyProvider, don't overwrite OutputPath with the last file path if a wildcard is used.
#rb Josh.Adams

[CL 14739772 by brian white in ue5-main branch]
2020-11-12 18:08:17 -04:00
brian white
5c53ff0809 [Turnkey] Ignore files in google drive that are trashed.
#rb Josh.Adams

[CL 14738473 by brian white in ue5-main branch]
2020-11-12 16:39:25 -04:00
Joakim Lindqvist
1485b99f67 Added encodings not present in net core by default to fix " 'IBM437' is not a supported encoding name"
#jira UE-102832

[CL 14732918 by Joakim Lindqvist in ue5-main branch]
2020-11-12 05:25:47 -04:00
brian white
d467a8f6d2 [Turnkey] Added null check when AllowedFlashDeviceTypes is unset (and null)
#rb Josh.Adams

[CL 14699848 by brian white in ue5-main branch]
2020-11-10 11:13:16 -04:00
Joakim Lindqvist
f236ff9ae1 Reworked Automation assembly loading in netcore again, using LoadFrom could cause multiple copies of the same assembly to be loaded (once by path and once by identity) causing very confusing errors as the same types were no longer considered the same (ptr difference).
We now always load by identity and hint to our assembly resolver were to expect to find assemblies that are not in our Engine.

#rb ben.marsh

[CL 14689002 by Joakim Lindqvist in ue5-main branch]
2020-11-09 10:57:52 -04:00
Joakim Lindqvist
7e61b4376d Fixed UAT Game specific UAT projects output location
Changed so that automation projects are loaded from their file path (LoadFrom rules) in net core as this is in practise what happened in net fw. Fixes issue were UAT projects not under Engine/Binaries couldnt be loaded.

#rb ben.marsh

[CL 14675418 by Joakim Lindqvist in ue5-main branch]
2020-11-06 06:32:39 -04:00
Josh Adams
61898204da - Worked around p4.exe having a bad interaction with Windows parsing the commandline with a * in it in a server path, by passing commands with a * in the parameters through in a file and the -x global option. (Windows would treat //UE4/Main as \\UE4\Main and take forever to timeout looking for a server named UE4)
#rb brandon.schaefer

[CL 14666987 by Josh Adams in ue5-main branch]
2020-11-05 14:23:24 -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
bd18d9e6e8 Disabled copy local on project references for netcore projects, fixes build warnigns caused by multiple copies trying to write to the same output files.
Also reduces footprint on disk and speedsup builds slightly.

Also took a pass over all projects to fixup their output paths as there were some inconsitencies from my port to netcore.
Lastly I disabled the resource folders for everything but english to reduce some of the noise in the output folder, this just impacts which languages you get code analysis.

#jira UE-102147
#rb none

[CL 14651855 by Joakim Lindqvist in ue5-main branch]
2020-11-04 09:48:49 -04:00
Joakim Lindqvist
4a4909d67d Simplified conditions for per platform checks in net core csprojs to make sure our condition parsing in UBT can handle it.
Should fix precompiled binary builds

#rb none

[CL 14648974 by Joakim Lindqvist in ue5-main branch]
2020-11-03 19:13:58 -04:00
Joakim Lindqvist
8665eecd4d UAT Create a executable on Mac under netcore to avoid needing to boostrap via dotnet run
#rb none

[CL 14641472 by Joakim Lindqvist in ue5-main branch]
2020-11-03 10:02:36 -04:00
Joakim Lindqvist
2f6056b62b UAT Net-Core now supports running on Linux as well.
Set UE_USE_DOTNET=1 to enable this.

#rb ben.marsh

[CL 14641009 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:30:22 -04:00
Joakim Lindqvist
b4d3e129ca Moved logic for finding automation tool projects into msbuild, making the generated .reference file from UBT redundant.
This makes it possible to build UAT with these references without having to run UBT first. Thus also fixes net core building of the project.

This adds about 5 seconds to the build time of automation tool but eliminates the need to run UBT and should avoid the need to implement -compile in UAT (in the end saving more then these 5 seconds)

This essentially does the same as UBT did before, create a .reference file on disk that can then be read by msbuild, it just does this in msbuild as well so we have fewer components involved.

#rb ben.marsh

[CL 14640899 by Joakim Lindqvist in ue5-main branch]
2020-11-03 08:00:07 -04:00