Commit Graph

39 Commits

Author SHA1 Message Date
eric knapik
62f5506ff9 #jira: none
Only adjust the CookedEditor default staged dir if it's not already been overriden.

[FYI] Josh.Adams
#rb: Josh.Adams
#preflight

#ROBOMERGE-AUTHOR: eric.knapik
#ROBOMERGE-SOURCE: CL 21186791 via CL 21195237 via CL 21195428 via CL 21195504
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21196929 by eric knapik in ue5-main branch]
2022-07-20 21:52:00 -04:00
josh adams
6a6b872445 - Fixed issue with directory not existing when adding project shaders
#jira UE-159929
#rb trivial
#preflight 62d6fdc947779a730aa8ebb3

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 21166998 via CL 21169092 via CL 21173455 via CL 21173535
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21192043 by josh adams in ue5-main branch]
2022-07-20 18:23:22 -04:00
eric knapik
64905a5500 #jira: FORT-487403, FORT-487406
Updating BuildCookFort and MakeCookedEditor to take an array of plugins for fast load.
Updated MakeCookedEditor to take override locations for the asset registry data as it will be in a different location than the Release folder when cooking locally.

This command will cook and pak the windows client, server and UEFN. Users will be able to modify this script to specify where the stage dir should be and if the Client, Server, UEFN should also be built as part of this.

#preflight 62d5dafddc4397d384e3b02c

#ROBOMERGE-AUTHOR: eric.knapik
#ROBOMERGE-SOURCE: CL 21155331 via CL 21157155 via CL 21159333 via CL 21164152
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21182295 by eric knapik in ue5-main branch]
2022-07-20 12:09:54 -04:00
graeme thornton
9b6693c0e9 Stage project shaders for cooked cookers
#preflight none
[FYI] josh.adams

#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 21108970 via CL 21110432 via CL 21110489 via CL 21110526
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21112668 by graeme thornton in ue5-main branch]
2022-07-15 12:49:24 -04:00
josh adams
97e4755b10 - Undid a recent backout of CookedEditor changes, with the bug fixed on the FN side
#rb eric.knapik
#preflight 62cf3aeab0763b1910c3031a

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 21090585 via CL 21090589 via CL 21090592
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21096372 by josh adams in ue5-main branch]
2022-07-14 15:23:24 -04:00
josh adams
125104fca8 - Moved where we stage Mono files so it only happens when targeting Linux
#rb trivial
#preflight 62cf1c6cb90bf539697c29b7

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 21090530 via CL 21090539 via CL 21090547
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)

[CL 21096363 by josh adams in ue5-main branch]
2022-07-14 15:23:10 -04:00
josh adams
f133254485 - Fixed up 3 Linux ContentWorker issues that came from the dotnet 6 upgrade (or other recent UE5 changes):
* Staged the wrong Dotnet directory when making CW from Windows (it would stage Dotnet/6.20.00/windows)
* The ScriptModule code that used the Automation.json files to discover the precompiled UAT script dlls didn't handle \'s on Linux in the paths, and since Windows wrote out the files, there are \'s aplenty. I fixed up the known issue, but possibly all paths loaded from the json files should be fixed up, but it's not easy to do automatically
* We moved to using RunUAT.sh instead of calling dotnet directly, however because we make the CW on Windows, dotnet was not executable, and the code in RunUAT.sh to find the dotnet executable and make it executable (chmod `which dotnet`) only works if dotnet is already executable! So, I moved the +x code into SetupDotnet.sh, on Linux and Mac
#rb eric.knapik
#preflight 62ccd2009922f7e512b6e51a

#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 21055451 via CL 21055464 via CL 21055478
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v972-20964824)
#ROBOMERGE-CONFLICT from-shelf

[CL 21076349 by josh adams in ue5-main branch]
2022-07-13 14:17:50 -04:00
graeme thornton
7f3dae9023 Stop cooked cooker staging code from including the -Cmd executables PDB from being staged
[FYI] josh.adams

