Commit Graph

525 Commits

Author SHA1 Message Date
Ben Marsh
f1fd0db20b UAT: Add a fast path for detecting which client to use if the P4CLIENT variable is set to a valid workspace. Also remove warning for executing a command with P4 functionality.
#rb none

[CL 12766565 by Ben Marsh in Main branch]
2020-04-13 17:35:31 -04:00
josh adams
13bc36c98d Moving Binaries and Build NotForLicensees files around
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12740027 via CL 12740029 via CL 12740030
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12740031 by josh adams in Main branch]
2020-04-11 08:47:06 -04:00
Ben Marsh
d6d7c939e5 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 12726184 by Ben Marsh in Main branch]
2020-04-10 11:30:32 -04:00
ben marsh
288f84e89b Fix exception trying to print errors for missing parameters.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 12691586 in //UE4/Release-4.25/... via CL 12691590 via CL 12691596
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12691605 by ben marsh in Main branch]
2020-04-09 12:52:36 -04:00
carlmagnus nordin
25e8b4dd7d Copying //UE4/Release-4.25Plus-Dev to Release-4.25Plus (//UE4/Release-4.25Plus)
#rnx
#robomerge[BOT1] Main-For-EngineMerge
#rb none
#jira none
#lockdown stefan.boberg

#ROBOMERGE-OWNER: carlmagnus.nordin
#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 12504704 in //UE4/Release-4.25Plus/... via CL 12504720
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12504759 by carlmagnus nordin in Main branch]
2020-04-01 05:00:26 -04:00
ben marsh
da26a1885b Deprecate the BranchInfo constructor that takes a list of host platforms as a parameter.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12489772 in //UE4/Release-4.25/... via CL 12489774 via CL 12489779
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12489787 by ben marsh in Main branch]
2020-03-30 16:23:08 -04:00
ben marsh
ecc58f4ad8 Fix slow UAT startup due to populating metadata for every project in branch.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12487058 in //UE4/Release-4.25/... via CL 12487062 via CL 12487069
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12487632 by ben marsh in Main branch]
2020-03-30 12:15:31 -04:00
josh engebretson
2757a4efd5 Sanitize all device reservation output for EC parsing
[REVIEW] chris.bunner, ben.salem
#rnx

#ROBOMERGE-SOURCE: CL 12466490 via CL 12466641 via CL 12468460 via CL 12468523 via CL 12468688
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12468801 by josh engebretson in Main branch]
2020-03-27 11:22:33 -04:00
josh engebretson
4eda1cdb2d Harden device reservation renewal and deletion
[REVIEW]
#rnx

#ROBOMERGE-SOURCE: CL 12456906 via CL 12456981 via CL 12462113 via CL 12464432 via CL 12464510
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v672-12450963)

[CL 12464563 by josh engebretson in Main branch]
2020-03-26 20:54:02 -04:00
per larsson
631423aaeb Added UAT project parameter validation when using -iostore without -pak.
#jira UE-87771
#rb trivial

#ROBOMERGE-SOURCE: CL 11821697 in //UE4/Release-4.25/... via CL 11821739
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11821750 by per larsson in Main branch]
2020-03-02 07:33:21 -05:00
andrew grant
4a01142e6d Fixed c# compile error seen in VS 2017 with named arguments not being at the end of the list
#jira #rb na

#ROBOMERGE-SOURCE: CL 11806332 in //UE4/Release-4.25/... via CL 11806333
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11806335 by andrew grant in Main branch]
2020-03-01 14:24:16 -05:00
andrew grant
25dfafc637 Added spew filter to P4 calls to really suppress spew when requested.
The issue here is that CommandUtils.Run only suppresses stdout when NoSpew is specified, so P4 functions like FileExistsInDepot which use p4 calls that write to stderr (e.g fstat of a path not in P4) still end up spewing.

[at]ben.marsh
#rb swarm
#jira nojira

#ROBOMERGE-SOURCE: CL 11803848 in //UE4/Release-4.25/... via CL 11803850
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11803853 by andrew grant in Main branch]
2020-02-29 23:49:56 -05:00
michael sartain
8bafdac91b Use msbuild in mono for Linux when using an installed copy and mono >= 5.0.
Pulled code from Andrew's CL 7828885 for the Mac.

#jira none
#rb ben.marsh
[FYI] brandon.schaefer, andrew.grant

