From befb90a055825d5571c775d0db29e6e8cfdb9cb9 Mon Sep 17 00:00:00 2001 From: Jamie Reece Wilson Date: Sat, 9 Dec 2023 23:25:06 +0000 Subject: [PATCH] [+] Aurora.Settings.bActionsIncludeFull --- Core/Actions/Actions.lua | 60 +++++++++++++++++++++++++++------------- Public/settings.lua | 2 ++ 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/Core/Actions/Actions.lua b/Core/Actions/Actions.lua index 87a8980..7611608 100644 --- a/Core/Actions/Actions.lua +++ b/Core/Actions/Actions.lua @@ -45,25 +45,47 @@ local addBuildCommand = function(when, scriptType, path, cwdRelToProject, args) -- Aurora.Settings could take up too much of the win32 max command line buffer (8191 characters) -- This seems like a lot, but it should be well within the 8k limit -- Abs can be skipped and i really dont believe we need the other settings - local settings = - { - sAbsRoot = Aurora.Settings.sAbsRoot, - sRelAuRoot = Aurora.Settings.sRelAuRoot, - sRelScripts = Aurora.Settings.sRelScripts, - sRelRepoScripts = Aurora.Settings.sRelRepoScripts, - sRelDebug = Aurora.Settings.sRelDebug, - sRelStage = Aurora.Settings.sRelStage, - sRelShip = Aurora.Settings.sRelShip, - sRelWd = Aurora.Settings.sRelWd, - sRelSymbols = Aurora.Settings.sRelSymbols, - sRelLinkLibs = Aurora.Settings.sRelLinkLibs, - sRelCompilerWd = Aurora.Settings.sRelCompilerWd, - sRelWin32 = Aurora.Settings.sRelWin32, - sRelUnixBins = Aurora.Settings.sRelUnixBins, - sAbsValac = Aurora.Settings.sAbsValac, - _punchthrough = Aurora.Settings._punchthrough -- for extended user code - } - command = command .. " --settings=" .. base64.encode(json.encode(settings)) + if (Aurora.Settings.bActionsIncludeFull) then + local settings = + { + sAbsRoot = Aurora.Settings.sAbsRoot, + sAbsAuRoot = Aurora.Settings.sAbsAuRoot, + sAbsScripts = Aurora.Settings.sAbsScripts, + sAbsRepoScripts = Aurora.Settings.sAbsRepoScripts, + sAbsDebug = Aurora.Settings.sAbsDebug, + sAbsStage = Aurora.Settings.sAbsStage, + sAbsShip = Aurora.Settings.sAbsShip, + sAbsWd = Aurora.Settings.sAbsWd, + sAbsSymbols = Aurora.Settings.sAbsSymbols, + sAbsLinkLibs = Aurora.Settings.sAbsLinkLibs, + sAbsCompilerWd = Aurora.Settings.sAbsCompilerWd, + sAbsWin32 = Aurora.Settings.sAbsWin32, + sAbsUnixBins = Aurora.Settings.sAbsUnixBins, + sAbsValac = Aurora.Settings.sAbsValac, + _punchthrough = Aurora.Settings._punchthrough -- for extended user code + } + command = command .. " --settings=" .. base64.encode(json.encode(settings)) + else + local settings = + { + sAbsRoot = Aurora.Settings.sAbsRoot, + sRelAuRoot = Aurora.Settings.sRelAuRoot, + sRelScripts = Aurora.Settings.sRelScripts, + sRelRepoScripts = Aurora.Settings.sRelRepoScripts, + sRelDebug = Aurora.Settings.sRelDebug, + sRelStage = Aurora.Settings.sRelStage, + sRelShip = Aurora.Settings.sRelShip, + sRelWd = Aurora.Settings.sRelWd, + sRelSymbols = Aurora.Settings.sRelSymbols, + sRelLinkLibs = Aurora.Settings.sRelLinkLibs, + sRelCompilerWd = Aurora.Settings.sRelCompilerWd, + sRelWin32 = Aurora.Settings.sRelWin32, + sRelUnixBins = Aurora.Settings.sRelUnixBins, + sAbsValac = Aurora.Settings.sAbsValac, + _punchthrough = Aurora.Settings._punchthrough -- for extended user code + } + command = command .. " --settings=" .. base64.encode(json.encode(settings)) + end -- the last thing i couldn't port -- we don't need it diff --git a/Public/settings.lua b/Public/settings.lua index a2502a9..5586860 100644 --- a/Public/settings.lua +++ b/Public/settings.lua @@ -124,6 +124,8 @@ auSetDefault(settings, "bForceClangOnUnix", true) auSetDefault(settings, "bForceWin32EscLd", true) +auSetDefault(settings, "bActionsIncludeFull", false) + -- Premake5 binary name to look for when when tied into cmake. Used by build actions and other lua scripted features auSetDefault(settings, "sDefaultCmakePremakeBin", "premake5")