Commit Graph

27 Commits

Author SHA1 Message Date
andrew grant
72c05ae78b Fixed up Engine BenchmarkBuild and BuildTarget scripts for some UE5 / VK changes,
- Changes argument for building vanilla UE targets from "UE4" to "Unreal"
- Improved code that detects the project target to build to deal with projects that have multiple "Editor" targets
- Fixed issue where -noxge would cause -cook tasks not to be queued if there was no warm/hot/cold DDC argument
- Made -noxge the default if no -xge arg is specified

#rb pat.swanson

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 18531909 via CL 18531922 via CL 18531923 via CL 18531933 via CL 18531940 via CL 18532363 via CL 18532390 via CL 18532802 via CL 18533930
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v899-18417669)

[CL 18534124 by andrew grant in ue5-release-engine-test branch]
2022-01-06 14:16:53 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
jonathan adamczewski
64c210d294 AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

#ROBOMERGE-SOURCE: CL 16648181 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16648203 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 18:21:35 -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
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
Joakim Lindqvist
e7039d3d35 UBT and UAT now use .NET Core instead of Framework and Mono. This means that we use the same runtime on Windows, Linux and Mac. Further benefits including newer C# features and a lot of intresting features for the future around AOT and Tiered compilation.
Some behavior changes:
Output paths - Both tools are now output to a subdirectory of Binaries/Dotnet, I believe most hardcoded paths have been fixed up but there may be tools that will fail because of this.
UAT Plugin Building - As .NET Core does not support AppDomain unloading, how we build the plugins has changed quite a bit, these are now built before UAT is started rather then by UAT itself. If you just start UAT via RunUAT.bat/sh this should just continue to work.

#rb ben.marsh

[CL 14834347 by Joakim Lindqvist in ue5-main branch]
2020-12-02 06:57:13 -04:00
Ben Marsh
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.

Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.

Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects

#rb none

[CL 14301890 by Ben Marsh in ue5-main branch]
2020-09-11 15:54:42 -04:00
Ben Marsh
486408b1a9 Rename UE5Editor to UnrealEditor.
#rb none
#jira UE-97600

[CL 14292067 by Ben Marsh in ue5-main branch]
2020-09-10 15:39:00 -04:00
Ben Marsh
be7034ec27 Rename UE4Editor to UE5Editor, and generated solution/projects from UE4 -> UE5.
UE4Game/Client/Server targets left intact for the time being.

#rb none

[CL 14288076 by Ben Marsh in ue5-main branch]
2020-09-10 09:10:30 -04:00
andrew grant
e6640ca321 BuildTarget script now calls UBT directly when compiling single targets or editor+tools.
#rb na
#jira robomerge

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 12749718 via CL 12749719 via CL 12749721 via CL 12749781
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12749796 by andrew grant in Main branch]
2020-04-12 20:38:09 -04:00
andrew grant
ebea3489e4 BuildTarget script - print valid target names when there's a mismatch to assist diagnosis / bug reporting.
#jira nojira
#rb na
#lockdown Cristina.Riveron

#ROBOMERGE-SOURCE: CL 12611152 in //UE4/Release-4.25/... via CL 12611153 via CL 12611154
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12611155 by andrew grant in Main branch]
2020-04-05 15:10:51 -04:00
andrew grant
fd9d2ea5d1 Fixed two issues in SyncProject script.
1) Typo in checking against the Count() of matching target types in a project. If there's only one match (e.g. a single Editor target) that's what we want.

2) In the case where there are multiple matches we try to pick the one prefixed with the project name. This failed when the user supplied a full path for the project argument as the name was not being taken from the project file.

#jira UE-91251
[at]ben.marsh
#tests ran standalone BuildTarget script with full project path to EngineTest and via SyncProject script
#lockdown cristina.riveron
#rb swarm

