Commit Graph

41 Commits

Author SHA1 Message Date
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
Josh Adams
ab4a48f566 - Moved UEBuildPlatformSDK into a separate DLL, BuildUtilities (similar to DotNETUtilities), allowing for better sharing of code between UBT and UAT (Turnkey in particular)
- Refactored SDK versioning into more formalized APIs for all platforms. Currently UBT will not error with bad versions, but that is coming.
- Turnkey updated to use new BuildUtilities
#rb ben.marsh

[CL 13733158 by Josh Adams in ue5-main branch]
2020-06-22 14:32:25 -04:00
ben marsh
f12d676b72 Fix BuildConfiguration.xml not being read from NotForLicensees folder (no longer returned by XmlConfig.FindInputFiles)
#jira
[FYI] Josh.Adams

#ROBOMERGE-SOURCE: CL 13169678 via CL 13169683 via CL 13169691
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v688-13145358)

[CL 13169695 by ben marsh in Main branch]
2020-05-05 05:52:05 -04:00
josh adams
8564e1b315 - Changes to various modules, plugins, programs, websites, thirdparty code, etc that had NotForLicensees folders within them, to move to Restricted
- Moved the AndroidDeviceProfileSelector secret guid to a NoRedist .ini setting
[CODEREVIEW] alistair.white,chris.babcock,jack.porter
#rb ben.marsh, advisor

#ROBOMERGE-SOURCE: CL 12706094 via CL 12709228 via CL 12709456
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12709555 by josh adams in Main branch]
2020-04-09 19:58:35 -04:00
ben marsh
03ae195b79 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536 via CL 10870955
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v624-10872983)

[CL 10876681 by ben marsh in Dev-Build branch]
2020-01-05 17:24:44 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
mmarinchenko
41e747872e PR #6293: UnrealBuildTool fix (Contributed by mmarinchenko)
Fix issue with iOS builds failing when running some non-English versions of Windows
#rb None
#jira UE-82122

#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: jack.porter
#ROBOMERGE-SOURCE: CL 10091930 in //UE4/Release-4.24/... via CL 10091931
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build) (v610-10636431)

[CL 10739837 by jack porter in Dev-Build branch]
2019-12-16 14:39:44 -05:00
MilkyEngineer
f6c91ff260 PR #6412: FIX: Added support for FileReference to fix serialisation of RemoteMac.SshPrivateKey (Contributed by MilkyEngineer)
#rb none

[CL 10488810 by Ben Marsh in Dev-Build branch]
2019-12-02 15:32:14 -05:00
mmarinchenko
3cedd323e2 PR #6293: UnrealBuildTool fix (Contributed by mmarinchenko)
Fix issue with iOS builds failing when running some non-English versions of Windows
#rb None
#jira UE-82122

#ROBOMERGE-SOURCE: CL 10091930 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10091931 by jack porter in Main branch]
2019-11-11 01:00:37 -05:00
ben marsh
192c58a136 UBT: Warn about undocumented fields in BuildConfiguration files.
#rb none
#rnx
#jira

#ROBOMERGE-SOURCE: CL 8331507 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8331536 by ben marsh in Main branch]
2019-08-27 10:36:54 -04:00