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
Files
f59865ad4ade9d283fff92c9910f4fd39ca73ec9
UnrealEngineUWP/Engine/Source/Programs/UnrealHeaderTool/Private/Manifest.cpp

179 lines
8.7 KiB
C++
Raw Normal View History

Update copyright notices to 2015. [CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
// Copyright 1998-2015 Epic Games, Inc. All Rights Reserved.
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
#include "UnrealHeaderTool.h"
UBT: More detailed module types. ScriptPlugins can now ingore modules by their type. [CL 2081573 by Robert Manuszewski in Main branch]
2014-05-22 01:20:24 -04:00
#include "IScriptGeneratorPluginInterface.h"
Fixed UHT build error [CL 2038735 by Michael Trepka in Main branch]
2014-04-23 16:42:51 -04:00
#include "Manifest.h"
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
#include "Json.h"
[Github] PR 242 (safe changes). - Code cleanup and minor rearrangement (e.g. variable name changes). - Additions. - Case issues fixed. - Minor fixes (init ordering). [CL 2172690 by Dmitry Rekman in Main branch]
2014-07-08 00:06:17 -04:00
#include "Manifest.h"
Stop UHT from emiting warnings on missing *_Validate and *_Implementation functions Introduce versioning system to GENERATED_*BODY macros Search for existing functions using case sensitive and whole word match. Move checks for existing of *_Validate and *_Implementation functions to *generated.cpp to allow changing that code in hotfixes. #codereview Robert.Manuszewski [CL 2508131 by Mikolaj Sieluzycki in Main branch]
2015-04-10 06:02:22 -04:00
#include "GeneratedCodeVersion.h"
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
namespace
{
template <typename T> struct TJsonFieldType;
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
template <> struct TJsonFieldType<double> { static const EJson Value = EJson::Number; };
template <> struct TJsonFieldType<FString> { static const EJson Value = EJson::String; };
template <> struct TJsonFieldType<bool> { static const EJson Value = EJson::Boolean; };
template <> struct TJsonFieldType<TArray<TSharedPtr<FJsonValue>>> { static const EJson Value = EJson::Array; };
template <> struct TJsonFieldType<TSharedPtr<FJsonObject>> { static const EJson Value = EJson::Object; };
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
template <typename T>
void GetJsonValue(T& OutVal, const TSharedPtr<FJsonValue>& JsonValue, const TCHAR* Outer)
{
if (JsonValue->Type != TJsonFieldType<T>::Value)
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
{
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
FError::Throwf(TEXT("'%s' is the wrong type"), Outer);
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
}
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
JsonValue->AsArgumentType(OutVal);
}
template <typename T>
void GetJsonFieldValue(T& OutVal, const TSharedPtr<FJsonObject>& JsonObject, const TCHAR* FieldName, const TCHAR* Outer)
{
auto JsonValue = JsonObject->Values.Find(FieldName);
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
if (!JsonValue)
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
{
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
FError::Throwf(TEXT("Unable to find field '%s' in '%s'"), FieldName, Outer);
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
}
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
if ((*JsonValue)->Type != TJsonFieldType<T>::Value)
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
{
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
FError::Throwf(TEXT("Field '%s' in '%s' is the wrong type"), Outer);
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
}
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
(*JsonValue)->AsArgumentType(OutVal);
}
void ProcessHeaderArray(FString* OutStringArray, const TArray<TSharedPtr<FJsonValue>>& InJsonArray, const TCHAR* Outer)
{
for (int32 Index = 0, Count = InJsonArray.Num(); Index != Count; ++Index)
{
GetJsonValue(*OutStringArray++, InJsonArray[Index], *FString::Printf(TEXT("%s[%d]"), Outer, Index));
}
}
}
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
FManifest FManifest::LoadFromFile(const FString& Filename)
{
FManifest Result;
FString FilenamePath = FPaths::GetPath(Filename);
FString Json;
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
if (!FFileHelper::LoadFileToString(Json, *Filename))
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
{
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
FError::Throwf(TEXT("Unable to load manifest: %s"), *Filename);
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
}
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
auto RootObject = TSharedPtr<FJsonObject>();
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
auto Reader = TJsonReaderFactory<TCHAR>::Create(Json);
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
if (!FJsonSerializer::Deserialize(Reader, RootObject))
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
{
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
FError::Throwf(TEXT("Manifest is malformed: %s"), *Filename);
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
}
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
TArray<TSharedPtr<FJsonValue>> ModulesArray;
#ttp 333737: UHT should not output anything differently for Rocket - resubmitted after CL# 2068336 was backed out due to UAT rebuild problems. #change Root module path added to include paths. #change Plugins now write intermediates to the project folder. #change All generated #includes are now relative. #change Updated UHTDebugging.manifest to new format. #change Android response files now use relative include paths to prevent overly-large response files. #remove Rocket-specific UHT execution removed. #remove iOS header hack removed. #codereview robert.manuszewski,ben.marsh [CL 2077472 by Steve Robb in Main branch]
2014-05-19 06:57:00 -04:00
GetJsonFieldValue(Result.IsGameTarget, RootObject, TEXT("IsGameTarget"), TEXT("{manifest root}"));
GetJsonFieldValue(Result.RootLocalPath, RootObject, TEXT("RootLocalPath"), TEXT("{manifest root}"));
GetJsonFieldValue(Result.RootBuildPath, RootObject, TEXT("RootBuildPath"), TEXT("{manifest root}"));
GetJsonFieldValue(Result.TargetName, RootObject, TEXT("TargetName"), TEXT("{manifest root}"));
GetJsonFieldValue(ModulesArray, RootObject, TEXT("Modules"), TEXT("{manifest root}"));
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
#ttp 333737: UHT should not output anything differently for Rocket - resubmitted after CL# 2068336 was backed out due to UAT rebuild problems. #change Root module path added to include paths. #change Plugins now write intermediates to the project folder. #change All generated #includes are now relative. #change Updated UHTDebugging.manifest to new format. #change Android response files now use relative include paths to prevent overly-large response files. #remove Rocket-specific UHT execution removed. #remove iOS header hack removed. #codereview robert.manuszewski,ben.marsh [CL 2077472 by Steve Robb in Main branch]
2014-05-19 06:57:00 -04:00
UE_LOG(LogCompile, Log, TEXT("Loaded manifest: %s"), *Filename);
UE_LOG(LogCompile, Log, TEXT("Manifest.IsGameTarget=%s"), Result.IsGameTarget ? TEXT("True") : TEXT("False"));
UE_LOG(LogCompile, Log, TEXT("Manifest.RootLocalPath=%s"), *Result.RootLocalPath);
UE_LOG(LogCompile, Log, TEXT("Manifest.RootBuildPath=%s"), *Result.RootBuildPath);
UE_LOG(LogCompile, Log, TEXT("Manifest.TargetName=%s"), *Result.TargetName);
UE_LOG(LogCompile, Log, TEXT("Manifest.Modules=%d"), ModulesArray.Num());
Script Plugins: better handling of non-game targets [CL 2059708 by Robert Manuszewski in Main branch]
2014-04-30 07:58:33 -04:00
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
Result.RootLocalPath = FPaths::ConvertRelativePathToFull(FilenamePath, Result.RootLocalPath);
Result.RootBuildPath = FPaths::ConvertRelativePathToFull(FilenamePath, Result.RootBuildPath);
// Ensure directories end with a slash, because this aids their use with FPaths::MakePathRelativeTo.
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
if (!Result.RootLocalPath.EndsWith(TEXT("/")))
{
Result.RootLocalPath += TEXT("/");
}
if (!Result.RootBuildPath.EndsWith(TEXT("/")))
{
Result.RootBuildPath += TEXT("/");
}
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
int32 ModuleIndex = 0;
Core: Moved Json out of Core and into its own module The main changes are as follows: 1. moved Json out of Core into own module 'Json' 2. moved 3 i10n classes (Json serializers) from Core into a new module 'Internationalization' * 3. fixed up 2 i10n classes in Core to not instantiate the 3 Json-based classes. instead they are now passed in as a dependency *) (2) and (3) were required to decouple the I10n code in Core from Json. Much of the i10n code probably doesn't belong into Core in the first place, but there is no time to fix this right now. The following cosmetic changes were also made: - NULL to nullptr - namespaced enums to enum classes - renamed the three i10n Json serializer classes to comply with naming conventions - removed file header comments (not used) - documentation, spelling, spacing etc, #UpgradeNotes: If your module is including Json.h then you have to add 'Json' to your Build.cs module dependencies. #ReviewedBy: justin.sargent, saul.abreu [CL 2310420 by Max Preussner in Main branch]
2014-09-25 18:03:04 -04:00
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
for (auto Module : ModulesArray)
{
auto ModuleObj = Module->AsObject();
TArray<TSharedPtr<FJsonValue>> ClassesHeaders;
TArray<TSharedPtr<FJsonValue>> PublicHeaders;
TArray<TSharedPtr<FJsonValue>> PrivateHeaders;
Result.Modules.AddZeroed();
auto& KnownModule = Result.Modules.Last();
FString Outer = FString::Printf(TEXT("Modules[%d]"), ModuleIndex);
Stop UHT from emiting warnings on missing *_Validate and *_Implementation functions Introduce versioning system to GENERATED_*BODY macros Search for existing functions using case sensitive and whole word match. Move checks for existing of *_Validate and *_Implementation functions to *generated.cpp to allow changing that code in hotfixes. #codereview Robert.Manuszewski [CL 2508131 by Mikolaj Sieluzycki in Main branch]
2015-04-10 06:02:22 -04:00
FString GeneratedCodeVersionString;
Merging UE4-Pretest @ 2042161 to UE4 Change 1996384 by Andrew Brown: 322252 - EDITOR: Asset picker displays incorrect text when there are no filter results. Change 1996385 by Andrew Brown: 321858 - CRASH: Assertion failed: (Index >= 0) Function: STransformViewportToolBar::GetLocationGridLabel() STextBlock::CacheDesiredSize() Change 1996977 by Andrew Brown: 309685 - UE4: Adding an event/renaming an event on an event track in Matinee does not update the MatineeActor node in blueprint Change 2034873 by Jaroslaw Palczynski: More robust VS installation detection. Change 2039693 by Jaroslaw Palczynski: 327268 - RocketGDC: POSTLAUNCH: DEV: Make engine more robust against bad Visual Studio environment variables Change 1978978 by Jaroslaw Surowiec: - Removed obsolete AllowEliminatingReferences from the FArchive Change 2020326 by Maciej Mroz: pretest BP K2Node: RemovePinsFromOldPins function moved from K2Node to RemovePinsFromOldPins Change 2017608 by Maciej Mroz: pretest Some changes in SFortMissionEventSelector caused by FPinTypeTreeInfo Change 2017463 by Maciej Mroz: PinTypeSelector can lins unloaded UDStructs Change 2019979 by Maciej Mroz: pretest BP: Crash when performing Diff against Depot with blueprints containing Format Text nodes Change 2024469 by Maciej Mroz: MemberReference variable added to PinType. It's necessary for delegate's signature. Change 2024049 by Maciej Mroz: HasExternalBlueprintDependencies added to UK2Node_DynamicCast Change 2024586 by Maciej Mroz: FillSimpleMemberReference fix Change 2024472 by Maciej Mroz: workaround for delegates signature in pintype removed. Change 2023997 by Maciej Mroz: BP, UDStruc: Class UserDefinedStructEditorData added. It fixes many problems with undo/redo. Change 2021934 by Maciej Mroz: typo in a comment Change 2020355 by Maciej Mroz: Back out changelist 2020342 Change 2022178 by Maciej Mroz: CRASH: PRETEST: EDITOR: UDS: Crash when undo then redo new variable in struct that is used by blueprint Change 2021958 by Maciej Mroz: CRASH: PRETEST: EDITOR: UDS: Crash using variable of a type of copied struct in blueprint Change 1986247 by Maciej Mroz: User Defined Structures: circle dependency fixed. Early version. Change 1985107 by Maciej Mroz: UserDefinedStruct cannot have a field of a non-native type Change 1986278 by Maciej Mroz: pretest ensureMsgf in Struct::link Change 1986250 by Maciej Mroz: User Defined Struct: Non native classes are accepted types od values in structures. Change 1980955 by Maciej Mroz: Using AssetPtr and LazyPtr as UFunction parameter (intput or return) is explicitly disallowed. Change 2041215 by Maciej Mroz: ttp331249 BLOCKER: PRETEST: UI: Survive the Storm is missing the Mission HUD. Change 1984316 by Maciej Mroz: New User Defined Structure. WIP - there are still problems with circular dependencies. Change 2011616 by Maciej Mroz: UserDefinedStructures - various problems fixed. Change 2011609 by Maciej Mroz: more robust HasExternalBlueprintDependencies implementation Change 2016697 by Maciej Mroz: pretest BP: UDStruct - default value propagation in cooked build Change 2016288 by Maciej Mroz: pretest BP: UDStruct: Renaming variables wont break links from make/break nodes Change 1987637 by Maciej Mroz: CustomStruct icons placeholders Change 1987422 by Maciej Mroz: Better tooltips for variables in MyBlueprint Change 1991387 by Maciej Mroz: UDStructures fixes: Change 2029165 by Maciej Mroz: BP: better comment for incomatible pins Change 2030016 by Maciej Mroz: 8PRETEST: EDITOR: UDS: Defaults values aren't updated in struct type variables in blueprints Change 2030017 by Maciej Mroz: Unused UDStructure code removed (PPF_UseDefaultsForUDStructures) Change 2028856 by Maciej Mroz: BP: Pins with PC_Struct type are compatible only with exactly the same structure. (No derived structures are not handled as compatible). Change 2026701 by Maciej Mroz: k2: odd error on an add item node within a function (see attached image in details) Change 2028160 by Maciej Mroz: PRETEST: EDITOR: UDS: When deleting structures just after creating there is always some references in the memory Change 2028165 by Maciej Mroz: BP: BreakHitResult function has proper icon. Change 2033340 by Maciej Mroz: ttp330786 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to breeak nodes for text type of variables Change 2034255 by Maciej Mroz: EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables ttp#330620 Change 2037682 by Maciej Mroz: ttp331309 BLOCKER: PRETEST: CRASH: EDITOR: Crash occurs when performing Diff Against Depot on any Blueprint Change 2033142 by Maciej Mroz: CreateDelegate Node uses internally FMemberReference. Refactor. Change 2032329 by Maciej Mroz: ttp330608 CRASH: PRETEST: EDITOR: UDS: Crash when trying to use struct named 'Color' in blueprint Change 2032420 by Maciej Mroz: ttp330620 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables Change 2033139 by Maciej Mroz: Functions generated from CustomEvents can be also identified by GUID Change 2026631 by Maciej Mroz: BP. UDStruct: Invalid structs are handled better. Change 2025344 by Maciej Mroz: UDStruct enabled by default Change 2026672 by Maciej Mroz: EDITOR: BP: Can't easily remove 'pass-by-reference' pins on ReturnNodes Change 2026411 by Maciej Mroz: ExposeOnSpawn updated, it supports UDStructs, custom native Structs, and it throws compiler error. Change 2025342 by Maciej Mroz: GenerateBlueprintSkeleton moved from BLueprint::Serialize to RegenerateBlueprintClass, because SkeletonClass compilation requires all external dependencies to be loaded and linked. Change 2025570 by Steve Robb: Moved dependency processing to its own function. Change 2033235 by Steve Robb: String improvements Change 2035830 by Steve Robb: Workaround for FriendsAndChat crash in Fortnite. Change 2035115 by Steve Robb: UBT build time regression fixes. Change 2034162 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere Change 2034181 by Steve Robb: Removal of any references to .generated.inl Change 2020165 by Steve Robb: BuildPublicAndPrivateUObjectHeaders factored out into its own function. Change 2020187 by Steve Robb: CreateModuleCompileEnvironment function factored out. Change 2020055 by Steve Robb: Refactoring of Unity.cs to remove complex and duplicate iteration. Change 2020083 by Steve Robb: Another use of dictionary utilities. Change 2031049 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere Change 2025728 by Steve Robb: Refactored the application of a shared PCH file to multiple file into a single ApplySharedPCH function. Change 2020068 by Steve Robb: A couple of helpful utility functions for populating dictionaries. Change 2032307 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere [CL 2054495 by Robert Manuszewski in Main branch]
2014-04-23 20:18:55 -04:00
GetJsonFieldValue(KnownModule.Name, ModuleObj, TEXT("Name"), *Outer);
GetJsonFieldValue(KnownModule.BaseDirectory, ModuleObj, TEXT("BaseDirectory"), *Outer);
#ttp 333737: UHT should not output anything differently for Rocket - resubmitted after CL# 2068336 was backed out due to UAT rebuild problems. #change Root module path added to include paths. #change Plugins now write intermediates to the project folder. #change All generated #includes are now relative. #change Updated UHTDebugging.manifest to new format. #change Android response files now use relative include paths to prevent overly-large response files. #remove Rocket-specific UHT execution removed. #remove iOS header hack removed. #codereview robert.manuszewski,ben.marsh [CL 2077472 by Steve Robb in Main branch]
2014-05-19 06:57:00 -04:00
GetJsonFieldValue(KnownModule.IncludeBase, ModuleObj, TEXT("IncludeBase"), *Outer);
Merging UE4-Pretest @ 2042161 to UE4 Change 1996384 by Andrew Brown: 322252 - EDITOR: Asset picker displays incorrect text when there are no filter results. Change 1996385 by Andrew Brown: 321858 - CRASH: Assertion failed: (Index >= 0) Function: STransformViewportToolBar::GetLocationGridLabel() STextBlock::CacheDesiredSize() Change 1996977 by Andrew Brown: 309685 - UE4: Adding an event/renaming an event on an event track in Matinee does not update the MatineeActor node in blueprint Change 2034873 by Jaroslaw Palczynski: More robust VS installation detection. Change 2039693 by Jaroslaw Palczynski: 327268 - RocketGDC: POSTLAUNCH: DEV: Make engine more robust against bad Visual Studio environment variables Change 1978978 by Jaroslaw Surowiec: - Removed obsolete AllowEliminatingReferences from the FArchive Change 2020326 by Maciej Mroz: pretest BP K2Node: RemovePinsFromOldPins function moved from K2Node to RemovePinsFromOldPins Change 2017608 by Maciej Mroz: pretest Some changes in SFortMissionEventSelector caused by FPinTypeTreeInfo Change 2017463 by Maciej Mroz: PinTypeSelector can lins unloaded UDStructs Change 2019979 by Maciej Mroz: pretest BP: Crash when performing Diff against Depot with blueprints containing Format Text nodes Change 2024469 by Maciej Mroz: MemberReference variable added to PinType. It's necessary for delegate's signature. Change 2024049 by Maciej Mroz: HasExternalBlueprintDependencies added to UK2Node_DynamicCast Change 2024586 by Maciej Mroz: FillSimpleMemberReference fix Change 2024472 by Maciej Mroz: workaround for delegates signature in pintype removed. Change 2023997 by Maciej Mroz: BP, UDStruc: Class UserDefinedStructEditorData added. It fixes many problems with undo/redo. Change 2021934 by Maciej Mroz: typo in a comment Change 2020355 by Maciej Mroz: Back out changelist 2020342 Change 2022178 by Maciej Mroz: CRASH: PRETEST: EDITOR: UDS: Crash when undo then redo new variable in struct that is used by blueprint Change 2021958 by Maciej Mroz: CRASH: PRETEST: EDITOR: UDS: Crash using variable of a type of copied struct in blueprint Change 1986247 by Maciej Mroz: User Defined Structures: circle dependency fixed. Early version. Change 1985107 by Maciej Mroz: UserDefinedStruct cannot have a field of a non-native type Change 1986278 by Maciej Mroz: pretest ensureMsgf in Struct::link Change 1986250 by Maciej Mroz: User Defined Struct: Non native classes are accepted types od values in structures. Change 1980955 by Maciej Mroz: Using AssetPtr and LazyPtr as UFunction parameter (intput or return) is explicitly disallowed. Change 2041215 by Maciej Mroz: ttp331249 BLOCKER: PRETEST: UI: Survive the Storm is missing the Mission HUD. Change 1984316 by Maciej Mroz: New User Defined Structure. WIP - there are still problems with circular dependencies. Change 2011616 by Maciej Mroz: UserDefinedStructures - various problems fixed. Change 2011609 by Maciej Mroz: more robust HasExternalBlueprintDependencies implementation Change 2016697 by Maciej Mroz: pretest BP: UDStruct - default value propagation in cooked build Change 2016288 by Maciej Mroz: pretest BP: UDStruct: Renaming variables wont break links from make/break nodes Change 1987637 by Maciej Mroz: CustomStruct icons placeholders Change 1987422 by Maciej Mroz: Better tooltips for variables in MyBlueprint Change 1991387 by Maciej Mroz: UDStructures fixes: Change 2029165 by Maciej Mroz: BP: better comment for incomatible pins Change 2030016 by Maciej Mroz: 8PRETEST: EDITOR: UDS: Defaults values aren't updated in struct type variables in blueprints Change 2030017 by Maciej Mroz: Unused UDStructure code removed (PPF_UseDefaultsForUDStructures) Change 2028856 by Maciej Mroz: BP: Pins with PC_Struct type are compatible only with exactly the same structure. (No derived structures are not handled as compatible). Change 2026701 by Maciej Mroz: k2: odd error on an add item node within a function (see attached image in details) Change 2028160 by Maciej Mroz: PRETEST: EDITOR: UDS: When deleting structures just after creating there is always some references in the memory Change 2028165 by Maciej Mroz: BP: BreakHitResult function has proper icon. Change 2033340 by Maciej Mroz: ttp330786 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to breeak nodes for text type of variables Change 2034255 by Maciej Mroz: EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables ttp#330620 Change 2037682 by Maciej Mroz: ttp331309 BLOCKER: PRETEST: CRASH: EDITOR: Crash occurs when performing Diff Against Depot on any Blueprint Change 2033142 by Maciej Mroz: CreateDelegate Node uses internally FMemberReference. Refactor. Change 2032329 by Maciej Mroz: ttp330608 CRASH: PRETEST: EDITOR: UDS: Crash when trying to use struct named 'Color' in blueprint Change 2032420 by Maciej Mroz: ttp330620 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables Change 2033139 by Maciej Mroz: Functions generated from CustomEvents can be also identified by GUID Change 2026631 by Maciej Mroz: BP. UDStruct: Invalid structs are handled better. Change 2025344 by Maciej Mroz: UDStruct enabled by default Change 2026672 by Maciej Mroz: EDITOR: BP: Can't easily remove 'pass-by-reference' pins on ReturnNodes Change 2026411 by Maciej Mroz: ExposeOnSpawn updated, it supports UDStructs, custom native Structs, and it throws compiler error. Change 2025342 by Maciej Mroz: GenerateBlueprintSkeleton moved from BLueprint::Serialize to RegenerateBlueprintClass, because SkeletonClass compilation requires all external dependencies to be loaded and linked. Change 2025570 by Steve Robb: Moved dependency processing to its own function. Change 2033235 by Steve Robb: String improvements Change 2035830 by Steve Robb: Workaround for FriendsAndChat crash in Fortnite. Change 2035115 by Steve Robb: UBT build time regression fixes. Change 2034162 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere Change 2034181 by Steve Robb: Removal of any references to .generated.inl Change 2020165 by Steve Robb: BuildPublicAndPrivateUObjectHeaders factored out into its own function. Change 2020187 by Steve Robb: CreateModuleCompileEnvironment function factored out. Change 2020055 by Steve Robb: Refactoring of Unity.cs to remove complex and duplicate iteration. Change 2020083 by Steve Robb: Another use of dictionary utilities. Change 2031049 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere Change 2025728 by Steve Robb: Refactored the application of a shared PCH file to multiple file into a single ApplySharedPCH function. Change 2020068 by Steve Robb: A couple of helpful utility functions for populating dictionaries. Change 2032307 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere [CL 2054495 by Robert Manuszewski in Main branch]
2014-04-23 20:18:55 -04:00
GetJsonFieldValue(KnownModule.GeneratedIncludeDirectory, ModuleObj, TEXT("OutputDirectory"), *Outer);
GetJsonFieldValue(KnownModule.SaveExportedHeaders, ModuleObj, TEXT("SaveExportedHeaders"), *Outer);
GetJsonFieldValue(ClassesHeaders, ModuleObj, TEXT("ClassesHeaders"), *Outer);
GetJsonFieldValue(PublicHeaders, ModuleObj, TEXT("PublicHeaders"), *Outer);
GetJsonFieldValue(PrivateHeaders, ModuleObj, TEXT("PrivateHeaders"), *Outer);
GetJsonFieldValue(KnownModule.PCH, ModuleObj, TEXT("PCH"), *Outer);
GetJsonFieldValue(KnownModule.GeneratedCPPFilenameBase, ModuleObj, TEXT("GeneratedCPPFilenameBase"), *Outer);
Stop UHT from emiting warnings on missing *_Validate and *_Implementation functions Introduce versioning system to GENERATED_*BODY macros Search for existing functions using case sensitive and whole word match. Move checks for existing of *_Validate and *_Implementation functions to *generated.cpp to allow changing that code in hotfixes. #codereview Robert.Manuszewski [CL 2508131 by Mikolaj Sieluzycki in Main branch]
2015-04-10 06:02:22 -04:00
GetJsonFieldValue(GeneratedCodeVersionString, ModuleObj, TEXT("UHTGeneratedCodeVersion"), *Outer);
KnownModule.GeneratedCodeVersion = ToGeneratedCodeVersion(GeneratedCodeVersionString);
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
UBT: More detailed module types. ScriptPlugins can now ingore modules by their type. [CL 2081573 by Robert Manuszewski in Main branch]
2014-05-22 01:20:24 -04:00
FString ModuleTypeText;
GetJsonFieldValue(ModuleTypeText, ModuleObj, TEXT("ModuleType"), *Outer);
KnownModule.ModuleType = EBuildModuleType::Parse(*ModuleTypeText);
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
KnownModule.LongPackageName = FPackageName::ConvertToLongScriptPackageName(*KnownModule.Name);
// Convert relative paths
KnownModule.BaseDirectory = FPaths::ConvertRelativePathToFull(FilenamePath, KnownModule.BaseDirectory);
#ttp 333737: UHT should not output anything differently for Rocket - resubmitted after CL# 2068336 was backed out due to UAT rebuild problems. #change Root module path added to include paths. #change Plugins now write intermediates to the project folder. #change All generated #includes are now relative. #change Updated UHTDebugging.manifest to new format. #change Android response files now use relative include paths to prevent overly-large response files. #remove Rocket-specific UHT execution removed. #remove iOS header hack removed. #codereview robert.manuszewski,ben.marsh [CL 2077472 by Steve Robb in Main branch]
2014-05-19 06:57:00 -04:00
KnownModule.IncludeBase = FPaths::ConvertRelativePathToFull(FilenamePath, KnownModule.IncludeBase);
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
KnownModule.GeneratedIncludeDirectory = FPaths::ConvertRelativePathToFull(FilenamePath, KnownModule.GeneratedIncludeDirectory);
Merging UE4-Pretest @ 2042161 to UE4 Change 1996384 by Andrew Brown: 322252 - EDITOR: Asset picker displays incorrect text when there are no filter results. Change 1996385 by Andrew Brown: 321858 - CRASH: Assertion failed: (Index >= 0) Function: STransformViewportToolBar::GetLocationGridLabel() STextBlock::CacheDesiredSize() Change 1996977 by Andrew Brown: 309685 - UE4: Adding an event/renaming an event on an event track in Matinee does not update the MatineeActor node in blueprint Change 2034873 by Jaroslaw Palczynski: More robust VS installation detection. Change 2039693 by Jaroslaw Palczynski: 327268 - RocketGDC: POSTLAUNCH: DEV: Make engine more robust against bad Visual Studio environment variables Change 1978978 by Jaroslaw Surowiec: - Removed obsolete AllowEliminatingReferences from the FArchive Change 2020326 by Maciej Mroz: pretest BP K2Node: RemovePinsFromOldPins function moved from K2Node to RemovePinsFromOldPins Change 2017608 by Maciej Mroz: pretest Some changes in SFortMissionEventSelector caused by FPinTypeTreeInfo Change 2017463 by Maciej Mroz: PinTypeSelector can lins unloaded UDStructs Change 2019979 by Maciej Mroz: pretest BP: Crash when performing Diff against Depot with blueprints containing Format Text nodes Change 2024469 by Maciej Mroz: MemberReference variable added to PinType. It's necessary for delegate's signature. Change 2024049 by Maciej Mroz: HasExternalBlueprintDependencies added to UK2Node_DynamicCast Change 2024586 by Maciej Mroz: FillSimpleMemberReference fix Change 2024472 by Maciej Mroz: workaround for delegates signature in pintype removed. Change 2023997 by Maciej Mroz: BP, UDStruc: Class UserDefinedStructEditorData added. It fixes many problems with undo/redo. Change 2021934 by Maciej Mroz: typo in a comment Change 2020355 by Maciej Mroz: Back out changelist 2020342 Change 2022178 by Maciej Mroz: CRASH: PRETEST: EDITOR: UDS: Crash when undo then redo new variable in struct that is used by blueprint Change 2021958 by Maciej Mroz: CRASH: PRETEST: EDITOR: UDS: Crash using variable of a type of copied struct in blueprint Change 1986247 by Maciej Mroz: User Defined Structures: circle dependency fixed. Early version. Change 1985107 by Maciej Mroz: UserDefinedStruct cannot have a field of a non-native type Change 1986278 by Maciej Mroz: pretest ensureMsgf in Struct::link Change 1986250 by Maciej Mroz: User Defined Struct: Non native classes are accepted types od values in structures. Change 1980955 by Maciej Mroz: Using AssetPtr and LazyPtr as UFunction parameter (intput or return) is explicitly disallowed. Change 2041215 by Maciej Mroz: ttp331249 BLOCKER: PRETEST: UI: Survive the Storm is missing the Mission HUD. Change 1984316 by Maciej Mroz: New User Defined Structure. WIP - there are still problems with circular dependencies. Change 2011616 by Maciej Mroz: UserDefinedStructures - various problems fixed. Change 2011609 by Maciej Mroz: more robust HasExternalBlueprintDependencies implementation Change 2016697 by Maciej Mroz: pretest BP: UDStruct - default value propagation in cooked build Change 2016288 by Maciej Mroz: pretest BP: UDStruct: Renaming variables wont break links from make/break nodes Change 1987637 by Maciej Mroz: CustomStruct icons placeholders Change 1987422 by Maciej Mroz: Better tooltips for variables in MyBlueprint Change 1991387 by Maciej Mroz: UDStructures fixes: Change 2029165 by Maciej Mroz: BP: better comment for incomatible pins Change 2030016 by Maciej Mroz: 8PRETEST: EDITOR: UDS: Defaults values aren't updated in struct type variables in blueprints Change 2030017 by Maciej Mroz: Unused UDStructure code removed (PPF_UseDefaultsForUDStructures) Change 2028856 by Maciej Mroz: BP: Pins with PC_Struct type are compatible only with exactly the same structure. (No derived structures are not handled as compatible). Change 2026701 by Maciej Mroz: k2: odd error on an add item node within a function (see attached image in details) Change 2028160 by Maciej Mroz: PRETEST: EDITOR: UDS: When deleting structures just after creating there is always some references in the memory Change 2028165 by Maciej Mroz: BP: BreakHitResult function has proper icon. Change 2033340 by Maciej Mroz: ttp330786 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to breeak nodes for text type of variables Change 2034255 by Maciej Mroz: EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables ttp#330620 Change 2037682 by Maciej Mroz: ttp331309 BLOCKER: PRETEST: CRASH: EDITOR: Crash occurs when performing Diff Against Depot on any Blueprint Change 2033142 by Maciej Mroz: CreateDelegate Node uses internally FMemberReference. Refactor. Change 2032329 by Maciej Mroz: ttp330608 CRASH: PRETEST: EDITOR: UDS: Crash when trying to use struct named 'Color' in blueprint Change 2032420 by Maciej Mroz: ttp330620 PRETEST: EDITOR: UDS: Changes of default values aren't apllied to make nodes for text type of variables Change 2033139 by Maciej Mroz: Functions generated from CustomEvents can be also identified by GUID Change 2026631 by Maciej Mroz: BP. UDStruct: Invalid structs are handled better. Change 2025344 by Maciej Mroz: UDStruct enabled by default Change 2026672 by Maciej Mroz: EDITOR: BP: Can't easily remove 'pass-by-reference' pins on ReturnNodes Change 2026411 by Maciej Mroz: ExposeOnSpawn updated, it supports UDStructs, custom native Structs, and it throws compiler error. Change 2025342 by Maciej Mroz: GenerateBlueprintSkeleton moved from BLueprint::Serialize to RegenerateBlueprintClass, because SkeletonClass compilation requires all external dependencies to be loaded and linked. Change 2025570 by Steve Robb: Moved dependency processing to its own function. Change 2033235 by Steve Robb: String improvements Change 2035830 by Steve Robb: Workaround for FriendsAndChat crash in Fortnite. Change 2035115 by Steve Robb: UBT build time regression fixes. Change 2034162 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere Change 2034181 by Steve Robb: Removal of any references to .generated.inl Change 2020165 by Steve Robb: BuildPublicAndPrivateUObjectHeaders factored out into its own function. Change 2020187 by Steve Robb: CreateModuleCompileEnvironment function factored out. Change 2020055 by Steve Robb: Refactoring of Unity.cs to remove complex and duplicate iteration. Change 2020083 by Steve Robb: Another use of dictionary utilities. Change 2031049 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere Change 2025728 by Steve Robb: Refactored the application of a shared PCH file to multiple file into a single ApplySharedPCH function. Change 2020068 by Steve Robb: A couple of helpful utility functions for populating dictionaries. Change 2032307 by Steve Robb: 312775: UObject improvement: Ensure that *.generated.inl is included somewhere [CL 2054495 by Robert Manuszewski in Main branch]
2014-04-23 20:18:55 -04:00
KnownModule.GeneratedCPPFilenameBase = FPaths::ConvertRelativePathToFull(FilenamePath, KnownModule.GeneratedCPPFilenameBase);
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
// Ensure directories end with a slash, because this aids their use with FPaths::MakePathRelativeTo.
if (!KnownModule.BaseDirectory .EndsWith(TEXT("/"))) { KnownModule.BaseDirectory .AppendChar(TEXT('/')); }
#ttp 333737: UHT should not output anything differently for Rocket - resubmitted after CL# 2068336 was backed out due to UAT rebuild problems. #change Root module path added to include paths. #change Plugins now write intermediates to the project folder. #change All generated #includes are now relative. #change Updated UHTDebugging.manifest to new format. #change Android response files now use relative include paths to prevent overly-large response files. #remove Rocket-specific UHT execution removed. #remove iOS header hack removed. #codereview robert.manuszewski,ben.marsh [CL 2077472 by Steve Robb in Main branch]
2014-05-19 06:57:00 -04:00
if (!KnownModule.IncludeBase .EndsWith(TEXT("/"))) { KnownModule.IncludeBase .AppendChar(TEXT('/')); }
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
if (!KnownModule.GeneratedIncludeDirectory.EndsWith(TEXT("/"))) { KnownModule.GeneratedIncludeDirectory.AppendChar(TEXT('/')); }
KnownModule.PublicUObjectClassesHeaders.AddZeroed(ClassesHeaders.Num());
KnownModule.PublicUObjectHeaders .AddZeroed(PublicHeaders .Num());
KnownModule.PrivateUObjectHeaders .AddZeroed(PrivateHeaders.Num());
TArray documentation and a coupld of methods deprecation. Changes mostly in Array.h. The changes in other files are only renames for deprecated functions. [CL 2312616 by Jaroslaw Palczynski in Main branch]
2014-09-29 04:23:44 -04:00
ProcessHeaderArray(KnownModule.PublicUObjectClassesHeaders.GetData(), ClassesHeaders, *(Outer + TEXT(".ClassHeaders")));
ProcessHeaderArray(KnownModule.PublicUObjectHeaders .GetData(), PublicHeaders , *(Outer + TEXT(".PublicHeaders" )));
ProcessHeaderArray(KnownModule.PrivateUObjectHeaders .GetData(), PrivateHeaders, *(Outer + TEXT(".PrivateHeaders")));
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
// Sort the headers alphabetically. This is just to add determinism to the compilation dependency order, since we currently
// don't rely on explicit includes (but we do support 'dependson')
// @todo uht: Ideally, we should sort these by sensical order before passing them in -- or better yet, follow include statements ourselves in here.
KnownModule.PublicUObjectClassesHeaders.Sort();
KnownModule.PublicUObjectHeaders .Sort();
KnownModule.PrivateUObjectHeaders .Sort();
UBT: More detailed module types. ScriptPlugins can now ingore modules by their type. [CL 2081573 by Robert Manuszewski in Main branch]
2014-05-22 01:20:24 -04:00
UE_LOG(LogCompile, Log, TEXT(" %s"), *KnownModule.Name);
UE_LOG(LogCompile, Log, TEXT(" .BaseDirectory=%s"), *KnownModule.BaseDirectory);
UE_LOG(LogCompile, Log, TEXT(" .IncludeBase=%s"), *KnownModule.IncludeBase);
UE_LOG(LogCompile, Log, TEXT(" .GeneratedIncludeDirectory=%s"), *KnownModule.GeneratedIncludeDirectory);
UE_LOG(LogCompile, Log, TEXT(" .SaveExportedHeaders=%s"), KnownModule.SaveExportedHeaders ? TEXT("True") : TEXT("False"));
UE_LOG(LogCompile, Log, TEXT(" .GeneratedCPPFilenameBase=%s"), *KnownModule.GeneratedCPPFilenameBase);
UE_LOG(LogCompile, Log, TEXT(" .ModuleType=%s"), *ModuleTypeText);
Engine source (Main branch up to CL 2037954)
2014-04-02 18:09:23 -04:00
++ModuleIndex;
}
return Result;
}
Reference in New Issue Copy Permalink