#ROBOMERGE-AUTHOR: graeme.thornton
#ROBOMERGE-SOURCE: CL 20913320 via CL 20913321 via CL 20913323 via CL 20913328 via CL 20913338
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v971-20777995)

[CL 20914121 by graeme thornton in ue5-main branch]
2022-07-01 10:25:56 -04:00
andrew grant
e704de1fc9 Reverted some changes to CookedEditor builds from UE5 until Josh is back and can look at this.
Some paths have changed that look a little funky, but even updating FN builds to accomodate that change doesn't result in success.

#rb na
[REVIEW] [at]graeme.thornton [at]josh.adams [at]dan.lamb
#preflight https://horde.devtools.epicgames.com/job/62b5a28c0a3bb5ca13ef49f7?label=21

#ROBOMERGE-AUTHOR: andrew.grant
#ROBOMERGE-SOURCE: CL 20812058 via CL 20812178 via CL 20812430
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v971-20777995)

[CL 20814087 by andrew grant in ue5-main branch]
2022-06-24 14:43:37 -04:00
yiliang siew
2213a69d48 Fixed warning regarding usage of banned words.
#rb none
#preflight skip

#ROBOMERGE-AUTHOR: yiliang.siew
#ROBOMERGE-SOURCE: CL 20455462 via CL 20455464 via CL 20455467 via CL 20455473
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v952-20449836)

[CL 20460950 by yiliang siew in ue5-main branch]
2022-06-01 18:15:29 -04:00
yiliang siew
4cc39a48a8 - WhitelistConfigFiles is now enough to allow for staging individual configuration files from Restricted folders, without having to also specify also WhitelistDirectories for that folder as well.
- `WhitelistDirectories` now works properly for restricted directories in distributed builds.

#rb Josh.Adams
#preflight 6296a23e2c618ddc6667e394

#ROBOMERGE-AUTHOR: yiliang.siew
#ROBOMERGE-SOURCE: CL 20454257 via CL 20454274 via CL 20454286 via CL 20454306
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v952-20449836)

[CL 20460796 by yiliang siew in ue5-main branch]
2022-06-01 18:11:47 -04:00
josh adams
56f00caacd - Fixing ompile errors from robomerge
#rb trivial

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 20289919 in //UE5/Release-Engine-Staging/...
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20304905 by josh adams in ue5-main branch]
2022-05-20 18:49:39 -04:00
josh adams
381fbb5b95 - Fixed up the EditorOptional directories to have a different save vs input, since the save dir needs to be cleaned, but the input one cannot get cleaned
#rb francis.hurteau
#preflight 6286c9041e478b95c7ccaa2a

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 20289363 via CL 20289803 via CL 20289816 via CL 20289832
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v948-20297126)

[CL 20304893 by josh adams in ue5-main branch]
2022-05-20 18:49:22 -04:00
marc audy
3b9a49637e UAT: Fixed uptnl files not being excluded along with the other cooked files when filtering files for the cooked editor target
#rb josh.adams
#preflight 6286369b2b53e2be4c96e41f

#ROBOMERGE-OWNER: marc.audy
#ROBOMERGE-AUTHOR: carlmagnus.nordin
#ROBOMERGE-SOURCE: CL 20279305 via CL 20280759 via CL 20281322 via CL 20281568
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20285442 by marc audy in ue5-main branch]
2022-05-19 15:30:40 -04:00
josh adams
e7204af78c - Added some more debugging for dealing with missing EditorOptional files going from Client -> Editor
#rb trivial
#preflight skip

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 20185216 via CL 20189057 via CL 20189126 via CL 20189153
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20191620 by josh adams in ue5-main branch]
2022-05-13 18:57:30 -04:00
Josh Adams
3305b48a1a - Always specify -editoroptional when making CookedEditor, and to the client build when -makerelease is specified
- If doing editor-as-DLC, and you are cooking client manually, you will need to add -editoroptional to the client cooker commandline
#rb jason.nadro
#preflight 627d562ed7206acb0e5fe081

