From 8ba99b94dea0e126ab6da39a8428887ef22d14f5 Mon Sep 17 00:00:00 2001 From: josh adams Date: Sat, 16 Feb 2019 07:13:44 -0500 Subject: [PATCH] - Proper fix to merge conflicts #jira nojira [FYI] bob.tellez #rb none #ROBOMERGE-OWNER: ryan.vance #ROBOMERGE-AUTHOR: josh.adams #ROBOMERGE-SOURCE: CL 4974522 in //UE4/Main/... #ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) [CL 5032626 by josh adams in Dev-VR branch] --- .../CopyBuildToStagingDirectory.Automation.cs | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs b/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs index 690c78695bd3..86da41ba14c8 100644 --- a/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs +++ b/Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs @@ -1886,7 +1886,27 @@ public partial class Project : CommandUtils { FileReference PrimaryOrderFile = (PakOrderFileLocations.Count >= 1) ? PakOrderFileLocations[0] : null; FileReference SecondaryOrderFile = (PakOrderFileLocations.Count >= 2) ? PakOrderFileLocations[1] : null; - Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PrimaryOrderFile, SC.StageTargetPlatform.GetPlatformPakCommandLine(Params, SC) + CompressionFormats + " " + Params.AdditionalPakOptions, PakParams.bCompressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath, PakParams.EncryptionKeyGuid, SecondaryOrderFile)); + + string BulkOption = ""; + { + ConfigHierarchy PlatformGameConfig; + if (Params.EngineConfigs.TryGetValue(SC.StageTargetPlatform.PlatformType, out PlatformGameConfig)) + { + bool bMasterEnable = false; + PlatformGameConfig.GetBool("MemoryMappedFiles", "MasterEnable", out bMasterEnable); + if (bMasterEnable) + { + int Value = 0; + PlatformGameConfig.GetInt32("MemoryMappedFiles", "Alignment", out Value); + if (Value > 0) + { + BulkOption = String.Format(" -AlignForMemoryMapping={0}", Value); + } + } + } + } + + Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PrimaryOrderFile, SC.StageTargetPlatform.GetPlatformPakCommandLine(Params, SC) + BulkOption + CompressionFormats + " " + Params.AdditionalPakOptions, PakParams.bCompressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath, PakParams.EncryptionKeyGuid, SecondaryOrderFile)); LogNames.Add(OutputLocation.GetFileNameWithoutExtension()); } }