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

- Changed compression methods to be an FName instead of hardcoded enum

Browse Source 
- Added support for compression plugins
- Removed the Custom compression concept, now using plugins properly
- Modified UnrealPak to use FNames, and allow for multiple compression methods (fallbacks on error or unavailability, etc)
- Added project settings for compression method selection for UnrealPak, and additional settings to be passed to UnrealPak (for instance, to control compression size/speed, etc)
- Deprecated a bunch of old function calls
- Improved pak file "old format" reading ability
- Brought over some changes from Fortnite for pak file encryption and memory savings
- Implemented a parallel compression pull request (#4129) to speed up pak file compression
#jira UE-51294
#rb ben.marsh

[CL 4480944 by Josh Adams in Dev-Core branch]
This commit is contained in:
Josh Adams
2018-10-17 14:18:10 -04:00
parent 88bb3f6de6
commit 4f63a76b48
93 changed files with 1344 additions and 1027 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Engine/Source/Programs/AutomationTool/Scripts/CopyBuildToStagingDirectory.Automation.cs
View File

@@ -1428,6 +1428,20 @@ public partial class Project : CommandUtils
const string OutputFilenameExtension = ".pak";
// read some compression settings from the project (once, shared across all pak commands)
ConfigHierarchy PlatformGameConfig = ConfigCache.ReadHierarchy(ConfigHierarchyType.Game, DirectoryReference.FromFile(Params.RawProjectPath), SC.StageTargetPlatform.IniPlatformType);
string CompressionFormats = "";
if (PlatformGameConfig.GetString("/Script/UnrealEd.ProjectPackagingSettings", "PakFileCompressionFormats", out CompressionFormats))
{
CompressionFormats = " -compressionformats=" + CompressionFormats;
}
// the game may want to control compression settings, but since it may be in a plugin that checks the commandline for the settings, we need to pass
// the settings directly on the UnrealPak commandline, and not put it into the batch file lines (plugins can't get the unrealpak command list, and
// there's not a great way to communicate random strings down into the plugins during plugin init time)
string AdditionalCompressionOptionsOnCommandLine = "";
PlatformGameConfig.GetString("/Script/UnrealEd.ProjectPackagingSettings", "PakFileAdditionalCompressionOptions", out AdditionalCompressionOptionsOnCommandLine);
List<string> Commands = new List<string>();
List<Tuple<FileReference, StagedFileReference, string>> Outputs = new List<Tuple<FileReference, StagedFileReference, string>>();
@@ -1501,7 +1515,7 @@ public partial class Project : CommandUtils
DirectoryReference PakOrderFileLocationBase = DirectoryReference.Combine(SC.ProjectRoot, "Build", OrderLocation, "FileOpenOrder");
FileReference FileLocation = FileReference.Combine(PakOrderFileLocationBase, OrderFileName);
if (FileExists_NoExceptions(FileLocation.FullName))
{
PakOrderFileLocation = FileLocation;
@@ -1580,7 +1594,7 @@ public partial class Project : CommandUtils
}
if (!bCopiedExistingPak)
{
Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PakOrderFileLocation, SC.StageTargetPlatform.GetPlatformPakCommandLine(Params, SC) + " " + Params.AdditionalPakOptions, PakParams.bCompressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath, PakParams.EncryptionKeyGuid));
Commands.Add(GetUnrealPakArguments(PakParams.UnrealPakResponseFile, OutputLocation, PakOrderFileLocation, SC.StageTargetPlatform.GetPlatformPakCommandLine(Params, SC) + CompressionFormats + " " + Params.AdditionalPakOptions, PakParams.bCompressed, CryptoSettings, CryptoKeysCacheFilename, PatchSourceContentPath, PakParams.EncryptionKeyGuid));
}
}
@@ -1593,7 +1607,7 @@ public partial class Project : CommandUtils
string CommandsFile = LogUtils.GetUniqueLogName(CombinePaths(CmdEnv.EngineSavedFolder, "UnrealPak-Commands"));
File.WriteAllLines(CommandsFile, Commands);
string Arguments = String.Format("{0} -batch={1}", MakePathSafeToUseWithCommandLine(Params.RawProjectPath.FullName), MakePathSafeToUseWithCommandLine(CommandsFile));
string Arguments = String.Format("{0} -batch={1} {2}", MakePathSafeToUseWithCommandLine(Params.RawProjectPath.FullName), MakePathSafeToUseWithCommandLine(CommandsFile), AdditionalCompressionOptionsOnCommandLine);
RunAndLog(CmdEnv, GetUnrealPakLocation().FullName, Arguments, Options: ERunOptions.Default | ERunOptions.UTF8Output);
}