#ROBOMERGE-SOURCE: CL 12489641 in //UE4/Release-4.25/... via CL 12489645 via CL 12489647
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12489649 by andrew grant in Main branch]
2020-03-30 16:11:53 -04:00
andrew grant
27cde99e9b Fixed issue with BuildTarget script needlessly recompiling UBT
#ROBOMERGE-SOURCE: CL 12099750 via CL 12099772 via CL 12099782 via CL 12116427
#ROBOMERGE-BOT: (v657-12064184)

[CL 12118848 by andrew grant in Main branch]
2020-03-10 17:26:58 -04:00
andrew grant
8591c46e93 Fix BuildTarget script to work with presence of multiple target files for one target.
#ROBOMERGE-SOURCE: CL 11929433 via CL 11929435 via CL 11929438
#ROBOMERGE-BOT: (v656-11643781)

[CL 11929441 by andrew grant in Main branch]
2020-03-04 20:04:30 -05:00
andrew grant
7ba0af1a85 Fixed BuildTarget UAT script to use existing means of detecting the valid targets for a project rather than trusing the names of the .cs target files.
See https://udn.unrealengine.com/questions/555746/are-game-and-client-build-targets-the-same.html

#jira #rb na

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

[CL 11806319 by andrew grant in Main branch]
2020-03-01 14:19:17 -05:00
andrew grant
f7161586b1 Editgrating benchmark build script from UE4/Main
#ROBOMERGE-SOURCE: CL 11576916 via CL 11576921 via CL 11576922 via CL 11576924
#ROBOMERGE-BOT: (v654-11333218)

[CL 11576925 by andrew grant in Main branch]
2020-02-21 13:09:10 -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
Patrick Boutot
410c720ac7 Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx
#author jeanmichel.dignard

[CL 10992634 by Patrick Boutot in Dev-VirtualProduction branch]
2020-01-15 09:39:21 -05:00
Andrew Grant
7e172570fd Integrating LiveLink plugin changes from Fury
#rb chris.norden, patrick.boutot
#jira nojira

[CL 10984000 by Andrew Grant in Dev-VirtualProduction branch]
2020-01-14 13:12:37 -05:00
Stefan Boberg
1f813eb516 Copying //UE4/Dev-Core to Main (//UE4/Main)
#rb many

[CL 9405827 by Stefan Boberg in Main branch]
2019-10-03 16:26:48 -04:00
andrew grant
3e9c14550d Fixed issue with missing arguments to UHT
#rb mike.beach


#ROBOMERGE-SOURCE: CL 8126941 via CL 8126947 via CL 8132331
#ROBOMERGE-BOT: (v401-8057353)

[CL 8157562 by andrew grant in Main branch]
2019-08-21 09:03:32 -04:00
andrew grant
47a03942a9 Editgrated latest SyncProject script from FN as part of UE-78832, UE-78826, and resolved issues with omitted / dangerous arguments.
Project arg is now optional and will simply sync the engine.
Passing -CL=0 will now require the -force argument before syncing files out of the workspace.
Fixed issue with deep samples (e.g AREnvProbe) not being discovered by FindProjectFileFromName
Added NativeProjects.ClearCache option for the case when syncing a project from P4 that isn't yet on disk

Fixed issue with P4.FileExistsInDepot returning true if passed a path that isn't in the users client view. Relates to UE-78832 but not the entire fix
Fixed issue with BuildEditor not working without a project arg.
Fixed issue building projects that don't have source

[CODEREVIEW] ben.marsh
#jira UE-78832, UE-78826
#rb na

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 8008332 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v396-7974030)

[CL 8008726 by andrew grant in Main branch]
2019-08-13 16:24:19 -04:00
andrew grant
d0d3313e5a Missed file from 7828884
#jira UE-78311
#rb na

#ROBOMERGE-SOURCE: CL 7833510 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7833512 by andrew grant in Main branch]
2019-08-06 21:09:38 -04:00
andrew grant
6ac2a3bd5e Added -clean option to SyncProject (was lost in refactor)
#jira na
#rb josh.spivey

#ROBOMERGE-OWNER: andrew.grant
#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 7817240 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v389-7813075)

[CL 7819562 by andrew grant in Main branch]
2019-08-06 16:06:27 -04:00