Commit: b7dc3b08983c02d82455184235ddc8bc9498b59c - Fs-scripts (git)

Commit MetaInfo

• Revision: b7dc3b08983c02d82455184235ddc8bc9498b59c (tree)
• Zeit: 2024-04-06 20:46:19
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

瞎写

Ändern Zusammenfassung

• modified: UpdateWebsite/UpdateWebsite.lua
• add: UpdateWebsite/lib/Compare.lua
• add: UpdateWebsite/lib/ParseConfTable.lua

Diff

--- a/UpdateWebsite/UpdateWebsite.lua
+++ b/UpdateWebsite/UpdateWebsite.lua
@@ -13,83 +13,9 @@ scriptPath = (n and string.sub(scriptFile, 1, n - 1) or ".")
 
 package.path = scriptPath .. "/lib/?.lua;" .. package.path
 
-local fileName = function(confTable)
-	return confTable.INSTALLPATH .. "-" .. tostring(confTable.date) .. ((confTable.template == "win") and ".7z" or ".tar.xz")
-end
-
-local dataDotVersion = function(confTable)
-	return confTable.buildContentVersion
-end
-
-local dataDotBuildHost = function(confTable)
-	local buildHostNameTable = {
-		Win10 = "Windows 11 10.0.22621",
-		Win10SH = "Windows 11 10.0.22621",
-		Win8 = "Windows 8.1 Update",
-		Win8SH = "Windows 8.1 Update",
-		CentOS8 = "RockyLinux 8.7",
-		Rocky9 = "RockyLinux 9.1",
-		macOS1015 = "macOS 12.6.3",
-		macOSLegacy = "macOS 11.7.2",
-		macOSM1 = "macOS 12.6.3",
-	}
-
-	return buildHostNameTable[confTable.buildHost]
-end
-
-local dataDotToolchain = function(confTable)
-	-- only Target counts?
-
-	if confTable.buildTargetToolchain == "PATH" then
-		if string.sub(confTable.buildHost, 1, 5) == "macOS" then
-			return "AppleClang " .. tostring(confTable.buildTargetToolchainVersion)
-		else
-			return "GCC " .. tostring(confTable.buildTargetToolchainVersion)
-		end
-	elseif string.sub(confTable.buildTargetToolchain, 1, 7) == "Android" then
-		return "ndk " .. tostring(confTable.buildTargetToolchainVersion)
-	elseif string.sub(confTable.buildTargetToolchain, 1, 5) == "MinGW" then
-		-- TODO: need generator compile a program for get mingw-w64 version.
-		-- Let's just hard-code it here
-		local MinGWVersion = 0
-		local compilerId, compilerSuffix = "GCC", ""
-		if string.sub(confTable.buildTargetToolchain, 1, 9) == "MinGWLLVM" then
-			MinGWVersion = 10
-			compilerId = "LLVM"
-			if string.sub(confTable.buildTargetToolchain, 11, 4) == "ucrt" then
-				compilerSuffix = " (ucrt)"
-			else
-				compilerSuffix = " (msvcrt)"
-			end
-		elseif string.sub(confTable.buildTargetToolchainVersion, 1, 3) == "12." then
-			MinGWVersion = 10
-		elseif string.sub(confTable.buildTargetToolchainVersion, 1, 3) == "11." then
-			MinGWVersion = 9
-		elseif string.sub(confTable.buildTargetToolchainVersion, 1, 2) == "8." then
-			MinGWVersion = 6
-		elseif string.sub(confTable.buildTargetToolchainVersion, 1, 2) == "7." then
-			MinGWVersion = 5
-		elseif string.sub(confTable.buildTargetToolchainVersion, 1, 4) == "4.9." then
-			MinGWVersion = 5
-		end
-
-		return "MinGW-w64 v" .. tostring(MinGWVersion) .. " w/ " .. compilerId .. " " .. confTable.buildTargetToolchainVersion .. compilerSuffix
-	elseif string.sub(confTable.buildTargetToolchain, 1, 4) == "MSVC" then
-		if string.sub(confTable.buildTargetToolchain, 5, 4) == "2015" then
-			return "VS2015 Update 3"
-		elseif string.sub(confTable.buildTargetToolchain, 5, 4) == "2017" then
-			return "VS2017 " .. confTable.buildTargetToolchainVersion .. "w/ Windows SDK 10.0.17763"
-		elseif string.sub(confTable.buildTargetToolchain, 5, 4) == "2019" then
-			return "VS2019 " .. confTable.buildTargetToolchainVersion .. "w/ Windows SDK 10.0.22000"
-		elseif string.sub(confTable.buildTargetToolchain, 5, 4) == "2022" then
-			return "VS2022 " .. confTable.buildTargetToolchainVersion .. "w/ Windows SDK 10.0.22621"
-		end
-	elseif string.sub(confTable.buildTargetToolchain, 1, 10) == "emscripten" then
-		return confTable.buildTargetToolchain
-	end
-
-	return confTable.buildTargetToolchainVersion
-end
+parseConfTable = reuqire("ParseConfTable")
+compare = require("Compare")
+download = require("Download")
 
 local buildContent = function(buildJob)
 	if string.sub(buildJob, 1, 1) == "q" then
