Commit Graph

50 Commits

Author SHA1 Message Date
joe kirchoff
d8297d6752 UnrealBuildTool: Cleanup XmlConfig
#rnx

[CL 30435245 by joe kirchoff in ue5-main branch]
2023-12-21 18:56:31 -05:00
joe kirchoff
ef982a57f3 UnrealBuildTool: Also load BuildConfiguration from %ProgramData% & %LocalAppData%
[CL 29766107 by joe kirchoff in ue5-main branch]
2023-11-15 19:41:48 -05:00
joe kirchoff
c04da27b3b UnrealBuildTool: More automated code cleanup
#rnx
#preflight 64767efb4b1ead7c7f428c7a

[CL 25693857 by joe kirchoff in ue5-main branch]
2023-05-30 18:59:32 -04:00
joe kirchoff
36d266e932 UnrealBuildTool: Automated code cleanup
#rnx
#preflight 6476799e947ff6973c225619

[CL 25693241 by joe kirchoff in ue5-main branch]
2023-05-30 18:38:07 -04:00
LennardF1989
9a67525476 PR #8239: Support for project-specific BuildConfiguration.xml and Programs during project file generation (Contributed by LennardF1989)
Contains some additional changes from Joe.Kirchoff:
* Fix project dependency for rules parent chain
* Always add UnrealBuildTool and AutomationTool .csproj for game targets -except-
* Filter out other non-critial .csproj unless engine programs are included

#jira UE-120122
#jira UE-176963
#preflight 6413c6668354cad0facc7388

[CL 24690813 by LennardF1989 in ue5-main branch]
2023-03-17 12:14:26 -04:00
David Harvey
40a8292db5 fix null reference warning
#rb Wojciech.Krywult
#jira none
#rnx
#preflight skip

[CL 23249282 by David Harvey in ue5-main branch]
2022-11-23 09:55:14 -05:00
Wojciech Krywult
3f2f9f9376 UBT: XmlConfigFile: Fixed potential exceptions handling deprecated properties and improved diagnostic messages when using renamed members (NewAttributeName).
#preflight 637272865368a3230a54cb81
#rb Joe.Kirchoff
#rnx

[CL 23120016 by Wojciech Krywult in ue5-main branch]
2022-11-14 12:04:09 -05:00
joe kirchoff
144ce56048 UnrealBuildTool: Move some util properties to EpicGames.Build
#rnx
#rb trivial
#preflight 6362e8e86000216d2e2b4bdd

[CL 22937953 by joe kirchoff in ue5-main branch]
2022-11-02 23:07:24 -04:00
UnrealBot
73409369c0 Branch snapshot for CL 21319338
[CL 21319338 in ue5-main branch]
2022-08-10 16:03:37 +00:00
Ben Marsh
cbb950c578 UBT: Use ILogger throughout UBT, rather than legacy EpicGames.Core.Log methods. All output going forwards should use structured logging rather than String.Format style logging.
#preflight 628e9dc6e746de4961f60032

[CL 20373777 by Ben Marsh in ue5-main branch]
2022-05-25 19:55:37 -04:00
Wojciech Krywult
8fb3ce1782 UBT: XmlConfigFile attribute: Added support for properties.
[XmlConfigFile(...)] can be added to both fields and properties. The latter can be useful e.g. with derived properties.

#rb Joe.Kirchoff
#jira none
#preflight 62825fb8734d0657702b31f5

[CL 20224799 by Wojciech Krywult in ue5-main branch]
2022-05-16 11:10:24 -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
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
jonathan adamczewski
f47cdcfeec UnrealBuildTool: Cache BuildConfiguration.xml file locations
#jira none

#ROBOMERGE-OWNER: jonathan.adamczewski
#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 18342928 in //UE5/Release-5.0/... via CL 18343053
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18343070 by jonathan adamczewski in ue5-release-engine-test branch]
2021-12-01 14:45:33 -05:00
jonathan adamczewski
f89613487e UnrealBuildTool: Add support for deprecating an xml config option
Example code:

	[XmlConfigFile(Deprecated = true, NewAttributeName = "PrimaryProjectName")]
	protected string MasterProjectName = "UE5";


