From 452ec53f5d8b477784a75d021082850bcc361aca Mon Sep 17 00:00:00 2001 From: mircearoata Date: Wed, 28 Apr 2021 22:44:17 +0300 Subject: [PATCH] Set modules BuildId to "SML" --- Build/Alpakit.Automation/PackagePlugin.cs | 38 +++--------------- .../Scripts/Alpakit.Automation.dll | Bin 13824 -> 12800 bytes 2 files changed, 5 insertions(+), 33 deletions(-) diff --git a/Build/Alpakit.Automation/PackagePlugin.cs b/Build/Alpakit.Automation/PackagePlugin.cs index e21093f894..2e5e585948 100644 --- a/Build/Alpakit.Automation/PackagePlugin.cs +++ b/Build/Alpakit.Automation/PackagePlugin.cs @@ -10,7 +10,6 @@ namespace Alpakit.Automation { public class FactoryGameParams { - public string GameBuildId; public bool CopyToGameDirectory; public bool StartGame; public string GameDirectory; @@ -104,26 +103,6 @@ private static ProjectParams GetParams(BuildCommand cmd) return projectParameters; } - private static string RetrieveBuildIdFromGame(string gameDir) - { - var versionFilePath = Path.Combine(gameDir, "Engine", "Binaries", "Win64", "FactoryGame-Win64-Shipping.version"); - if (!FileExists(versionFilePath)) - { - throw new AutomationException("Cannot find game version file at '{0}'", versionFilePath); - } - - try - { - var versionObject = JsonObject.Read(new FileReference(versionFilePath)); - var buildId = versionObject.GetStringField("BuildId"); - return buildId; - } - catch (Exception ex) - { - throw new AutomationException("Failed to parse version JSON '{0}': {1}", versionFilePath, ex.Message); - } - } - private static void TryUpdateModulesFile(string filePath, string targetBuildId) { try @@ -310,27 +289,20 @@ private static void CleanStagingDirectories(IEnumerable deplo } public override void ExecuteBuild() - { - var gameBuildVersion = ParseOptionalStringParam("GameVersionOverride"); - string maybeGameDirectory = null; - if (gameBuildVersion == null) + { + string gameDir = ParseOptionalStringParam("GameDir"); + if (gameDir != null) { - var gameDir = ParseRequiredStringParam("GameDir"); var bootstrapExePath = Path.Combine(gameDir, "FactoryGame.exe"); if (!FileExists(bootstrapExePath)) { throw new AutomationException("Provided -GameDir is invalid: '{0}'", gameDir); } - gameBuildVersion = RetrieveBuildIdFromGame(gameDir); - maybeGameDirectory = gameDir; } - LogInformation("Game Build Id: {0}", gameBuildVersion); - var factoryGameParams = new FactoryGameParams { - GameBuildId = gameBuildVersion, - GameDirectory = maybeGameDirectory, + GameDirectory = gameDir, StartGame = ParseParam("LaunchGame"), CopyToGameDirectory = ParseParam("CopyToGameDir") }; @@ -348,7 +320,7 @@ public override void ExecuteBuild() try { CopyBuildToStagingDirectory(projectParams, deploymentContexts); - PackagePluginProject(deploymentContexts, gameBuildVersion); + PackagePluginProject(deploymentContexts, "SML"); ArchivePluginProject(projectParams, deploymentContexts); DeployPluginProject(projectParams, deploymentContexts, factoryGameParams); } diff --git a/Build/Alpakit.Automation/Scripts/Alpakit.Automation.dll b/Build/Alpakit.Automation/Scripts/Alpakit.Automation.dll index 8de97659439af268b825a02790c2db1b9d26c1c0..96601c27e7530d8bbe097039a7482bf97e2f746d 100644 GIT binary patch delta 5183 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 a@%!m!KJ{Rz`E!Fe&pH@x{g90|TmJ>8{PiIK literal 13824 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