Commit: 39457608e52ab2f21b66a184d136fcfcd7acdd93 - Fs-scripts (git)

Commit MetaInfo

• Revision: 39457608e52ab2f21b66a184d136fcfcd7acdd93 (tree)
• Zeit: 2023-05-21 12:04:46
• Autor: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

lua 5.4

Ändern Zusammenfassung

• modified: Compile/build.lua
• modified: Compile/lib/CompilerVer.lua
• modified: Compile/lib/Generate.lua
• add: Compile/lib/HostOsVer.lua
• modified: Compile/lib/mariadbCompile/conf.lua
• modified: Compile/lib/opensslCompile/conf.lua
• modified: Compile/lib/qtCompile/conf.lua

Diff

--- a/Compile/build.lua
+++ b/Compile/build.lua
@@ -1,13 +1,17 @@
 
+if string.sub(_VERSION, -3) ~= "5.4" then
+	fail = nil
+end
+
 local scriptFile = arg[0]
 local n, n2
 repeat
 	n = n2
 	n2 = string.find(scriptFile, "/", n and (n + 1) or 1)
-	if n2 == nil then
+	if not n2 then
 		n2 = string.find(scriptFile, "\\", n and (n + 1) or 1)
 	end
-until n2 == nil
+until not n2
 
 scriptPath = (n and string.sub(scriptFile, 1, n - 1) or ".")
 

--- a/Compile/lib/CompilerVer.lua
+++ b/Compile/lib/CompilerVer.lua
@@ -1,4 +1,7 @@
 
+-- TODO: find a more sensible name for this module.
+-- The version is not for a specific compiler, but rather a version number of a whole toolchain.
+
 local compilerVer = {}
 
 local runCmdScript = function(script)
@@ -31,7 +34,7 @@ compilerVer.parseVersionNum = function(str)
 	if #match > 0 then
 		return setmetatable(match, { __tostring = function(m) return m[1] .. "." .. m[2] .. "." .. m[3] end})
 	end
-	return nil
+	return fail
 end
 
 local runShScript = function(script)
@@ -130,4 +133,45 @@ compilerVer.emcc = function(isWin, path)
 	return compilerVer.parseVersionNum(ret)
 end
 
+--[==[
+-- unused function. NDK version is still provided by Configuration.
+compilerVer.ndk = function(_, path)
+	-- NDK r13+ have a file named "source.properties" in its path.
+	-- In this file there is an item calls "Pkg.Revision" which indicates the version of NDK itself.
+
+	local file, err = io.open(path .. "/source.properties", "r")
+
+	if not file then
+		return fail
+	end
+
+	local major, minor
+
+	for line in file:lines() do
+		major, minor = string.match(line, "^Pkg%.Revision = (%d+)%.(%d+)%.%d+$")
+		if major then
+			break
+		end
+	end
+
+	file:close()
+
+	if not major then
+		return fail
+	end
+
+	local ndkMinorRevisionTable = {
+		"",
+		"b",
+		"c",
+		"d",
+		"e",
+		"f", -- no NDK versions ever reached this far, so..
+		"g",
+	}
+
+	return major .. ndkMinorRevisionTable[tonumber(minor) + 1]
+end
+]==]
+
 return compilerVer

--- a/Compile/lib/Generate.lua
+++ b/Compile/lib/Generate.lua
@@ -972,7 +972,7 @@ local filenameAndToolFromUrl = function(url)
 	repeat
 		n = n2
 		n2 = string.find(url, "/", n and (n + 1) or 1)
-	until n2 == nil
+	until not n2
 	local target = string.sub(url, n + 1)
 	local tool = nil
 

