diff --git a/Core/JSON/jsonProjectHandlers.lua b/Core/JSON/jsonProjectHandlers.lua index 7e5840d..657db1e 100644 --- a/Core/JSON/jsonProjectHandlers.lua +++ b/Core/JSON/jsonProjectHandlers.lua @@ -443,6 +443,14 @@ local function auBlockProjectKeyBigObject(processor, value) end) end +local function auBlockProjectKeyWinStack(processor, value) + filterForKey(value, nil, function(obj) + auFilter{"system:windows"} + linkoptions("/STACK:" .. value) + auFilter{} + end) +end + local function auBlockProjectKeyRtti(processor, value) if (value) then rtti "On" @@ -537,7 +545,8 @@ auProjectBlockHandlers = ltoNotClang = auBlockProjectKeyLtoNotClang, ltoMsvc = auBlockProjectKeyLtoMsvc, ltoClang = auBlockProjectKeyLtoClang, - debugArgs = auBlockProjectKeyDebugArgs + debugArgs = auBlockProjectKeyDebugArgs, + winStack = auBlockProjectKeyWinStack } auProjectBlockHandlers["soft-depends"] = auBlockProjectKeySoftDepends @@ -569,7 +578,7 @@ kGenericTasks = { "eval", "lua", "events", "actions", "staticImpDefines", "features", "links", "soft-depends", "resourceScript", "protobuf", "unpack", "bigObject", "rtti", "lto", "ltoNotMsvc", "ltoNotClang", "ltoMsvc", - "ltoClang", "debugArgs" + "ltoClang", "debugArgs", "winStack" } local kReferenceTasks = {"eval", "includes", "defines", "include", "includes", "protobuf", "actions"} --, "features"} diff --git a/Features/detail/use-version-write-prjver-run.lua b/Features/detail/use-version-write-prjver-run.lua index fbb234f..dd50b24 100644 --- a/Features/detail/use-version-write-prjver-run.lua +++ b/Features/detail/use-version-write-prjver-run.lua @@ -4,19 +4,16 @@ local function GetSnapshotName(full) local iWeekdayOffset = tonumber(os.date("%w")) local iMonthOffset = tonumber(os.date("%d")) if (iWeekdayOffset == 0) then iWeekdayOffset = 6 - else iWeekdayOffset = iWeekdayOffset - 1 end -- "b-but muh iso 8601" fuck off. I like me some sanely formatted date codes like anyone else, but Sunday is apart of the weekEND. - -- global homo[-alist]s and uncritically thinking karens seethe. - -- you know it's the retards advocating for this when they start fucking up the lua indexing pattern of starting at one + else iWeekdayOffset = iWeekdayOffset - 1 end local iWeekIdxOffset = math.floor((iMonthOffset - iWeekdayOffset) / 7) if (iWeekIdxOffset < 0) then iWeekIdxOffset = 0 end local bWeekTest = iWeekdayOffset > 2 local cWeekBase = "A" if (bWeekTest) then cWeekBase = "a" else cWeekBase = "A" end - if (iWeekIdxOffset > 3) then iWeekIdxOffset = 3 end + if (iWeekIdxOffset > 4) then iWeekIdxOffset = 4 end local cWeekChar = string.char(string.byte(cWeekBase) + iWeekIdxOffset) if (not full) then strYear = strYear:sub(2, 2) end return strYear .. strMon .. cWeekChar - -- N unalignedWeekOfTheMonth weekAlignedDayOfTheWeek (truncated to Aa - Dd) end local function DoAction()