Commit Graph

3109 Commits

Author SHA1 Message Date
jonathan adamczewski
17602ab008 Support two msbuilds, for NET Framework and Core
This is a preparatory change ahead of adding the ability to build NET Core projects to the CsCompile task, and subsequent conversion of NET Framework projects to NET Core. On its own, it should have no substantive visible effect.

#jira none

[CL 16008195 by jonathan adamczewski in ue5-main branch]
2021-04-14 13:24:20 -04:00
jonathan adamczewski
3c6da71d4a AutomationUtils/ScriptCompiler.cs:
Removed no longer used script compilation code

#rb trivial
#jira none

[CL 16006581 by jonathan adamczewski in ue5-main branch]
2021-04-14 12:00:46 -04:00
Johan Berg
b2f93702ab Remove UE4 strings and names from Crash reporting
#rb none
#jira UE-111405, UE-111410, UE-111407, UE-111477, UE-111412, UE-111925, UE-111413, UE-111408, UE-111438, UE-111406

[CL 16002172 by Johan Berg in ue5-main branch]
2021-04-14 04:24:50 -04:00
Jerome Delattre
d2d52d022b Change BootTest idle timeout tolerance until a solution is found with buildmachine lag
#jira none
#rnx
#rb trivial

[CL 15994820 by Jerome Delattre in ue5-main branch]
2021-04-13 17:02:32 -04:00
brandon schaefer
50c90c0466 Adds support for DnsEligible
For Linux add a command line option to disable exclusive locks on files opened. This is due to a dotnet implemention
https://github.com/dotnet/runtime/issues/34126

#jira UE-110258
[REVIEW] [at]Jonathan.Adamczewski, [at]Michael.Sartain
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 15982440 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v787-15839533)

[CL 15989649 by brandon schaefer in ue5-main branch]
2021-04-13 10:28:24 -04:00
Brandon Schaefer
fa900c4d40 Add a command on some DDC ENV pointing out the values for Linux/Mac so its easier to grep/FIF if looking for them
#jira none
#rb none

[CL 15980789 by Brandon Schaefer in ue5-main branch]
2021-04-12 14:44:23 -04:00
eric mcdaniel
d846a46845 Additional workarounds for explicit references to optional console platforms in title build system
- includes a cherrypick of 15851870 by jeff.newquist as well as additional fixes
- some changes here are temporary and will be revisited via FORT-363688

#rb David.Harvey, Andrew.Grant, Luke.Thatcher
#jira none

[CL 15976966 by eric mcdaniel in ue5-main branch]
2021-04-12 09:11:22 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
jack porter
70b51652ed Establish Android port forwarding for COTF network fileserver and Unreal Insights
Change COTF server order to specify localhost first, speeding up connections for platforms that use port forwarding
#jira UEVR-2129
#jira UE-112392
#rb Steve.Smith
#preflight 606db84d963d84000187880a
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 15940305 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v787-15839533)

[CL 15944803 by jack porter in ue5-main branch]
2021-04-07 15:11:58 -04:00
Jason Adcock
09b61a9892 Fix false positives for Gauntlet tests that use Gauntlet.UnrealTestNode. This fixes tests passing even though they exited with a non passing errorcode.
[CL 15944330 by Jason Adcock in ue5-main branch]
2021-04-07 14:39:13 -04:00
ben marsh
8563a90a7a BuildGraph: Ignore the PreflightChange argument, even if the BuildGraph script does not declare it as an option.
#rb none
#jira UE-112608

#ROBOMERGE-SOURCE: CL 15910076 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15910077 by ben marsh in ue5-main branch]
2021-04-03 15:52:26 -04:00
jonathan adamczewski
70ed64e369 Fix "Build Tools CS Mac" on Mac
RunUAT.sh:
Setup Mono environment on Mac and Linux so that AutomationTool is able to launch xbuild for CsCompile tasks that have not been transitioned to NET Core.
(Linux change is untested)

