release 1.6.2

jagt · jagt · commit 46077628cda0 · 2024-05-18T08:57:47.000+08:00
diff --git a/DataConfig/Source/DataConfigCore/Private/DataConfig/DcEnv.cpp b/DataConfig/Source/DataConfigCore/Private/DataConfig/DcEnv.cpp
@@ -28,10 +28,15 @@ FDcDiagnostic& FDcEnv::Diag(FDcErrorCode InErr)
 
 void FDcEnv::FlushDiags()
 {
+	if (Diagnostics.Num() == 0)
+		return;
+
 	if (DiagConsumer.IsValid())
 	{
 		for (FDcDiagnostic& Diag : Diagnostics)
 			DiagConsumer->HandleDiagnostic(Diag);
+
+		DiagConsumer->OnPostFlushDiags();
 	}
 
 	Diagnostics.Empty();
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/DcVersion.h b/DataConfig/Source/DataConfigCore/Public/DataConfig/DcVersion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define DATA_CONFIG_CORE_VERSION "1.6.1"
-#define DATA_CONFIG_CORE_VERSION_NUMBER 10601
+#define DATA_CONFIG_CORE_VERSION "1.6.2"
+#define DATA_CONFIG_CORE_VERSION_NUMBER 10602
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/Diagnostic/DcDiagnostic.h b/DataConfig/Source/DataConfigCore/Public/DataConfig/Diagnostic/DcDiagnostic.h
@@ -143,6 +143,8 @@ FORCEINLINE FDcDiagnostic& operator<<(FDcDiagnostic& Diag, const FFieldVariant&
 struct DATACONFIGCORE_API IDcDiagnosticConsumer : public TSharedFromThis<IDcDiagnosticConsumer>
 {
 	virtual void HandleDiagnostic(FDcDiagnostic& Diag) = 0;
+	virtual void OnPostFlushDiags() {};
+
 	virtual ~IDcDiagnosticConsumer() = default;
 };
 
diff --git a/DataConfig/Source/DataConfigCore/Public/DataConfig/SerDe/DcSerDeUtils.inl b/DataConfig/Source/DataConfigCore/Public/DataConfig/SerDe/DcSerDeUtils.inl
@@ -450,7 +450,6 @@ FORCEINLINE_DEBUGGABLE FDcResult DcPipe_Dispatch(EDcDataEntry Next, TReader* Rea
 		default:
 			return DcNoEntry();
 	}
-	return DcNoEntry();
 }
 
 template<typename TReader>
diff --git a/DataConfig/Source/DataConfigEditorExtra/DataConfigEditorExtra.Build.cs b/DataConfig/Source/DataConfigEditorExtra/DataConfigEditorExtra.Build.cs
@@ -25,6 +25,7 @@ public DataConfigEditorExtra(ReadOnlyTargetRules Target) : base(Target)
 			"ToolMenus",
 			"Kismet",
 			"KismetCompiler",
+			"MessageLog",
 			});
 
 	}
diff --git a/DataConfig/Source/DataConfigEditorExtra/Private/DcEditorExtraModule.cpp b/DataConfig/Source/DataConfigEditorExtra/Private/DcEditorExtraModule.cpp
@@ -1,7 +1,9 @@
 #include "DcEditorExtraModule.h"
 
 #include "ContentBrowserModule.h"
+#include "MessageLogModule.h"
 #include "Modules/ModuleManager.h"
+#include "Logging/MessageLog.h"
 
 #include "DataConfig/DcTypes.h"
 #include "DataConfig/DcEnv.h"
@@ -10,23 +12,45 @@
 #include "DataConfig/EditorExtra/Deserialize/DcDeserializeGameplayAbility.h"
 #include "DataConfig/Automation/DcAutomation.h"
 