@@ -103,6 +29,8 @@ local buildContent = function(buildJob)
 	end
 end
 
+--[====[
+-- unusable for now, need refactor.
 local main = function(argc, argv)
 	local dl = require("Download")
 	local buildJob = os.getenv("UPDATE_JOB")
@@ -180,3 +108,4 @@ if r then
 else
 	os.exit(1)
 end
+]====]

--- /dev/null
+++ b/UpdateWebsite/lib/Compare.lua
@@ -0,0 +1,292 @@
+
+local compare = {}
+
+local compareVersion = function(a, b)
+	-- all of Qt, OpenSSL and MariaDB uses a format similar to semver
+	-- so there are major.minor.patch version format
+
+	local parseVersionNum = function(str)
+		return string.match(str, "(%d+)%.(%d+)%.(%d+)")
+	end
+
+	local a1, a2, a3 = parseVersionNum(a)
+	local b1, b2, b3 = parseVersionNum(b)
+
+	if a1 ~= b1 then
+		return a1 < b1
+	end
+
+	if a2 ~= b2 then
+		return a2 < b2
+	end
+
+	return a3 < b3
+end
+
+local unknownMetaTable = {
+	__index = function(table, key)
+		table.max = table.max + 1
+		table[key] = table.max
+		return table.max
+	end
+}
+
+local toolchainArchitecturePlatformSequence = setmetatable({
+	-- unspecified
+	[""] = 0,
+
+	-- Windows - MSVC
+	wx3v5 = 112014,
+	wx6v5 = 112015,
+	wx3v7 = 112016,
+	wx6v7 = 112017,
+	wx3v9 = 112018,
+	wx6v9 = 112019,
+	wx6v2 = 112022,
+	wa6v2 = 112023,
+
+	-- Windows - MinGW w/ GCC
+	wx3g8 = 120815,
+	wx6g8 = 120816,
+	wx6g1 = 121126,
+	wx6p2 = 121221,
+	wx6g2 = 121226,
+	wx6p3 = 121321,
+	wx6g3 = 121326,
+
+	-- Windows - MinGW w/ LLVM
+	wx6u6 = 131601,
+	wx6s6 = 131606,
+	wx6u7 = 131701,
+	wx6s7 = 131706,
+	wx6u8 = 131811,
+	wx6s8 = 131816,
+
+	lx6 = 200000,
+
+	ma6 = 300000,
+	mx6 = 310000,
+
+	-- Android NDK
+	-- 400??2 is reserved for RISC-V
+	aalnV21 = 400210,
+	aa6nV21 = 400211,
+	aa3nV21 = 400213,
+	ax6nV21 = 400214,
+	ax3nV21 = 400215,
+	aalnV23 = 400230,
+	aa6nV23 = 400231,
+	aa3nV23 = 400233,
+	ax6nV23 = 400234,
+	ax3nV23 = 400235,
+	aalnV25 = 400250,
+	aa6nV25 = 400251,
+	aa3nV25 = 400253,
+	ax6nV25 = 400254,
+	ax3nV25 = 400255,
+	aalnV26 = 400260,
+	aa6nV26 = 400261,
+	aa3nV26 = 400263,
+	ax6nV26 = 400264,
+	ax3nV26 = 400265,
+	-- ar6nV27 = 400272,
+
+	W = 500000,
+
+	max = 100000,
+}, unknownMetaTable)
+
+local extractToolchainPlatformArchitecture = function(buildInfo)
+	local prefixToolchainMap = {
+		-- MSVC
+		MSVC2015 = "v5",
+		MSVC2017 = "v7",
+		MSVC2019 = "v9",
+		MSVC2022 = "v2",
+
+		MinGW810 = "g8",
+		MinGW1120 = "g1",
+		MinGW122u = "p2",
+		MinGW1220 = "g2",
+		MinGW132u = "p3",
+		MinGW1320 = "g3",
+
+		["MinGWLLVM-ucrt16"] = "u6",
+		["MinGWLLVM-msvcrt16"] = "s6",
+		["MinGWLLVM-ucrt17"] = "u7",
+		["MinGWLLVM-msvcrt17"] = "s7",
+		["MinGWLLVM-ucrt18"] = "u8",
+		["MinGWLLVM-msvcrt18"] = "s8",
+
+		["Android-r21"] = "nV21",
+		["Android-r23"] = "nV23",
+		["Android-r25"] = "nV25",
+		["Android-r26"] = "nV26",
+	}
+
+	local toolchainPlatformMap = {
+		["MSVC"] = "Windows",
+		["MinGW"] = "Windows",
+		["Android"] = "Android",
+		["emscripten"] = "WebAssembly",
+	}
+	local platformSequenceMap = {
+		Windows = "w",
+		Linux = "l",
+		macOS = "m",
+		Android = "a",
+		WebAssembly = "W",
+	}
+
+	local archPlatformMap = {
+		["ALL"] = "al",
+		["x86"] = "x3",
+		["x86_64"] = "x6",
+		["arm"] = "a3",
+		["arm64"] = "a6", -- aarch64 or arm64?
+		["riscv64"] = "r6",
+	}
+
+	local platform = buildInfo.buildTarget
+	local toolchain = buildInfo.buildTargetToolchain
+	local arch = buildInfo.buildTargetArch
+	if string.sub(buildInfo.buildTargetToolchain, 1, 7) == "Android" then
+		toolchain = "Android-" .. string.sub(buildInfo.buildTargetToolchainVersion, 1, 3)
+		platform = "Android"
+	end
+
+	local extractedToolchain
+	for k, v in pairs(prefixToolchainMap) do
+		if string.sub(toolchain, 1, string.len(k)) == k then
+			extractedToolchain = v
+			break
+		end
+	end
+	extractedToolchain = extractedToolchain or ""
+
+	if not platform then
+		for k, v in pairs(toolchainPlatformMap) do
+			if string.sub(buildInfo.buildTargetToolchain, 1, string.len(k)) == k then
+				platform = v
+				break
+			end
+		end
+	end
+	platform = platform or ""
+	local extractedPlatform = platformSequenceMap[platform] or ""
+
+	if string.sub(arch, 1, 9) == "Universal" then
+		arch = "ALL"
+	end
+	
+	local extractedArch = archPlatformMap[arch] or ""
+
+	return extractedPlatform .. extractedArch .. extractedToolchain
+end
+
+-- This compare method is for generating the "sort" field of each item
+compare.byConfiguration = function(a, b)
+	-- in fact buildContent is not needed here
+	-- provided for strong sequence guarantee
+	if a.buildContent ~= b.buildContent then
+		return a.buildContent < b.buildContent
+	end
+
+	if a.buildContentVersion ~= b.buildContentVersion then
+		return compareVersion(a.buildContentVersion, b.buildContentVersion)
+	end
+
+	-- The sequence is: Windows < Linux < macOS < Android < WebAssembly
+	-- see above platfromSequence
+	if string.sub(a.buildTarget, 1, 2) ~= string.sub(b.buildTarget, 1, 2) then
+		return platformSequence[string.sub(a.buildTarget, 1, 2)] ~= platformSequence[string.sub(b.buildTarget, 1, 2)]
+	end
+
+	local aNdk, bNdk = 0, 0
+	if string.sub(a.buildTarget, 1, 8) == "Android-" then
+		aNdk = tonumber(string.sub(a.buildTarget, 9))
+	end
+	if string.sub(b.buildTarget, 1, 8) == "Android-" then
+		bNdk = tonumber(string.sub(b.buildTarget, 9))
+	end
+	if aNdk ~= bNdk then
+		return aNdk < bNdk
+	end
+
+	local atpa, btpa = extractToolchainPlatformArchitecture(a), extractToolchainPlatformArchitecture(b)
+	if atpa ~= btpa then
+		return toolchainArchitecturePlatformSequence[atpa] < toolchainArchitecturePlatformSequence[btpa]
+	end
+
+	if a.buildVariant ~= b.buildVariant then
+		return variantSequence[matchA.variant] < variantSequence[matchB.variant]
+	end
+
+	-- All signature has been compared for now! I have no way but...
+	return a.buildContentVersion < b.buildContentVersion
+end
+
+local pathPrefixForBuildTargetArchAndToolchainVersion = function(target, arch, toolchainVersion)
+	if target == "Windows" then
+		-- This expects change
+		-- There is too many toolchain variants in current build: MSVC / MinGW-GCC / MinGW-LLVM, and there is an amazing amount of 18 builds in one single directory!
+		-- So it need subdirectory (will be considered in next whole rebuild):
+
+		-- MSVC for Visual Studio builds
+		-- MinGW-GCC for MinGW w/ GCC (niXman) builds
+		-- MinGW-LLVM for MinGW w/ LLVM (mstorsjo) builds
+
+		local partA
+
+		if arch == "x86" then
+			partA = "Windows-x86/"
+		elseif arch == "x86_64" then
+			partA = "Windows-x86_64/"
+		elseif arch == "arm64" then
+			partA = "Windows-arm64/"
+		else
+			-- not recognized	
+		end
+
+		local partB
+
+		if string.sub(toolchainVersion, 1, 4) == "MSVC" then
+			partB = "MSVC/"
+		elseif string.sub(toolchainVersion, 1, 9) == "MinGWLLVM" then
+			partB = "MinGW-LLVM/"
+		elseif string.sub(toolchainVersion, 1, 5) == "MinGW" then
+			partB = "MinGW-GCC/"
+		else
+			-- not recognized
+		end
+
+		if partA and partB then
+			return partA .. partB
+		end
+	elseif target == "Linux" then
+		-- never uploaded
+	elseif target == "macOS" then
+		-- actually arm64 ones are only used in early days of Qt built, since after that universal binaries are built and single architecture ones are deleted.
+		-- Universal builds now ships with Qt 5.15 and later, which are all versions we are currently building, so recognize only Universal here
+		if arch == "Universal (x86_64, arm64)" then
+			return "macOS-Universal/"
+		else
+			-- unrecognized
+		end
+	elseif string.sub(target, 1, 7) == "Android" then
+		-- only layouts of Qt 5.15 onwards are honored
+		-- Qt 5.12 layouts (flatten) / pre-Qt 5.9 layouts (host based directory structure) are ignored
+		return "Android/" .. string.sub(toolchainVersion, 1, 3) .. "/"
+	elseif target == "WebAssembly" then
+		return "WebAssembly/"
+	end
+
+	return "/"
+end
+
+compare.byDirectoryHirachey = function(a, b)
+	local dirA, dirB = pathPrefixForBuildTargetArchAndToolchainVersion(a), pathPrefixForBuildTargetArchAndToolchainVersion(b)
+	return (dirA .. a.INSTALLPATH) < (dirB .. b.INSTALLPATH)
+end
+
+return compare