CsCompileTask.cs:
Don't add the "/restore" argument to command line when building using xbuild as it does not appear to be supported.

InstalledEngineBuild.xml:
Remove CsCompile invocations for UAT projects as these are currently not able to be compiled by UAT: CsCompile does not know how use the bundled dotnet to build NET Core projects, and [our bundled] mono does not support NET Core projects.

This file is consumed by AutomationTool, which is compiled by RunUAT.sh. As such, it can generally be assumed that the UAT build is up to date when the built files are consumed (InstalledEngineBuild.xml has directives to tag the AutomationTool files to ensure they are included.)

#jira UE-112471

[CL 15902338 by jonathan adamczewski in ue5-main branch]
2021-04-02 12:03:38 -04:00
axel riffard
6a19f2473b Fix Deploying when having numerous iOS / tvOS devices connected on Mac
#rb jack.porter
#jira UE-103878
#preflight 6065601ed84af600012802ef

#ROBOMERGE-SOURCE: CL 15886539 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15889646 by axel riffard in ue5-main branch]
2021-04-01 11:13:45 -04:00
robert srinivasiah
dad92ed5fd Hololens: Package missing IoStore files
Plus a little cleanup. Technically, IoStore can run w/o pak.

#rb Jeff.Fisher Ben.Marsh
#jira UE-99878

#ROBOMERGE-SOURCE: CL 15878917 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v786-15839533)

[CL 15878951 by robert srinivasiah in ue5-main branch]
2021-03-31 14:27:57 -04:00
Ryan Durand
10bcbb3b86 Harden code for finding shared file manifests.
#rnx
#rb none
#jira none

[CL 15860260 by Ryan Durand in ue5-main branch]
2021-03-30 08:58:10 -04:00
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
geoff evans
4e13a8c38c Disable shader distribution to fix timing out jobs.
We also don't want to distribute these workloads for data consistency reasons.

#jira UE-111525
#preflight /job/605d21c8afacb800016d95dc

#ROBOMERGE-OWNER: geoff.evans
#ROBOMERGE-AUTHOR: geoff.evans
#ROBOMERGE-SOURCE: CL 15836928 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v785-15821902)
#ROBOMERGE-CONFLICT from-shelf

[CL 15836991 by geoff evans in ue5-main branch]
2021-03-25 21:30:32 -04:00
axel riffard
229065504a DeploymentServer Deletion
#jira UE-103878 #rb Jack.Porter
#preflight 6059508a7d511a0001f910da

#ROBOMERGE-SOURCE: CL 15773943 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v783-15756269)

[CL 15785903 by axel riffard in ue5-main branch]
2021-03-23 17:57:06 -04:00
Andrew Grant
c5bf909801 Added option to BuildAndTestProject script to publish staged content
Cleaned up some options around paths to make it easier for scripts to customize them.
Fixed issue with GDKBuilds in Gauntlet where the build source was ignoring the specified recursion depth when searching

#jira nojira
#rb jeff.farris

[CL 15780860 by Andrew Grant in ue5-main branch]
2021-03-23 13:53:51 -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
brandon schaefer
1cd0ca4105 With new PLINK/PSCP, it seems PSCP requires a -P number, and doesnt default to 22 anymore. Update both just in case to assume 22
#jira UE-111341
#rb none
[FYI] Michael.Sartain

#ROBOMERGE-SOURCE: CL 15751031 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15754100 by brandon schaefer in ue5-main branch]
2021-03-20 06:47:46 -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
axel riffard
9b45d9e6de Fix spaces in path in engine #rb jack.porter #jira UE-109630
#ROBOMERGE-SOURCE: CL 15737254 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15738262 by axel riffard in ue5-main branch]
2021-03-18 11:29:58 -04:00
chris babcock
609ff357a7 Fix detection of Android Studio location
#jira UE-110854
#ue5
#android
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 15728127 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15728130 by chris babcock in ue5-main branch]
2021-03-17 14:42:53 -04:00