+struct FDcMessageLogDiagnosticConsumer : public IDcDiagnosticConsumer
+{
+	void HandleDiagnostic(FDcDiagnostic& Diag) override
+	{
+		FMessageLog MessageLog("DataConfig");
+		MessageLog.Message(EMessageSeverity::Error, FText::FromString(DcDiagnosticToString(Diag)));
+	}
+
+	void OnPostFlushDiags() override
+	{
+		if (FMessageLogModule* MessageLogModule = FModuleManager::LoadModulePtr<FMessageLogModule>("MessageLog"))
+		{
+			MessageLogModule->OpenMessageLog(TEXT("DataConfig"));
+		}
+	};
+};
+
 void FDcEditorExtraModule::StartupModule()
 {
 	UE_LOG(LogDataConfigCore, Log, TEXT("DcEditorExtraModule module starting up"));
 	DcRegisterDiagnosticGroup(&DcDEditorExtra::Details);
 
-
 	auto &ContentBrowserModule = FModuleManager::LoadModuleChecked<FContentBrowserModule>(TEXT("ContentBrowser"));
 	auto &ContextMenuExtenders = ContentBrowserModule.GetAllAssetViewContextMenuExtenders();
 	ContextMenuExtenders.Add(FContentBrowserMenuExtender_SelectedAssets::CreateStatic(DcEditorExtra::GameplayAbilityEffectExtender));
 	ContextMenuExtenders.Add(FContentBrowserMenuExtender_SelectedAssets::CreateStatic(DcEditorExtra::DumpAssetToLogExtender));
 	ContentExplorerExtenderHandlers.Add(ContextMenuExtenders.Last().GetHandle());
 	ContentExplorerExtenderHandlers.Add(ContextMenuExtenders.Last().GetHandle());
+
+	FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>("MessageLog");
+	FMessageLogInitializationOptions InitOptions;
+	InitOptions.bAllowClear = true;
+	MessageLogModule.RegisterLogListing("DataConfig", FText::FromString(TEXT("DataConfig")), InitOptions);
+
+	DcEnv().DiagConsumer = MakeShareable(new FDcMessageLogDiagnosticConsumer());
 }
 
 void FDcEditorExtraModule::ShutdownModule()
 {
-	DcShutDown();
 	UE_LOG(LogDataConfigCore, Log, TEXT("DcEditorExtraModule module shutting down"));
 
 	if (ContentExplorerExtenderHandlers.Num() > 0 && FModuleManager::Get().IsModuleLoaded("ContentBrowser"))
@@ -40,6 +64,9 @@ void FDcEditorExtraModule::ShutdownModule()
 
 		ContentExplorerExtenderHandlers.Empty();
 	}
+
+	FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>("MessageLog");
+	MessageLogModule.UnregisterLogListing("DataConfig");
 }
 
 IMPLEMENT_MODULE(FDcEditorExtraModule, DataConfigEditorExtra);
diff --git a/DataConfig/Source/DataConfigEngineExtra/DataConfigEngineExtra.Build.cs b/DataConfig/Source/DataConfigEngineExtra/DataConfigEngineExtra.Build.cs
@@ -10,7 +10,6 @@ public DataConfigEngineExtra(ReadOnlyTargetRules Target) : base(Target)
 			"Core",
 			"CoreUObject",
 			"Engine",
-			"MessageLog",
 			"GameplayTags",
 			"GameplayAbilities",
 			"DataConfigCore",
diff --git a/DataConfig/Source/DataConfigEngineExtra/Private/DataConfig/EngineExtra/SerDe/DcJsonBlueprintLibrary.cpp b/DataConfig/Source/DataConfigEngineExtra/Private/DataConfig/EngineExtra/SerDe/DcJsonBlueprintLibrary.cpp
@@ -44,7 +44,6 @@
 #include "Engine/UserDefinedStruct.h"
 #include "Engine/UserDefinedEnum.h"
 #include "GameplayTags.h"
-#include "MessageLogModule.h"
 #if !UE_VERSION_OLDER_THAN(5, 4, 0)
 #include "UObject/VerseValueProperty.h"
 #endif // !UE_VERSION_OLDER_THAN(5, 4, 0)