--- /dev/null
+++ b/UpdateWebsite/lib/ParseConfTable.lua
@@ -0,0 +1,72 @@
+local parseConfTable = {}
+
+parseConfTable.fileName = function(buildInfo)
+	return buildInfo.INSTALLPATH .. "-" .. tostring(buildInfo.date) .. ((buildInfo.template == "win") and ".7z" or ".tar.xz")
+end
+
+parseConfTable.dataDotVersion = function(buildInfo)
+	return buildInfo.buildContentVersion
+end
+
+parseConfTable.dataDotPlatform = function(buildInfo)
+	return buildInfo.buildTarget
+end
+
+parseConfTable.dataDotBuildHost = function(buildInfo)
+	return buildInfo.buildHostVersion
+end
+
+parseConfTable.dataDotToolchain = function(buildInfo)
+	if buildInfo.buildTargetToolchain == "PATH" then
+		if string.sub(buildInfo.buildHost, 1, 5) == "macOS" then
+			return "AppleClang " .. tostring(buildInfo.buildTargetToolchainVersion)
+		else
+			return "GCC " .. tostring(buildInfo.buildTargetToolchainVersion)
+		end
+	elseif string.sub(buildInfo.buildTargetToolchain, 1, 7) == "Android" then
+		return "ndk " .. tostring(buildInfo.buildTargetToolchainVersion)
+	elseif string.sub(buildInfo.buildTargetToolchain, 1, 5) == "MinGW" then
+		local compilerId, compilerSuffix
+		if string.sub(buildInfo.buildTargetToolchain, 1, 9) == "MinGWLLVM" then
+			compilerId = "LLVM"
+			if string.sub(buildInfo.buildTargetToolchain, 11, 4) == "ucrt" then
+				compilerSuffix = " UCRT"
+			else
+				compilerSuffix = " MSVCRT"
+			end
+		else
+			compilerId = "GCC"
+			if string.sub(buildInfo.buildTargetToolchain, 9, 1) == "u" then
+				compilerSuffix = " UCRT"
+			elseif (string.sub(buildInfo.buildTargetToolchain, 9, 1) == "0") and (not (string.sub(buildInfo.buildTargetToolchain, 6, 4) == "1120")) then
+				compilerSuffix = " MSVCRT"
+			end
+		end
+
+		return "MinGW-w64 w/ " .. compilerId .. " " .. buildInfo.buildTargetToolchainVersion .. (compilerSuffix or "")
+	elseif string.sub(buildInfo.buildTargetToolchain, 1, 4) == "MSVC" then
+		if string.sub(buildInfo.buildTargetToolchain, 5, 4) == "2015" then
+			return "VS2015 Update 3"
+		elseif string.sub(buildInfo.buildTargetToolchain, 5, 4) == "2017" then
+			return "VS2017 " .. buildInfo.buildTargetToolchainVersion
+		elseif string.sub(buildInfo.buildTargetToolchain, 5, 4) == "2019" then
+			return "VS2019 " .. buildInfo.buildTargetToolchainVersion
+		elseif string.sub(buildInfo.buildTargetToolchain, 5, 4) == "2022" then
+			return "VS2022 " .. buildInfo.buildTargetToolchainVersion
+		end
+	elseif string.sub(buildInfo.buildTargetToolchain, 1, 10) == "emscripten" then
+		return "emscripten-" .. buildInfo.buildTargetToolchainVersion
+	end
+
+	return buildInfo.buildTargetToolchainVersion
+end
+
+parseConfTable.dataDotArch = function(buildInfo)
+	return buildInfo.buildTargetArch
+end
+
+parseConfTable.dataDotVariant = function(buildInfo)
+	return buildInfo.buildTargetVariant
+end
+
+return parseConfTable