ROBOMERGE conflict 5630547 resolved UE-71953 - Blueprint iOS projects can't package For Distribution

#jira UE-71953
#rb Jack.Porter

#ROBOMERGE-OWNER: lina.halper
#ROBOMERGE-AUTHOR: cosmin.sulea
#ROBOMERGE-SOURCE: CL 5630708 in //UE4/Main/...
#ROBOMERGE-BOT: ANIM (Main -> Dev-Anim)

[CL 5635374 by cosmin sulea in Dev-Anim branch]
This commit is contained in:
cosmin sulea
2019-03-28 16:59:55 -04:00
parent f1dc33cb04
commit 0a184ca5c6
9 changed files with 144 additions and 55 deletions

View File

@@ -32,6 +32,11 @@ namespace UnrealBuildTool
/// </summary>
bool bForDistribution = false;
/// <summary>
/// Override BundleID
/// </summary>
string BundleIdentifier = "";
public XcodeProjectFileGenerator(FileReference InOnlyGameProject, CommandLineArguments CommandLine)
: base(InOnlyGameProject)
{
@@ -39,6 +44,10 @@ namespace UnrealBuildTool
{
bForDistribution = true;
}
if (CommandLine.HasValue("-bundleID="))
{
BundleIdentifier = CommandLine.GetString("-bundleID=");
}
}
/// <summary>
@@ -99,7 +108,7 @@ namespace UnrealBuildTool
/// <returns>The newly allocated project file object</returns>
protected override ProjectFile AllocateProjectFile(FileReference InitFilePath)
{
return new XcodeProjectFile(InitFilePath, OnlyGameProject, bForDistribution);
return new XcodeProjectFile(InitFilePath, OnlyGameProject, bForDistribution, BundleIdentifier);
}
/// ProjectFileGenerator interface