#ROBOMERGE-SOURCE: CL 11750877 in //UE4/Release-4.25/... via CL 11750986
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11776541 by michael sartain in Main branch]
2020-02-28 16:03:47 -05:00
ben marsh
f2e2a48419 Add timers for UAT startup.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 11726183 in //UE4/Release-4.25/... via CL 11726203
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11726228 by ben marsh in Main branch]
2020-02-28 06:43:09 -05:00
graeme thornton
6d558efbd1 UAT: Fixed alternate cook source pak file ignoring
#ROBOMERGE-SOURCE: CL 11596079 via CL 11596080 via CL 11596081
#ROBOMERGE-BOT: (v656-11643781)

[CL 11719001 by graeme thornton in Main branch]
2020-02-27 20:59:51 -05:00
anthony bills
1ef400627b Add support for whitelisting additional plugins and adding additional modules to plugin extensions.
Additionally allow monolithic programs inside platform extensions to ouput to the Binaries directory in the extension.

[at]brian.white, [at]josh.adams, [at]ben.marsh
#jira UE-81798
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 11655119 in //UE4/Release-4.25/... via CL 11655234
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11655284 by anthony bills in Main branch]
2020-02-27 10:47:20 -05:00
ben marsh
b628ea923c Fix missing properties on command line to MSBuild when compiling automation projects.
#rb none
#jira

#ROBOMERGE-SOURCE: CL 11645538 in //UE4/Release-4.25/... via CL 11645541
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11645543 by ben marsh in Main branch]
2020-02-26 20:44:30 -05:00
ben marsh
08c02ecb9f Fix enumeration of UAT build products.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 11617356 in //UE4/Release-4.25/... via CL 11617364
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11617405 by ben marsh in Main branch]
2020-02-25 15:56:58 -05:00
ben marsh
b70585fdb2 Use original location when determining which files to copy for UAT.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 11616044 in //UE4/Release-4.25/... via CL 11616069
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11616089 by ben marsh in Main branch]
2020-02-25 15:18:42 -05:00
ben marsh
373a31ef12 Fix copying of automation DLLs to output directory. Now may exist within any subfolders.
#rb none
#rnx
#jira UE-89493

#ROBOMERGE-SOURCE: CL 11611464 in //UE4/Release-4.25/... via CL 11611544
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11611575 by ben marsh in Main branch]
2020-02-25 14:13:08 -05:00
ben marsh
0f201db161 Add support for UAT script projects using foreign engine builds, and for game projects to output binaries under their own project directory.
* UAT will now read each *.Automation.csproj file to determine the output path, and load from there rather than just loading anything under Engine\Binaries\AutomationScripts.
* When compiling *.Automation.csproj files, UAT will set the $(EngineDir) directory to the current engine directory, allowing the project to resolve assembly references to the correct location.
* When generating project files, UBT will create an *.Automation.csproj.props file next to the project containing the path to the engine directory, allowing the assembly to be compiled correctly from Visual Studio.

#rb none
#jira UE-77934

#ROBOMERGE-SOURCE: CL 11601626 in //UE4/Release-4.25/... via CL 11601635
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11601659 by ben marsh in Main branch]
2020-02-25 09:26:12 -05:00
ben marsh
d24daafd83 Remove usages of "var"
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 11595098 in //UE4/Release-4.25/... via CL 11595099
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11595102 by ben marsh in Main branch]
2020-02-24 22:29:16 -05:00
graeme thornton
a2195f45b0 UAT: Add a staging option to disable the use of existing pak files from the staging folder of other build targets, when we've force reuse of another target's cooked data.
#rb ben.marsh


#ROBOMERGE-SOURCE: CL 11588486 via CL 11588489 via CL 11588491
#ROBOMERGE-BOT: (v654-11333218)

[CL 11593700 by graeme thornton in Main branch]
2020-02-24 20:18:28 -05:00
graeme thornton
1254204158 UAT
* Add a callback to the UAT project params so a script that uses buildcookrun can choose to modify the deployment context before staging
* Expose a function from the staging code which lets us remap staged file paths based on the project remapping configuration.
* Extend cooked target staging so that any programs or editor server targets are forced to Development configs, rather than what the master client/server targets request

#rb ben.marsh


#ROBOMERGE-SOURCE: CL 11586652 via CL 11586653 via CL 11586654
#ROBOMERGE-BOT: (v654-11333218)

[CL 11586655 by graeme thornton in Main branch]
2020-02-24 05:19:44 -05:00
andrew grant
03617b67df Integrated scripts for doing simple benchmarking of build steps from Private-Profiling.
Also includes -noshaderddc option for emulating a cold DDC for shaders only.


#rb na
#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 11519411 via CL 11519529 via CL 11519553
#ROBOMERGE-BOT: (v654-11333218)

[CL 11524747 by andrew grant in Main branch]
2020-02-18 17:19:54 -05:00