Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)

#rb none

[CL 6671275 by Chris Gagnon in Dev-Editor branch]
This commit is contained in:
Chris Gagnon
2019-05-29 20:48:56 -04:00
parent bc0b385dee
commit 9f1505e469
1724 changed files with 99110 additions and 37372 deletions

View File

@@ -18,30 +18,27 @@ public class BuildCommonTools : BuildCommand
{
LogInformation("************************* BuildCommonTools");
// Get the list of platform names
string[] PlatformNames = ParseParamValue("platforms", BuildHostPlatform.Current.Platform.ToString()).Split('+');
// Parse the platforms
List<UnrealBuildTool.UnrealTargetPlatform> Platforms = new List<UnrealTargetPlatform>();
foreach(string PlatformName in PlatformNames)
{
UnrealBuildTool.UnrealTargetPlatform Platform;
if(!UnrealBuildTool.UnrealTargetPlatform.TryParse(PlatformName, true, out Platform))
{
throw new AutomationException("Unknown platform specified on command line - '{0}' - valid platforms are {1}", PlatformName, String.Join("/", Enum.GetNames(typeof(UnrealBuildTool.UnrealTargetPlatform))));
}
Platforms.Add(Platform);
}
List<UnrealTargetPlatform> Platforms = new List<UnrealTargetPlatform>();
// Add all the platforms if specified
if(ParseParam("allplatforms"))
if (ParseParam("allplatforms"))
{
foreach(UnrealTargetPlatform Platform in Enum.GetValues(typeof(UnrealTargetPlatform)))
Platforms = UnrealTargetPlatform.GetValidPlatforms().ToList();
}
else
{
// Get the list of platform names
string[] PlatformNames = ParseParamValue("platforms", BuildHostPlatform.Current.Platform.ToString()).Split('+');
// Parse the platforms
foreach (string PlatformName in PlatformNames)
{
if(!Platforms.Contains(Platform))
UnrealBuildTool.UnrealTargetPlatform Platform;
if (!UnrealTargetPlatform.TryParse(PlatformName, out Platform))
{
Platforms.Add(Platform);
throw new AutomationException("Unknown platform specified on command line - '{0}' - valid platforms are {1}", PlatformName, String.Join("/", UnrealTargetPlatform.GetValidPlatformNames()));
}
Platforms.Add(Platform);
}
}