--- /dev/null
+++ b/Compile/lib/HostOsVer.lua
@@ -0,0 +1,85 @@
+
+local hostOsVer = {}
+
+hostOsVer.Windows = function()
+    local file, err = io.popen("cmd /c ver" , "r")
+    if not file then return fail, err end
+
+    -- the version string is in the second line
+    file:read()
+    local line = file:read()
+    file:close()
+
+    -- currently we are using only Windows 10+
+    local major, minor, patch
+    string.gsub(line, "%[[^%d]+(%d+)%.(%d+)%.(%d+)[^%]]*%]", function(...)
+        major, minor, patch = ...
+    end)
+
+    if not major then return fail, "pattern didn't match line " .. line end
+
+    local prefix
+
+    if tonumber(major) < 5 then
+        -- Windows 9x / ME / NT4.0 / pre-3.2, not supported
+    if tonumber(major) == 5 then
+        if tonumber(minor) == 0 then
+            prefix = "Windows 2000"
+        elseif tonumber(minor) == 1 or tonumber(minor) == 2 then
+            prefix = "Windows XP"
+        end
+    elseif tonumber(major) == 6 then
+        if tonumber(minor) == 0 then
+            prefix = "Windows Vista"
+        elseif tonumber(minor) == 1 then
+            prefix = "Windows 7"
+        elseif tonumber(minor) == 2 then
+            prefix = "Windows 8"
+        elseif tonumber(minor) == 3 then
+            prefix = "Windows 8.1"
+        elseif tonumber(minor) == 4 then
+            prefix = "Windows 10"
+        end
+    elseif tonumber(major) == 10 then
+        if tonumber(minor) == 0 then
+            -- first Windows 11 is build 10.0.22000.1
+            if tonumber(patch) < 22000 then
+                prefix = "Windows 10"
+            else
+                prefix = "Windows 11"
+            end
+        end
+    end
+
+    -- known Windows 10 / 11 codename
+    local codename = {
+        ["10240"] = "1507",
+        ["10586"] = "1511",
+        ["14393"] = "1607", -- or Windows Server 2016
+        ["15063"] = "1703",
+        ["16299"] = "1709",
+        ["17134"] = "1803",
+        ["17763"] = "1809", -- or Windows Server 2019
+        ["18362"] = "1903",
+        ["18363"] = "1909",
+        ["19041"] = "2004",
+        ["19042"] = "20H2",
+        ["19043"] = "21H1",
+        ["19044"] = "21H2",
+        ["19045"] = "22H2", -- final version of Windows 10
+
+        ["20348"] = "21H2", -- Windows Server 2022 only
+        ["20349"] = "22H2", -- Does this really exist?
+
+        ["22000"] = "21H2", -- first version of Windows 11
+        ["22621"] = "22H2",
+    }
+
+    if not prefix then
+        return fail, "Windows version not supported " .. line
+    end
+
+    return prefix .. " " .. major .. "." .. minor .. "." .. patch
+end
+
+return hostOsVer

--- a/Compile/lib/mariadbCompile/conf.lua
+++ b/Compile/lib/mariadbCompile/conf.lua
@@ -527,19 +527,19 @@ conf.m3_3mal = {
 
 for name, value in pairs(conf) do
 	-- sanity check
-	if value.name == nil then
+	if not value.name then
 		io.stderr:write("no name for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)
 	end
 
-	if value.mariadbVersion == nil then
+	if not value.mariadbVersion then
 		io.stderr:write("no mariadbVersion for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)
 	end
 
-	if value.host == nil then
+	if not value.host then
 		io.stderr:write("no host for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)

--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -901,19 +901,19 @@ conf.o3_0aaln527 = {
 
 for name, value in pairs(conf) do
 	-- sanity check
-	if value.name == nil then
+	if not value.name then
 		io.stderr:write("no name for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)
 	end
 
-	if value.opensslVersion == nil then
+	if not value.opensslVersion then
 		io.stderr:write("no opensslVersion for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)
 	end
 
-	if value.host == nil then
+	if not value.host then
 		io.stderr:write("no host for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)

--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -5285,19 +5285,19 @@ end
 
 for name, value in pairs(conf) do
 	-- sanity check
-	if value.name == nil then
+	if not value.name then
 		io.stderr:write("no name for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)
 	end
 
-	if value.qtVersion == nil then
+	if not value.qtVersion then
 		io.stderr:write("no qtVersion for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)
 	end
 
-	if value.host == nil then
+	if not value.host then
 		io.stderr:write("no host for config " .. name .. "\n")
 		io.stderr:flush()
 		os.exit(1)