Skip to content

Commit 883b7dd

Browse files
jagtjagt
committed
release 1.4.1
1 parent 53b940a commit 883b7dd

35 files changed

Lines changed: 221 additions & 84 deletions

File tree

‎DataConfig/Source/DataConfigCore/DataConfigCore.Build.cs‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ public DataConfigCore(ReadOnlyTargetRules Target) : base(Target)
1010
Type = ModuleType.CPlusPlus;
1111
PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
1212

13-
bEnforceIWYU = true;
13+
#if UE_5_2_OR_LATER
14+
IWYUSupport = IWYUSupport.Full;
15+
#else
16+
bEnforceIWYU = true;
17+
#endif
1418

1519
PublicDependencyModuleNames.AddRange(
1620
new string[] {

‎DataConfig/Source/DataConfigCore/Private/DataConfig/Automation/DcAutomationUtils.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -649,6 +649,7 @@ FString DumpFormat(FDcReader* Reader)
649649
return MoveTemp(Output);
650650
}
651651

652+
#if WITH_EDITORONLY_DATA
652653
// UXXX(meta=(Foo)) only get compiled in `WITH_EDITOR`
653654
// need to manually amend it on Program targets
654655
void AmendMetaData(UField* Field, const FName& MetaKey, const TCHAR* MetaValue)
@@ -666,6 +667,8 @@ void AmendMetaData(UStruct* Struct, const FName& FieldName, const FName& MetaKey
666667
if (!Property->HasMetaData(MetaKey))
667668
Property->SetMetaData(MetaKey, MetaValue);
668669
}
670+
#endif // WITH_EDITORONLY_DATA
671+
669672

670673
FDcPropertyDatum TryGetMemberDatum(const FDcPropertyDatum& Datum, const FName& Name)
671674
{

‎DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/Common/DcCommonDeserializers.cpp‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,20 @@ FDcResult HandlerStringToEnumDeserialize(FDcDeserializeContext& Ctx)
9090
}
9191

9292
bool bIsBitFlags;
93-
#if WITH_METADATA
93+
94+
#if WITH_EDITORONLY_DATA
95+
96+
#if WITH_METADATA
9497
bIsBitFlags = Enum->HasMetaData(TEXT("Bitflags"));
95-
#else
98+
#else
9699
// Program target is missing `UEnum::HasMetaData`
97100
bIsBitFlags = ((UField*)Enum)->HasMetaData(TEXT("Bitflags"));
98-
#endif
101+
#endif
102+
103+
#else // WITH_EDITORONLY_DATA
104+
bIsBitFlags = false;
105+
#endif // WITH_EDITORONLY_DATA
106+
99107

100108
if (!bIsBitFlags)
101109
{

‎DataConfig/Source/DataConfigCore/Private/DataConfig/Deserialize/Handlers/MsgPack/DcMsgPackCommonDeserializers.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,14 @@ FDcResult HandlerMapDeserialize(FDcDeserializeContext& Ctx)
2323

2424
EDcDeserializePredicateResult PredicateIsBlobProperty(FDcDeserializeContext& Ctx)
2525
{
26+
#if WITH_EDITORONLY_DATA
2627
return Ctx.TopProperty().HasMetaData(DcMsgPackUtils::DC_META_MSGPACK_BLOB)
2728
? EDcDeserializePredicateResult::Process
2829
: EDcDeserializePredicateResult::Pass;
30+
#else
31+
return EDcDeserializePredicateResult::Pass;
32+
#endif // WITH_EDITORONLY_DATA
33+
2934
}
3035

3136
FDcResult HandlerBlobDeserialize(FDcDeserializeContext& Ctx)

‎DataConfig/Source/DataConfigCore/Private/DataConfig/Json/DcJsonReader.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,14 +559,14 @@ FDcResult TDcJsonReader<CharType>::ReadStringToken()
559559
return DC_FAIL(DcDJSON, InvalidControlCharInString) << FormatHighlight(Cur, 1);
560560

561561
// then silently load most control chars for now
562-
if (TIsSame<CharType, ANSICHAR>::Value)
562+
if (DcTypeUtils::TIsSame<CharType, ANSICHAR>::Value)
563563
Token.Flag.bStringHasNonAscii = true;
564564

565565
Advance();
566566
}
567567
else
568568
{
569-
if (TIsSame<CharType, ANSICHAR>::Value)
569+
if (DcTypeUtils::TIsSame<CharType, ANSICHAR>::Value)
570570
{
571571
if (!SourceUtils::IsAscii(Char))
572572
Token.Flag.bStringHasNonAscii = true;
@@ -582,7 +582,7 @@ FDcResult TDcJsonReader<CharType>::ReadStringToken()
582582
template <typename CharType>
583583
FString TDcJsonReader<CharType>::ConvertStringTokenToLiteral(SourceRef Ref)
584584
{
585-
if (TIsSame<CharType, ANSICHAR>::Value
585+
if (DcTypeUtils::TIsSame<CharType, ANSICHAR>::Value
586586
&& Token.Flag.bStringHasNonAscii)
587587
{
588588
// UTF8 conv when detects non ascii chars

‎DataConfig/Source/DataConfigCore/Private/DataConfig/Property/DcPropertyTypes.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ namespace DcPropertyTypesDetails
99

1010
static bool _DefaultProcessPropertyPredicate(FProperty* Property)
1111
{
12+
#if WITH_EDITORONLY_DATA
1213
return DcPropertyUtils::IsEffectiveProperty(Property)
1314
&& !Property->HasMetaData(DcPropertyUtils::DC_META_SKIP);
15+
#else
16+
return DcPropertyUtils::IsEffectiveProperty(Property);
17+
#endif // WITH_EDITORONLY_DATA
1418
}
1519

1620
} // namespace DcPropertyTypesDetails

‎DataConfig/Source/DataConfigCore/Private/DataConfig/Serialize/Handlers/Common/DcCommonSerializers.cpp‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,19 @@ FDcResult HandlerEnumToStringSerialize(FDcSerializeContext& Ctx)
8989
}
9090

9191
bool bIsBitFlags;
92-
#if WITH_METADATA
92+
93+
#if WITH_EDITORONLY_DATA
94+
95+
#if WITH_METADATA
9396
bIsBitFlags = Enum->HasMetaData(TEXT("Bitflags"));
94-
#else
97+
#else
9598
// Program target is missing `UEnum::HasMetaData`
9699
bIsBitFlags = ((UField*)Enum)->HasMetaData(TEXT("Bitflags"));
97-
#endif
100+
#endif
101+
102+
#else // WITH_EDITORONLY_DATA
103+
bIsBitFlags = false;
104+
#endif // WITH_EDITORONLY_DATA
98105

99106
if (!bIsBitFlags)
100107
{

‎DataConfig/Source/DataConfigCore/Private/DataConfig/Serialize/Handlers/MsgPack/DcMsgPackCommonSerializers.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ FDcResult HandlerMapSerialize(FDcSerializeContext& Ctx)
2424

2525
EDcSerializePredicateResult PredicateIsBlobProperty(FDcSerializeContext& Ctx)
2626
{
27+
#if WITH_EDITORONLY_DATA
2728
return Ctx.TopProperty().HasMetaData(DcMsgPackUtils::DC_META_MSGPACK_BLOB)
2829
? EDcSerializePredicateResult::Process
2930
: EDcSerializePredicateResult::Pass;
31+
#else
32+
return EDcSerializePredicateResult::Pass;
33+
#endif // WITH_EDITORONLY_DATA
3034
}
3135

3236
FDcResult HandlerBlobSerialize(FDcSerializeContext& Ctx)

‎DataConfig/Source/DataConfigCore/Public/DataConfig/Automation/DcAutomationUtils.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,10 @@ DATACONFIGCORE_API void DumpToLog(FDcReader* Reader);
5454
DATACONFIGCORE_API void DumpToLowLevelDebugOutput(FDcReader* Reader);
5555
DATACONFIGCORE_API FString DumpFormat(FDcReader* Reader);
5656

57+
#if WITH_EDITORONLY_DATA
5758
DATACONFIGCORE_API void AmendMetaData(UField* Field, const FName& MetaKey, const TCHAR* MetaValue);
5859
DATACONFIGCORE_API void AmendMetaData(UStruct* Struct, const FName& FieldName, const FName& MetaKey, const TCHAR* MetaValue);
60+
#endif // WITH_EDITORONLY_DATA
5961

6062
DATACONFIGCORE_API FDcPropertyDatum TryGetMemberDatum(const FDcPropertyDatum& Datum, const FName& Name);
6163

‎DataConfig/Source/DataConfigCore/Public/DataConfig/DcVersion.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#pragma once
22

3-
#define DATA_CONFIG_CORE_VERSION "1.4.0"
4-
#define DATA_CONFIG_CORE_VERSION_NUMBER 10400
3+
#define DATA_CONFIG_CORE_VERSION "1.4.1"
4+
#define DATA_CONFIG_CORE_VERSION_NUMBER 10401

0 commit comments

Comments
 (0)