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

Add HasExplicitPlatforms property to uplugin definitions, allowing the SupportedTargetPlatforms and WhitelistPlatforms fields to be entirely defined in child plugins. The existing functionality means that an empty platform list implies "all platforms".

Browse Source 
#jira UECON-417
#rb ben.marsh

[CL 16531379 by David Harvey in ue5-main branch]
This commit is contained in:
David Harvey
2021-06-02 04:27:26 -04:00
parent cad6827212
commit e581358a11
12 changed files with 130 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Engine/Source/Runtime/Projects/Private/PluginReferenceDescriptor.cpp
View File

@@ -31,6 +31,7 @@ FPluginReferenceDescriptor::FPluginReferenceDescriptor( const FString& InName, b
: Name(InName)
, bEnabled(bInEnabled)
, bOptional(false)
, bHasExplicitPlatforms(false)
{ }
@@ -43,7 +44,7 @@ bool FPluginReferenceDescriptor::IsEnabledForPlatform( const FString& Platform )
}
// If there is a list of whitelisted platforms, and this isn't one of them, return false
if(WhitelistPlatforms.Num() > 0 && !WhitelistPlatforms.Contains(Platform))
if( (bHasExplicitPlatforms || WhitelistPlatforms.Num() > 0) && !WhitelistPlatforms.Contains(Platform))
{
return false;
}
@@ -105,7 +106,14 @@ bool FPluginReferenceDescriptor::IsEnabledForTargetConfiguration(EBuildConfigura
bool FPluginReferenceDescriptor::IsSupportedTargetPlatform(const FString& Platform) const
{
return SupportedTargetPlatforms.Num() == 0 || SupportedTargetPlatforms.Contains(Platform);
if (bHasExplicitPlatforms)
{
return SupportedTargetPlatforms.Contains(Platform);
}
else
{
return SupportedTargetPlatforms.Num() == 0 || SupportedTargetPlatforms.Contains(Platform);
}
}
bool FPluginReferenceDescriptor::Read( const FJsonObject& Object, FText& OutFailReason )
@@ -145,6 +153,7 @@ bool FPluginReferenceDescriptor::Read( const FJsonObject& Object, FText& OutFail
// Get the supported platform list
Object.TryGetStringArrayField(TEXT("SupportedTargetPlatforms"), SupportedTargetPlatforms);
Object.TryGetBoolField(TEXT("HasExplicitPlatforms"), bHasExplicitPlatforms);
return true;
}
@@ -315,6 +324,15 @@ void FPluginReferenceDescriptor::UpdateJson(FJsonObject& JsonObject) const
{
JsonObject.RemoveField(TEXT("SupportedTargetPlatforms"));
}
if (bHasExplicitPlatforms)
{
JsonObject.SetBoolField(TEXT("HasExplicitPlatforms"), bHasExplicitPlatforms);
}
else
{
JsonObject.RemoveField(TEXT("HasExplicitPlatforms"));
}
}
void FPluginReferenceDescriptor::WriteArray(TJsonWriter<>& Writer, const TCHAR* ArrayName, const TArray<FPluginReferenceDescriptor>& Plugins)