[CL 20168511 by Josh Adams in ue5-main branch]
2022-05-12 14:53:00 -04:00
josh adams
f39383095f - Updated CookedEditor to use the OPtionalFileStagingDirectory param to stage optional files with, if the member wasn't set by a subclass
- Updated some buildscripts to use -editoroptional data and -optionalfilestagingdirectory options
#rb francis.hurteau
#preflight 627a6d1a492212de072e6064

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 20138479 via CL 20144023 via CL 20145202 via CL 20145984
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20149281 by josh adams in ue5-main branch]
2022-05-11 16:36:21 -04:00
Josh Adams
defdfa230a - Added option for IoStore to write optional files (.o.ucas) to a different directory. This is used when making a a cooked editor as DLC against a client build (the client build has to make the optional editor data, but we do not want to ship the optional data with the client). The MakeCookedEditor script will then copy the files from that location into the editor's Stage directory (under Content/Paks)
#rb carl-magnus.nordin,francis.hurteau
#preflight 6273f8fd8d32cd80d8a8ecdb

[CL 20059504 by Josh Adams in ue5-main branch]
2022-05-05 12:28:59 -04:00
Francis Hurteau
edddb2f628 Expose -editoroptional option to cooked editor makerelease
#rb Josh.Adams
#jira none
#preflight none

[CL 20047844 by Francis Hurteau in ue5-main branch]
2022-05-04 16:10:05 -04:00
Matt Peters
b250769d03 CookedEditor staging: Fix warnings about missing generated map files - do not add the uncooked version of map files for generated files that do not exist uncooked.
#jira UE-142791
#rb Josh.Adams
#rnx
#preflight 62694ae9b710a00f18b2fa77

[CL 19938955 by Matt Peters in ue5-main branch]
2022-04-27 10:03:41 -04:00
jonathan adamczewski
c12d99d854 .net6.0 is not supported in VS2019. Suppress warnings about that when using that IDE (with this change, when building UnrealBuildTool & AutomationTool)
#jira none
#rnx
#rb joe.kirchoff
#preflight 624f2c163c2aff69c54ff9eb

[CL 19675097 by jonathan adamczewski in ue5-main branch]
2022-04-07 15:06:02 -04:00
jonathan adamczewski
c1bb6901bf Upgrade to .NET 6.0
#jira UE-119846
#preflight 624cbb2ecc0872e96b0d5181

[CL 19652696 by jonathan adamczewski in ue5-main branch]
2022-04-06 14:46:50 -04:00
josh adams
25705eb507 - Added cooker option, -DlcReevaluateUncookedAssets, which will allow a cooked editor to attempt to cook assets that the base game had attempted to cook and skipped, but left in the assetregistry.
#rb matt.peters
#p4v-preflight-copy 19482053
#preflight 624326c1f73c316f68cdd1c2

#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 19544735 via CL 19547423 via CL 19548168 via CL 19548176
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v937-19513599)

[CL 19560883 by josh adams in ue5-main branch]
2022-03-30 14:16:51 -04:00
jonathan adamczewski
5053cae2d8 Launch UnrealBuildTool via dotnet unrealbuildtool.dll, not unrealbuildtool.exe
#jira none
#rnx
#preflight 624261bdb6084b98321e9251

[CL 19544939 by jonathan adamczewski in ue5-main branch]
2022-03-29 13:20:46 -04:00
jonathan adamczewski
5c68d1d9ef Revert //UE5/Main/... changelist 19531725 - return to NET Core 3.1
#preflight 62422fd0470aff98e946bfce
#jira UE-119846

[CL 19534572 by jonathan adamczewski in ue5-main branch]
2022-03-28 18:25:19 -04:00