Commit Graph

30 Commits

Author SHA1 Message Date
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
jonathan adamczewski
18ac15cbb1 Upgrade to .NET 6.0
#jira UE-119846
#preflight 6241fc06470aff98e943c035

[CL 19531725 by jonathan adamczewski in ue5-main branch]
2022-03-28 15:30:56 -04:00
Josh Adams
25c9d30555 - Only remap cooked output directory for cookededitor when making DLC (it was meant for DLC mode only, but is causing long paths)
#rb trivial
#preflight 621cf4829a5676d19a376158

[CL 19174625 by Josh Adams in ue5-main branch]
2022-02-28 11:23:03 -05:00
josh adams
3d1eff84b4 - Added support in MakeCookedEditor code to kick off a side BuildCookRun to create a base Release when making a CookedEditor as DLC. This will make it easier to test DLC mode because this one script can make the Release and also the DLC in one run.
- Run with -MakeRelease=build,cook,stage (or a subset to skip the step)
- Can also optionally combine the release and DLC into a target directory with -CombineBuilds=<path>
#rb self
#jria none
#preflight 62101c09ff52bfecfc03d7fb

[CL 19058296 by josh adams in ue5-main branch]
2022-02-18 17:46:49 -05:00
josh adams
45d01324fc [Backout] - CL19056752
#fyi Josh.Adams
Original CL Desc
-----------------------------------------------------------------
- Added support in MakeCookedEditor code to kick off a side BuildCookRun to create a base Release when making a CookedEditor as DLC. This will make it easier to test DLC mode because this one script can make the Release and also the DLC in one run.
- Run with -MakeRelease=build,cook,stage (or a subset to skip the step)
- Can also optionally combine the release and DLC into a target directory with -CombineBuilds=<path>
#rb self
#jria none
#preflight skip

[CL 19056795 by josh adams in ue5-main branch]
2022-02-18 16:24:41 -05:00
Josh Adams
c1e954d0df - Added support in MakeCookedEditor code to kick off a side BuildCookRun to create a base Release when making a CookedEditor as DLC. This will make it easier to test DLC mode because this one script can make the Release and also the DLC in one run.
- Run with -MakeRelease=build,cook,stage (or a subset to skip the step)
- Can also optionally combine the release and DLC into a target directory with -CombineBuilds=<path>
#rb self
#jria none
#preflight skip

[CL 19056752 by Josh Adams in ue5-main branch]
2022-02-18 16:19:55 -05:00
josh adams
8de98c920c - Allow staging empty files in CookedEditor via ini files
- Allow for CookedEditor's ini settings to remap a file (added a Dest param to ExtraStageFiles, must not be recursive or wildcard)
#preflight 61f8460b1c5ac552346620c5
#rb none

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 18797297 via CL 18826739 via CL 18826792 via CL 18826836 via CL 18835836 via CL 18836360
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v910-18824042)

[CL 18836433 by josh adams in ue5-main branch]
2022-02-02 18:25:43 -05:00
josh adams
4a39339b27 - Removed maps from Uncook list in MapMode=None, since the Uncook list will be added back in after the MapMode logic
#rb trivial
#preflight skip

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 18755210 via CL 18756381 via CL 18756389 via CL 18756397 via CL 18761053 via CL 18761766
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18761801 by josh adams in ue5-main branch]
2022-01-27 16:12:23 -05:00
josh adams
98af26ef0c - Removing platform Build dirs which were bloating the CW size with NewSchool mode
#preflight 61eae5c7e4313f36f0202aa0
#rb none

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 18701006 via CL 18701283 via CL 18701287 via CL 18701291 via CL 18702228 via CL 18702249 via CL 18702284
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v903-18687472)

[CL 18702288 by josh adams in ue5-main branch]
2022-01-22 14:45:30 -05:00
josh adams
578e73e926 - Fixed up various files included with new MakeCookedEditor
- Added "MapMode" which can allow a cooked editor/cooker to stage cooked, uncooked, or no maps
#rb none
#preflight skip (unaffected)

#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 18589011 via CL 18590214 via CL 18590224 via CL 18590228 via CL 18590443 via CL 18590447 via CL 18590457
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Test -> Main) (v899-18417669)

[CL 18590475 by josh adams in ue5-main branch]
2022-01-12 17:36:35 -05:00