@@ -79,7 +78,9 @@ static void LazyInitializeSerializer(TOptional<FDcSerializer>& Serializer, bool
 	{
 		using namespace DcExtra;
 
+#if WITH_EDITORONLY_DATA
 		Serializer->AddPredicatedHandler(FDcSerializePredicate::CreateStatic(PredicateIsBase64Blob), FDcSerializeDelegate::CreateStatic(HandleBase64BlobSerialize));
+#endif // WITH_EDITORONLY_DATA
 
 		Serializer->AddStructHandler(TBaseStructure<FDcAnyStruct>::Get(), FDcSerializeDelegate::CreateStatic(HandlerDcAnyStructSerialize));
 
@@ -146,7 +147,9 @@ static void LazyInitializeDeserializer(TOptional<FDcDeserializer>& Deserializer,
 	{
 		using namespace DcExtra;
 
+#if WITH_EDITORONLY_DATA
 		Deserializer->AddPredicatedHandler(FDcDeserializePredicate::CreateStatic(PredicateIsBase64Blob), FDcDeserializeDelegate::CreateStatic(HandleBase64BlobDeserialize));
+#endif // WITH_EDITORONLY_DATA
 
 		Deserializer->AddStructHandler(TBaseStructure<FDcAnyStruct>::Get(), FDcDeserializeDelegate::CreateStatic(HandlerDcAnyStructDeserialize));
 
@@ -273,14 +276,6 @@ static FDcResult _Load(bool bRoot, TOptional<FDcDeserializer>& Deserializer, FDc
 	return DcOk();
 }
 
-static void _TryOpenDataConfigMessageLog()
-{
-	if (FMessageLogModule* MessageLogModule = FModuleManager::LoadModulePtr<FMessageLogModule>("MessageLog"))
-	{
-		MessageLogModule->OpenMessageLog(TEXT("DataConfig"));
-	}
-}
-
 }
 
 DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execDumpValue)
@@ -316,7 +311,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execDumpValue)
 		if (!bResult)
 		{
 			DcEnv().FlushDiags();
-			_TryOpenDataConfigMessageLog();
 		}
 		P_NATIVE_END
 	}
@@ -354,7 +348,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execDumpObject)
 		if (!bResult)
 		{
 			DcEnv().FlushDiags();
-			_TryOpenDataConfigMessageLog();
 		}
 		P_NATIVE_END
 	}
@@ -395,7 +388,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execLoadValue)
 		if (!bResult)
 		{
 			DcEnv().FlushDiags();
-			_TryOpenDataConfigMessageLog();
 		}
 		P_NATIVE_END
 	}
@@ -434,7 +426,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execLoadObject)
 		if (!bResult)
 		{
 			DcEnv().FlushDiags();
-			_TryOpenDataConfigMessageLog();
 		}
 		P_NATIVE_END
 	}
diff --git a/DataConfig/Source/DataConfigEngineExtra/Private/DataConfig/EngineExtra/SerDe/DcSerDeBlueprint.cpp b/DataConfig/Source/DataConfigEngineExtra/Private/DataConfig/EngineExtra/SerDe/DcSerDeBlueprint.cpp
@@ -334,12 +334,17 @@ FDcResult HandlerBPEnumDeserialize(FDcDeserializeContext& Ctx)
 	};
 
 	bool bIsBitFlags;
+
+#if WITH_EDITORONLY_DATA
 #if WITH_METADATA
 	bIsBitFlags = Enum->HasMetaData(TEXT("Bitflags"));
 #else
 	//	Program target is missing `UEnum::HasMetaData`
 	bIsBitFlags = ((UField*)Enum)->HasMetaData(TEXT("Bitflags"));