Example output:

WARNING: Deprecated setting found in "/Users/jonathan.adamczewski/.config/Unreal Engine/UnrealBuildTool/BuildConfiguration.xml":
WARNING: The setting "MasterProjectName" is deprecated. Support for this setting will be removed in a future version of Unreal Engine.
WARNING: Use "PrimaryProjectName" in place of "MasterProjectName"
The value provided for "MasterProjectName" will be applied to "PrimaryProjectName"


#jira none

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 17680559 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v875-17642767)

[CL 17680584 by jonathan adamczewski in ue5-release-engine-test branch]
2021-09-30 13:52:47 -04:00
ben marsh
5d17ed6331 UBT: Fix warnings generating documentation.
#p4v-cherrypick 17664873

#ROBOMERGE-AUTHOR: ben.marsh
#ROBOMERGE-SOURCE: CL 17665748 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v875-17642767)

[CL 17665793 by ben marsh in ue5-release-engine-test branch]
2021-09-29 15:02:51 -04:00
jonathan adamczewski
01962c64e1 UnrealBuildTool: Log BuildConfiguration.xml locations on tool startup
Log file will contain lines like the following:

[00:00:00.032] Log started at 9/28/2021 8:46:43 AM (2021-09-28T15:46:43Z)
[00:00:00.051] No config file at /Users/jonathan.adamczewski/Unreal Engine/UnrealBuildTool/BuildConfiguration.xml
[00:00:00.051] Configuration will be read from:
[00:00:00.051]   /Users/jonathan.adamczewski/Perforce/UE5_Main/Engine/Restricted/NotForLicensees/Programs/UnrealBuildTool/BuildConfiguration.xml
[00:00:00.051]   /Users/jonathan.adamczewski/Perforce/UE5_Main/Engine/Saved/UnrealBuildTool/BuildConfiguration.xml
[00:00:00.051]   /Users/jonathan.adamczewski/.config/Unreal Engine/UnrealBuildTool/BuildConfiguration.xml

#jira none
#trivial

#ROBOMERGE-AUTHOR: jonathan.adamczewski
#ROBOMERGE-SOURCE: CL 17648226 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v875-17642767)

[CL 17648240 by jonathan adamczewski in ue5-release-engine-test branch]
2021-09-28 13:07:29 -04:00
aurel cordonnier
69fe095547 Merge from Release-Engine-Staging @ 17636544 to Release-Engine-Test
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17638842 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-27 19:54:25 -04:00
ben marsh
e93f5be457 UBT: Make sure deprecation warnings are treated as errors when -WarningsAsErrors is specified on the command line. Fixes a number of intermittent errors through Horde.
#ROBOMERGE-SOURCE: CL 17394491 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v865-17346139)

[CL 17394493 by ben marsh in ue5-release-engine-test branch]
2021-09-01 19:35:23 -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
jonathan adamczewski
233b7719a5 <saved by Perforce>
#ROBOMERGE-SOURCE: CL 16642197 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16642206 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 11:37:42 -04:00
jonathan adamczewski
d58996b916 UnrealBuildTool: move some path constants into BuildUtilities
RootDirectory, EngineDirectory, UnrealBuildToolPath are now found in BuildUtilities' UnrealBuild namesapce.

The way these are computed has changed. Previously, it was assumed that the application is UnrealBuildTool, and paths were constructed relative to that assembly.

Now, the assumption is that the process is located under a "Engine/Build/DotNET" sub-path and paths are constructed relative to that.

#jira none

#ROBOMERGE-SOURCE: CL 16607440 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16607455 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-09 12:55:13 -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
Ben Marsh
68f5abeb09 UBT: Convert UnrealBuildTool to use nullable references.
#rb none
#rnx

[CL 14960546 by Ben Marsh in ue5-main branch]
2020-12-20 18:47:42 -04:00