izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

- Moved SDK versions (MainVersion and Min/Max SDK version) from C# strings to SDK.json files in the Platform's Config folder

Browse Source 
- Allow for per-project override in a project's platform's config folder (this is merging with my other work on per-project SDKs and validation of multi-target builds)
- More versions will move over after this
#rb david.harvey

[CL 26150552 by josh adams in ue5-main branch]
This commit is contained in:
josh adams
2023-06-21 11:21:01 -04:00
parent d64c66d387
commit 305c260069
21 changed files with 414 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Programs/UnrealBuildTool/Configuration/TargetDescriptor.cs
+50 -13
View File
@@ -238,6 +238,13 @@ namespace UnrealBuildTool
return TargetDescriptors;
}
public static IEnumerable<FileReference?> ParseCommandLineForProjects(CommandLineArguments Arguments, ILogger Logger)
{
List<TargetDescriptor> SimplifiedTargetDescriptors = new List<TargetDescriptor>();
ParseCommandLine(Arguments, false, true, false, bCreateSimplifiedDescriptors: true, SimplifiedTargetDescriptors, Logger);
return SimplifiedTargetDescriptors.Select(x => x.ProjectFile);
}
/// <summary>
/// Parse a list of target descriptors from the command line
/// </summary>
@@ -248,6 +255,12 @@ namespace UnrealBuildTool
/// <param name="TargetDescriptors">Receives the list of parsed target descriptors</param>
/// <param name="Logger">Logger for output</param>
public static void ParseCommandLine(CommandLineArguments Arguments, bool bUsePrecompiled, bool bSkipRulesCompile, bool bForceRulesCompile, List<TargetDescriptor> TargetDescriptors, ILogger Logger)
{
// call the internal one
ParseCommandLine(Arguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, bCreateSimplifiedDescriptors: false, TargetDescriptors, Logger);
}
private static void ParseCommandLine(CommandLineArguments Arguments, bool bUsePrecompiled, bool bSkipRulesCompile, bool bForceRulesCompile, bool bCreateSimplifiedDescriptors, List<TargetDescriptor> TargetDescriptors, ILogger Logger)
{
List<string> TargetLists;
Arguments = Arguments.Remove("-TargetList=", out TargetLists);
@@ -267,7 +280,7 @@ namespace UnrealBuildTool
if (TrimLine.Length > 0 && TrimLine[0] != ';')
{
CommandLineArguments NewArguments = Arguments.Append(CommandLineArguments.Split(TrimLine));
ParseCommandLine(NewArguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, TargetDescriptors, Logger);
ParseCommandLine(NewArguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, bCreateSimplifiedDescriptors, TargetDescriptors, Logger);
}
}
}
@@ -275,13 +288,13 @@ namespace UnrealBuildTool
foreach (string Target in Targets)
{
CommandLineArguments NewArguments = Arguments.Append(CommandLineArguments.Split(Target));
ParseCommandLine(NewArguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, TargetDescriptors, Logger);
ParseCommandLine(NewArguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, bCreateSimplifiedDescriptors, TargetDescriptors, Logger);
}
}
else
{
// Otherwise just process the whole command line together
ParseSingleCommandLine(Arguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, TargetDescriptors, Logger);
ParseSingleCommandLine(Arguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, bCreateSimplifiedDescriptors, TargetDescriptors, Logger);
}
}
@@ -295,6 +308,12 @@ namespace UnrealBuildTool
/// <param name="TargetDescriptors">List of target descriptors</param>
/// <param name="Logger">Logger for output</param>
public static void ParseSingleCommandLine(CommandLineArguments Arguments, bool bUsePrecompiled, bool bSkipRulesCompile, bool bForceRulesCompile, List<TargetDescriptor> TargetDescriptors, ILogger Logger)
{
// call the internal one
ParseSingleCommandLine(Arguments, bUsePrecompiled, bSkipRulesCompile, bForceRulesCompile, bCreateSimplifiedDescriptors: false, TargetDescriptors, Logger);
}
private static void ParseSingleCommandLine(CommandLineArguments Arguments, bool bUsePrecompiled, bool bSkipRulesCompile, bool bForceRulesCompile, bool bCreateSimplifiedDescriptors, List<TargetDescriptor> TargetDescriptors, ILogger Logger)
{
List<UnrealTargetPlatform> Platforms = new List<UnrealTargetPlatform>();
List<UnrealTargetConfiguration> Configurations = new List<UnrealTargetConfiguration>();
@@ -368,6 +387,32 @@ namespace UnrealBuildTool
throw new BuildException("No configurations specified for target");
}
// make a single simple descriptor with out a lot of processing or rules assembly creation
if (bCreateSimplifiedDescriptors)
{
// we expect either a targetname from the above loop, or -targetype combined with -project, so we should have -project or a TargetName already
string? TargetName = TargetNames.FirstOrDefault();
if (TargetName == null)
{
if (ProjectFile == null)
{
Logger.LogInformation("When looking for per-project SDK overrides, we got a commandline that could not be used to find a target project ({CmdLine})", Arguments.ToString());
return;
}
// just assume Game target type, it doesn't matter
TargetName = ProjectFile.GetFileNameWithoutAnyExtensions() + "Game";
}
if (ProjectFile == null)
{
NativeProjects.TryGetProjectForTarget(TargetName, Logger, out ProjectFile);
}
TargetDescriptors.Add(new TargetDescriptor(ProjectFile, TargetName, Platforms.First(), Configurations.First(), new UnrealArchitectures(UnrealArch.X64), Arguments));
// we are done now with simple descriptors
return;
}
// Make sure the project file exists, and make sure we're using the correct case.
if (ProjectFile != null)
{
@@ -395,10 +440,7 @@ namespace UnrealBuildTool
}
}
// there are times that this can be run before we have setup build platforms (ie Per-Project AutoSDK version), in which case we
// cannot get Architecture info, but it's not needed yet
UEBuildPlatform? BuildPlatform;
UEBuildPlatform.TryGetBuildPlatform(Platform, out BuildPlatform);
UEBuildPlatform BuildPlatform = UEBuildPlatform.GetBuildPlatform(Platform);
// Parse the architecture parameter, or use null to look up platform defaults later
string ParamArchitectureList = Arguments.GetStringOrDefault("-Architecture=", "") + Arguments.GetStringOrDefault("-Architectures=", "");
@@ -461,11 +503,6 @@ namespace UnrealBuildTool
{
Architectures = ParamArchitectures;
}
else if (BuildPlatform == null)
{
// if we can't use BuildPlatform yet, we just use any random architecture, since we need _something_
Architectures = new UnrealArchitectures(UnrealArch.X64);
}
else
{
// ask the platform what achitectures it wants for this project
@@ -473,7 +510,7 @@ namespace UnrealBuildTool
}
// If the platform wants a target for each architecture, make a target descriptor for each architecture, otherwise one target for all architectures
if (BuildPlatform != null && BuildPlatform.ArchitectureConfig.Mode == UnrealArchitectureMode.OneTargetPerArchitecture)
if (BuildPlatform.ArchitectureConfig.Mode == UnrealArchitectureMode.OneTargetPerArchitecture)
{
foreach (UnrealArch Architecture in Architectures.Architectures)
{