-#endif
+#endif // WITH_METADATA
+#else
+	bIsBitFlags = false;
+#endif // WITH_EDITORONLY_DATA
 
 	if (!bIsBitFlags)
 	{
@@ -444,12 +449,16 @@ FDcResult HandlerBPEnumSerialize(FDcSerializeContext& Ctx)
 
 
 	bool bIsBitFlags;
+#if WITH_EDITORONLY_DATA
 #if WITH_METADATA
 	bIsBitFlags = Enum->HasMetaData(TEXT("Bitflags"));
 #else
 	//	Program target is missing `UEnum::HasMetaData`
 	bIsBitFlags = ((UField*)Enum)->HasMetaData(TEXT("Bitflags"));
-#endif
+#endif // WITH_METADATA
+#else
+	bIsBitFlags = false;
+#endif // WITH_EDITORONLY_DATA
 
 	UUserDefinedEnum* BPEnum = Cast<UUserDefinedEnum>(Enum);
 	if (!bIsBitFlags)
diff --git a/DataConfig/Source/DataConfigEngineExtra/Private/DcEngineExtraModule.cpp b/DataConfig/Source/DataConfigEngineExtra/Private/DcEngineExtraModule.cpp
@@ -1,24 +1,11 @@
 #include "DcEngineExtraModule.h"
 
-#include "MessageLogModule.h"
-#include "Logging/MessageLog.h"
 #include "GameplayTagsManager.h"
 
 #include "DataConfig/DcEnv.h"
 #include "DataConfig/Extra/Diagnostic/DcDiagnosticExtra.h"
 #include "DataConfig/EngineExtra/Diagnostic/DcDiagnosticEngineExtra.h"
 
-
-struct FDcMessageLogDiagnosticConsumer : public IDcDiagnosticConsumer
-{
-	void HandleDiagnostic(FDcDiagnostic& Diag) override
-	{
-		FMessageLog MessageLog("DataConfig");
-		MessageLog.Message(EMessageSeverity::Error, FText::FromString(DcDiagnosticToString(Diag)));
-	}
-};
-
-
 static void _PopulateEngineExtraGameplayTagFixtures()
 {
 	UGameplayTagsManager::Get().AddNativeGameplayTag(TEXT("DataConfig.Foo.Bar"));
@@ -35,22 +22,13 @@ void FDcEngineExtraModule::StartupModule()
 	_PopulateEngineExtraGameplayTagFixtures();
 
 	DcStartUp(EDcInitializeAction::Minimal);
-	DcEnv().DiagConsumer = MakeShareable(new FDcMessageLogDiagnosticConsumer());
-
-	FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>("MessageLog");
-	FMessageLogInitializationOptions InitOptions;
-	InitOptions.bAllowClear = true;
-	MessageLogModule.RegisterLogListing("DataConfig", FText::FromString(TEXT("DataConfig")), InitOptions);
 }
 
 void FDcEngineExtraModule::ShutdownModule()
 {
 	UE_LOG(LogDataConfigCore, Log, TEXT("DcEngineExtraModule module shutting down"));
 
 	DcShutDown();
-
-	FMessageLogModule& MessageLogModule = FModuleManager::LoadModuleChecked<FMessageLogModule>("MessageLog");
-	MessageLogModule.UnregisterLogListing("DataConfig");
 }
 
 IMPLEMENT_MODULE(FDcEngineExtraModule, DataConfigEngineExtra);
diff --git a/DataConfig/Source/DataConfigEngineExtra5/Private/DataConfig/EngineExtra/SerDe/DcSerDeInstancedStruct.cpp b/DataConfig/Source/DataConfigEngineExtra5/Private/DataConfig/EngineExtra/SerDe/DcSerDeInstancedStruct.cpp
@@ -54,6 +54,7 @@ FDcResult DcHandlerDeserializeInstancedStruct(
 		FField* StructField = Datum.Property.ToField();
 		check(StructField);
 
+#if WITH_EDITORONLY_DATA
 		if (StructField->HasMetaData(TEXT("BaseStruct")))
 		{
 			const FString& BaseStructStr = StructField->GetMetaData(TEXT("BaseStruct"));
@@ -63,6 +64,7 @@ FDcResult DcHandlerDeserializeInstancedStruct(
 			if (!LoadStruct->IsChildOf(BaseStruct))
 				return DC_FAIL(DcDSerDe, StructLhsIsNotChildOfRhs) << LoadStruct->GetFName() << BaseStructStr;
 		}
+#endif // WITH_EDITORONLY_DATA
 
 		InstancedStructPtr->InitializeAs(LoadStruct, nullptr);
 
diff --git a/Misc/Docs/Source/Changes.md b/Misc/Docs/Source/Changes.md
@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.6.2 - 2024-5-18
+
+- Misc Shipping configuration build fixes.
+
 ## 1.6.1 - 2024-4-28
 
 - Fix compilation for UE 5.4.

Original file line number	Diff line number	Diff line change
`@@ -28,10 +28,15 @@ FDcDiagnostic& FDcEnv::Diag(FDcErrorCode InErr)`
`28`	`28`
`29`	`29`	`void FDcEnv::FlushDiags()`
`30`	`30`	`{`
	`31`	`+ if (Diagnostics.Num() == 0)`
	`32`	`+ return;`
	`33`	`+`
`31`	`34`	`if (DiagConsumer.IsValid())`
`32`	`35`	`{`
`33`	`36`	`for (FDcDiagnostic& Diag : Diagnostics)`
`34`	`37`	`DiagConsumer->HandleDiagnostic(Diag);`
	`38`	`+`
	`39`	`+ DiagConsumer->OnPostFlushDiags();`
`35`	`40`	`}`
`36`	`41`
`37`	`42`	`Diagnostics.Empty();`
Original file line number	Diff line number	Diff line change
`@@ -143,6 +143,8 @@ FORCEINLINE FDcDiagnostic& operator<<(FDcDiagnostic& Diag, const FFieldVariant&`
`143`	`143`	`struct DATACONFIGCORE_API IDcDiagnosticConsumer : public TSharedFromThis<IDcDiagnosticConsumer>`
`144`	`144`	`{`
`145`	`145`	`virtual void HandleDiagnostic(FDcDiagnostic& Diag) = 0;`
	`146`	`+ virtual void OnPostFlushDiags() {};`
	`147`	`+`
`146`	`148`	`virtual ~IDcDiagnosticConsumer() = default;`
`147`	`149`	`};`
`148`	`150`
Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,6 @@ FORCEINLINE_DEBUGGABLE FDcResult DcPipe_Dispatch(EDcDataEntry Next, TReader* Rea`
`450`	`450`	`default:`
`451`	`451`	`return DcNoEntry();`
`452`	`452`	`}`
`453`		`- return DcNoEntry();`
`454`	`453`	`}`
`455`	`454`
`456`	`455`	`template<typename TReader>`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ public DataConfigEditorExtra(ReadOnlyTargetRules Target) : base(Target)`
`25`	`25`	`"ToolMenus",`
`26`	`26`	`"Kismet",`
`27`	`27`	`"KismetCompiler",`
	`28`	`+ "MessageLog",`
`28`	`29`	`});`
`29`	`30`
`30`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@`
`44`	`44`	`#include "Engine/UserDefinedStruct.h"`
`45`	`45`	`#include "Engine/UserDefinedEnum.h"`
`46`	`46`	`#include "GameplayTags.h"`
`47`		`-#include "MessageLogModule.h"`
`48`	`47`	`#if !UE_VERSION_OLDER_THAN(5, 4, 0)`
`49`	`48`	`#include "UObject/VerseValueProperty.h"`
`50`	`49`	`#endif // !UE_VERSION_OLDER_THAN(5, 4, 0)`
`@@ -79,7 +78,9 @@ static void LazyInitializeSerializer(TOptional<FDcSerializer>& Serializer, bool`
`79`	`78`	`{`
`80`	`79`	`using namespace DcExtra;`
`81`	`80`
	`81`	`+#if WITH_EDITORONLY_DATA`
`82`	`82`	`Serializer->AddPredicatedHandler(FDcSerializePredicate::CreateStatic(PredicateIsBase64Blob), FDcSerializeDelegate::CreateStatic(HandleBase64BlobSerialize));`
	`83`	`+#endif // WITH_EDITORONLY_DATA`
`83`	`84`
`84`	`85`	`Serializer->AddStructHandler(TBaseStructure<FDcAnyStruct>::Get(), FDcSerializeDelegate::CreateStatic(HandlerDcAnyStructSerialize));`
`85`	`86`
`@@ -146,7 +147,9 @@ static void LazyInitializeDeserializer(TOptional<FDcDeserializer>& Deserializer,`
`146`	`147`	`{`
`147`	`148`	`using namespace DcExtra;`
`148`	`149`
	`150`	`+#if WITH_EDITORONLY_DATA`
`149`	`151`	`Deserializer->AddPredicatedHandler(FDcDeserializePredicate::CreateStatic(PredicateIsBase64Blob), FDcDeserializeDelegate::CreateStatic(HandleBase64BlobDeserialize));`
	`152`	`+#endif // WITH_EDITORONLY_DATA`
`150`	`153`
`151`	`154`	`Deserializer->AddStructHandler(TBaseStructure<FDcAnyStruct>::Get(), FDcDeserializeDelegate::CreateStatic(HandlerDcAnyStructDeserialize));`
`152`	`155`
`@@ -273,14 +276,6 @@ static FDcResult _Load(bool bRoot, TOptional<FDcDeserializer>& Deserializer, FDc`
`273`	`276`	`return DcOk();`
`274`	`277`	`}`
`275`	`278`
`276`		`-static void _TryOpenDataConfigMessageLog()`
`277`		`-{`
`278`		`- if (FMessageLogModule* MessageLogModule = FModuleManager::LoadModulePtr<FMessageLogModule>("MessageLog"))`
`279`		`- {`
`280`		`- MessageLogModule->OpenMessageLog(TEXT("DataConfig"));`
`281`		`- }`
`282`		`-}`
`283`		`-`
`284`	`279`	`}`
`285`	`280`
`286`	`281`	`DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execDumpValue)`
`@@ -316,7 +311,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execDumpValue)`
`316`	`311`	`if (!bResult)`
`317`	`312`	`{`
`318`	`313`	`DcEnv().FlushDiags();`
`319`		`- _TryOpenDataConfigMessageLog();`
`320`	`314`	`}`
`321`	`315`	`P_NATIVE_END`
`322`	`316`	`}`
`@@ -354,7 +348,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execDumpObject)`
`354`	`348`	`if (!bResult)`
`355`	`349`	`{`
`356`	`350`	`DcEnv().FlushDiags();`
`357`		`- _TryOpenDataConfigMessageLog();`
`358`	`351`	`}`
`359`	`352`	`P_NATIVE_END`
`360`	`353`	`}`
`@@ -395,7 +388,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execLoadValue)`
`395`	`388`	`if (!bResult)`
`396`	`389`	`{`
`397`	`390`	`DcEnv().FlushDiags();`
`398`		`- _TryOpenDataConfigMessageLog();`
`399`	`391`	`}`
`400`	`392`	`P_NATIVE_END`
`401`	`393`	`}`
`@@ -434,7 +426,6 @@ DEFINE_FUNCTION(UDcJsonBlueprintLibrary::execLoadObject)`
`434`	`426`	`if (!bResult)`
`435`	`427`	`{`
`436`	`428`	`DcEnv().FlushDiags();`
`437`		`- _TryOpenDataConfigMessageLog();`
`438`	`429`	`}`
`439`	`430`	`P_NATIVE_END`
`440`	`431`	`}`