修订版 | f4a8bae9281d2fed475dfd5eaa8916ede263d263 (tree) |
---|---|
时间 | 2022-08-15 23:20:33 |
作者 | Fs <Fsu0413@vip....> |
Commiter | Fs |
FINALLY make use of CompilerVer.lua (Tested on Windows)
@@ -53,7 +53,7 @@ local runShScript = function(script) | ||
53 | 53 | return ret |
54 | 54 | end |
55 | 55 | |
56 | -compilerVer.msvc = function(envBat) | |
56 | +compilerVer.msvc = function(isWin, envBat) | |
57 | 57 | local shellScript = "@call \"" .. envBat .. "\" > NUL\r\n@echo %VSCMD_VER%\r\n" |
58 | 58 | local ret = runCmdScript(shellScript) |
59 | 59 | return parseVersionNum(ret) |
@@ -1,5 +1,7 @@ | ||
1 | 1 | local conf = {} |
2 | 2 | |
3 | +local compilerVer = require("CompilerVer") | |
4 | + | |
3 | 5 | conf.host = {} |
4 | 6 | |
5 | 7 | conf.host.win = { |
@@ -74,6 +76,7 @@ conf.host.win = { | ||
74 | 76 | ["2"] = "D:\\Python27", |
75 | 77 | ["3"] = "D:\\Python39", |
76 | 78 | }, |
79 | + ["defaultToolchainExecutableName"] = "gcc", | |
77 | 80 | } |
78 | 81 | |
79 | 82 | -- msys is treated as another host since it uses windows agent and unix shell |
@@ -102,6 +105,7 @@ conf.host.msys = { | ||
102 | 105 | ["r23c"] = "/d/android-ndk-r23c/", |
103 | 106 | }, |
104 | 107 | ["androidNdkHost"] = "windows-x86_64", |
108 | + ["defaultToolchainExecutableName"] = "gcc", | |
105 | 109 | } |
106 | 110 | |
107 | 111 | conf.host.linux = { |
@@ -130,6 +134,7 @@ conf.host.linux = { | ||
130 | 134 | ["2.0.14"] = "/opt/env/emsdk-2.0.14/", |
131 | 135 | ["3.0.0"] = "/opt/env/emsdk-3.0.0/", |
132 | 136 | }, |
137 | + ["defaultToolchainExecutableName"] = "gcc", | |
133 | 138 | } |
134 | 139 | |
135 | 140 | conf.host.mac = { |
@@ -156,6 +161,7 @@ conf.host.mac = { | ||
156 | 161 | ["2.0.14"] = "/opt/env/emsdk-2.0.14/", |
157 | 162 | ["3.0.0"] = "/opt/env/emsdk-3.0.0/", |
158 | 163 | }, |
164 | + ["defaultToolchainExecutableName"] = "clang", | |
159 | 165 | } |
160 | 166 | |
161 | 167 | conf.host.macLegacy = { |
@@ -176,10 +182,22 @@ conf.host.macLegacy = { | ||
176 | 182 | ["emscriptenPath"] = { |
177 | 183 | ["1.39.8"] = "/opt/env/emsdk-1.39.8/", |
178 | 184 | }, |
185 | + ["defaultToolchainExecutableName"] = "clang", | |
179 | 186 | } |
180 | 187 | |
181 | 188 | --[[ conf.host.linuxarm = {} ]] -- Todo: Prepare an arm linux host. It should be hosted on my old mobile phone, I assumed, or raspi? |
182 | 189 | |
190 | +local replaceVersion = function(input, hostToolchainVersion, targetToolchainVersion) | |
191 | + local output = input | |
192 | + if hostToolchainVersion then | |
193 | + output = string.gsub(output, "%&HOSTTOOLVERSION%&", tostring(hostToolchainVersion)) | |
194 | + end | |
195 | + if targetToolchainVersion then | |
196 | + output = string.gsub(output, "%&TARGETTOOLVERSION%&", tostring(targetToolchainVersion)) | |
197 | + end | |
198 | + return output | |
199 | +end | |
200 | + | |
183 | 201 | conf.Qt = {} |
184 | 202 | |
185 | 203 | conf.Qt.configurations = dofile(scriptPath .. "/lib/qtCompile/conf.lua") |
@@ -201,21 +219,33 @@ conf.Qt.generateConfTable = function(self, host, job) | ||
201 | 219 | -- dirty hack end |
202 | 220 | ret.BUILDDIR = confHost.buildRootPath .. "build-Qt" .. job |
203 | 221 | ret.download = {} |
222 | + | |
223 | + -- DO REMEMBER TO USE tostring IF A VERSION STRING IS NEEDED!! | |
224 | + local hostToolchainVersion, targetToolchainVersion | |
225 | + local hostToolchainVersionQueryFuncName = "gcc" | |
226 | + local hostToolchainVersionQueryPath | |
227 | + local hostToolchainExecutableName = confHost.defaultToolchainExecutableName | |
204 | 228 | |
205 | 229 | if confDetail.toolchain ~= "PATH" then |
206 | 230 | local paths = confHost.toolchainPath[confDetail.toolchain] |
207 | 231 | if type(confHost.toolchainPath[confDetail.toolchain]) == "string" then |
208 | 232 | paths = {confHost.toolchainPath[confDetail.toolchain]} |
209 | 233 | end |
234 | + hostToolchainVersionQueryPath = paths[1] | |
210 | 235 | if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then |
236 | + hostToolchainVersionQueryFuncName = "msvc" | |
211 | 237 | ret.msvcBat = paths[1] |
212 | 238 | table.remove(paths, 1) |
239 | + elseif string.sub(confDetail.toolchain, 1, 4) == "MinGWLLVM" then | |
240 | + hostToolchainExecutableName = "clang" | |
213 | 241 | end |
214 | 242 | for _, x in ipairs(paths) do |
215 | 243 | table.insert(ret.path, x) |
216 | 244 | end |
217 | 245 | end |
218 | 246 | |
247 | + hostToolchainVersion = compilerVer[hostToolchainVersionQueryFuncName](confHost.makefileTemplate == "win", hostToolchainVersionQueryPath, hostToolchainExecutableName) | |
248 | + | |
219 | 249 | if confDetail.useCMake and confHost.cMakePath then |
220 | 250 | for _, p in ipairs(confHost.cMakePath[confDetail.useCMake]) do |
221 | 251 | table.insert(ret.path, p) |
@@ -223,27 +253,15 @@ conf.Qt.generateConfTable = function(self, host, job) | ||
223 | 253 | end |
224 | 254 | |
225 | 255 | ret.envSet = {} |
226 | - | |
227 | - local repl = {} | |
228 | - | |
229 | 256 | ret.date = string.format("%04d%02d%02d", BuildTime.year, BuildTime.month, BuildTime.day) |
230 | - local installFolderName = confDetail.name | |
231 | - local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName | |
232 | - | |
233 | - if confDetail.opensslConf then | |
234 | - table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(host, confDetail.opensslConf)) | |
235 | - repl.OPENSSLDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. conf.OpenSSL.configurations[confDetail.opensslConf].name | |
236 | - if confDetail.OPENSSL_LIBS then | |
237 | - local opensslLibs = string.gsub(confDetail.OPENSSL_LIBS, "%&OPENSSLDIR%&", repl.OPENSSLDIR) | |
238 | - ret.envSet.OPENSSL_LIBS = opensslLibs | |
239 | - end | |
240 | - end | |
241 | 257 | |
258 | + local repl = {} | |
259 | + | |
242 | 260 | if confDetail.crossCompile then |
243 | 261 | -- Qt 6: We need host tool to cross build Qt |
244 | 262 | if confDetail.hostToolsConf then |
245 | - table.insert(ret.download, confDetail["hostToolsUrl" .. confHost.makefileTemplate]) | |
246 | - repl.HOSTQTDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. conf.Qt.configurations[confDetail.hostToolsConf].name | |
263 | + table.insert(ret.download, conf.Qt:hostToolDownloadPath(confHost, job, hostToolchainVersion)) | |
264 | + repl.HOSTQTDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep ..replaceVersion(conf.Qt.configurations[confDetail.hostToolsConf].name, hostToolchainVersion) | |
247 | 265 | end |
248 | 266 | |
249 | 267 | if string.sub(confDetail.toolchainT, 1, 7) == "Android" then -- Android |
@@ -271,10 +289,13 @@ conf.Qt.generateConfTable = function(self, host, job) | ||
271 | 289 | if emsdkVer then |
272 | 290 | -- Since emsdk doesn't provide a way for downgrade, we have to split each emsdk installation. |
273 | 291 | -- Currently all emsdk version we are using can be simply matched using only its version number, so ... |
292 | + -- TODO: remove ret.emBat and use ret.emSource also for Windows | |
274 | 293 | ret.emBat = confHost.emscriptenPath[emsdkVer] .. "emsdk activate " .. emsdkVer |
275 | 294 | if confHost.makefileTemplate == "unix" then |
276 | 295 | ret.emSource = confHost.emscriptenPath[emsdkVer] .. "/emsdk_env.sh" |
277 | 296 | end |
297 | + | |
298 | + targetToolchainVersion = compilerVer.emcc(confHost.makefileTemplate == "win", confHost.emscriptenPath[emsdkVer]) | |
278 | 299 | else |
279 | 300 | error("WebAssembly - confDetail.toolchainT is not matched") |
280 | 301 | end |
@@ -285,8 +306,21 @@ conf.Qt.generateConfTable = function(self, host, job) | ||
285 | 306 | elseif string.sub(confDetail.toolchainT, 1, 5) == "MinGW" then -- MinGW cross builds(Todo) |
286 | 307 | error("todo....") |
287 | 308 | end |
309 | + else | |
310 | + targetToolchainVersion = hostToolchainVersion | |
288 | 311 | end |
289 | 312 | |
313 | + if confDetail.opensslConf then | |
314 | + table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(confHost, confDetail.opensslConf, targetToolchainVersion)) | |
315 | + repl.OPENSSLDIR = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. replaceVersion(conf.OpenSSL.configurations[confDetail.opensslConf].name, nil, targetToolchainVersion) | |
316 | + if confDetail.OPENSSL_LIBS then | |
317 | + local opensslLibs = string.gsub(confDetail.OPENSSL_LIBS, "%&OPENSSLDIR%&", repl.OPENSSLDIR) | |
318 | + ret.envSet.OPENSSL_LIBS = opensslLibs | |
319 | + end | |
320 | + end | |
321 | + | |
322 | + local installFolderName = replaceVersion(confDetail.name, hostToolchainVersion, targetToolchainVersion) | |
323 | + local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName | |
290 | 324 | repl.INSTALLROOT = installRoot |
291 | 325 | |
292 | 326 | local sourcePackageBaseName = confDetail.sourcePackageBaseName |
@@ -325,7 +359,7 @@ conf.Qt.generateConfTable = function(self, host, job) | ||
325 | 359 | error("not supported") |
326 | 360 | end |
327 | 361 | else |
328 | - -- let CMake call the underlayer make tool | |
362 | + -- let CMake call the underlying make tool | |
329 | 363 | ret.MAKE = "cmake --build . --parallel -- " |
330 | 364 | end |
331 | 365 | if (string.sub(confDetail.qtVersion, 1, 2) == "6.") and confDetail.crossCompile and (string.sub(confDetail.toolchainT, 1, 10) == "emscripten") then |
@@ -333,7 +367,7 @@ conf.Qt.generateConfTable = function(self, host, job) | ||
333 | 367 | end |
334 | 368 | |
335 | 369 | -- For whatever reason Python can't be in PATH in Windows. |
336 | - -- Python for windows has its executable versionless. We need to prepend its path to the PATH valuable. | |
370 | + -- Python for windows has its executable versionless. We need to prepend its path to the PATH variable. | |
337 | 371 | if confHost.pythonPath then |
338 | 372 | if string.sub(confDetail.qtVersion, 1, 2) == "6." then |
339 | 373 | table.insert(ret.path, confHost.pythonPath["3"]) |
@@ -432,6 +466,11 @@ conf.Qt.generateConfTable = function(self, host, job) | ||
432 | 466 | return ret, qQtPatcherTable |
433 | 467 | end |
434 | 468 | |
469 | +conf.Qt.hostToolDownloadPath = function(self, confHost, job, version) | |
470 | + local pathWithVersionNotSubstituted = conf.Qt.configurations[job]["hostToolsUrl" .. confHost.makefileTemplate] | |
471 | + return replaceVersion(pathWithVersionNotSubstituted, version) | |
472 | +end | |
473 | + | |
435 | 474 | conf.OpenSSL = {} |
436 | 475 | |
437 | 476 | conf.OpenSSL.configurations = dofile(scriptPath .. "/lib/opensslCompile/conf.lua") |
@@ -452,7 +491,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
452 | 491 | ret.download = {} |
453 | 492 | |
454 | 493 | if confDetail.opensslAndroidAll then |
455 | - -- currently this part of script runs only on CentOS8 and no windows compatible is made. | |
494 | + -- currently this part of script runs only on whatever Linux host (CentOS8 on my build environment) and no Windows compatibility is made. | |
456 | 495 | -- no plan for Windows support. |
457 | 496 | ret.buildContent = "OpenSSLAndroidAll" |
458 | 497 | ret.INSTALLROOT = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. confDetail.name |
@@ -463,7 +502,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
463 | 502 | repl.arch = {} |
464 | 503 | |
465 | 504 | for arch, androidConf in pairs(confDetail.opensslAndroidAll) do |
466 | - table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(host, androidConf)) | |
505 | + table.insert(ret.download, conf.OpenSSL:binaryFileDownloadPath(confHost, androidConf)) | |
467 | 506 | ret.OPENSSLDIRFUNCTION = ret.OPENSSLDIRFUNCTION .. "if [ \"x$1\" = \"x" .. arch .. "\" ]; then\n" .. "CURRENTARCHDIR=\"" .. conf.OpenSSL.configurations[androidConf].name .. "\"\nexport CURRENTARCHDIR\nel" |
468 | 507 | table.insert(repl.arch, arch) |
469 | 508 | end |
@@ -480,30 +519,37 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
480 | 519 | ret.INSTALLCOMMANDLINE = " " |
481 | 520 | table.insert(ret.download, confDetail["sourcePackageUrl" .. confHost.makefileTemplate]) |
482 | 521 | |
522 | + -- DO REMEMBER TO USE tostring IF A VERSION STRING IS NEEDED!! | |
523 | + local hostToolchainVersion, targetToolchainVersion | |
524 | + local hostToolchainVersionQueryFuncName = "gcc" | |
525 | + local hostToolchainVersionQueryPath | |
526 | + local hostToolchainExecutableName = confHost.defaultToolchainExecutableName | |
527 | + | |
483 | 528 | if confDetail.toolchain ~= "PATH" then |
484 | 529 | local paths = confHost.toolchainPath[confDetail.toolchain] |
485 | 530 | if type(confHost.toolchainPath[confDetail.toolchain]) == "string" then |
486 | 531 | paths = {confHost.toolchainPath[confDetail.toolchain]} |
487 | 532 | end |
533 | + hostToolchainVersionQueryPath = paths[1] | |
488 | 534 | if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then |
535 | + hostToolchainVersionQueryFuncName = "msvc" | |
489 | 536 | ret.msvcBat = paths[1] |
490 | 537 | table.remove(paths, 1) |
538 | + elseif string.sub(confDetail.toolchain, 1, 4) == "MinGWLLVM" then | |
539 | + hostToolchainExecutableName = "clang" | |
491 | 540 | end |
492 | 541 | for _, x in ipairs(paths) do |
493 | 542 | table.insert(ret.path, x) |
494 | 543 | end |
495 | 544 | end |
496 | 545 | |
546 | + hostToolchainVersion = compilerVer[hostToolchainVersionQueryFuncName](confHost.makefileTemplate == "win", hostToolchainVersionQueryPath, hostToolchainExecutableName) | |
547 | + | |
497 | 548 | ret.envSet = {} |
498 | 549 | |
499 | 550 | local repl = {} |
500 | 551 | repl.parameter = {} |
501 | 552 | |
502 | - local installFolderName = confDetail.name | |
503 | - local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName | |
504 | - | |
505 | - repl.INSTALLROOT = installRoot | |
506 | - | |
507 | 553 | if confDetail.crossCompile then |
508 | 554 | if string.sub(confDetail.toolchainT, 1, 7) == "Android" then -- Android |
509 | 555 | -- Let's use NDK package directly |
@@ -533,6 +579,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
533 | 579 | error("not supported") |
534 | 580 | end |
535 | 581 | else |
582 | + targetToolchainVersion = hostToolchainVersion | |
536 | 583 | if string.sub(confDetail.toolchain, 1, 4) == "MSVC" then -- if conf.hostToConfMap[host] == "win" then |
537 | 584 | -- nothing special |
538 | 585 | elseif string.sub(confDetail.toolchain, 1, 5) == "MinGW" then -- elseif conf.hostToConfMap[host] == "msys" then |
@@ -542,7 +589,7 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
542 | 589 | end |
543 | 590 | elseif string.sub(conf.hostToConfMap[host], 1, 3) == "mac" then |
544 | 591 | -- OpenSSL build for macOS is not used when building Qt 5. Since build of Qt 4 has been defuncted, this may also be defuncted. |
545 | - -- But OpenSSL is revived in Qt 6! Seems Strange? It's because that SecureTransport has been deprecated by Apple and won't support TLS 1.3! | |
592 | + -- But you know what? OpenSSL is revived in Qt 6! Seems Strange? It's because that SecureTransport has been deprecated by Apple and won't support TLS 1.3! | |
546 | 593 | -- Currently only OpenSSL 3 is building. Since macOS comes with 2 different archtectures, we should distinguish them using CC environment variable |
547 | 594 | ret.envSet.CC = "clang -arch " .. ((host ~= "macOSM1") and "x86_64" or "arm64") |
548 | 595 | else |
@@ -550,6 +597,11 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
550 | 597 | end |
551 | 598 | end |
552 | 599 | |
600 | + local installFolderName = replaceVersion(confDetail.name, nil, targetToolchainVersion) | |
601 | + local installRoot = ret.WORKSPACE .. confHost.pathSep .. "buildDir" .. confHost.pathSep .. installFolderName | |
602 | + | |
603 | + repl.INSTALLROOT = installRoot | |
604 | + | |
553 | 605 | local configureArgs = "" |
554 | 606 | for _, p in ipairs(repl.parameter) do |
555 | 607 | configureArgs = configureArgs .. " " .. p |
@@ -565,14 +617,14 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
565 | 617 | end), "%s+", " ") |
566 | 618 | |
567 | 619 | if confHost.makefileTemplate == "unix" then |
568 | - -- OpenSSL on MinGW is using MSYS2, so only runs on Unix environment | |
620 | + -- OpenSSL on MinGW is built using MSYS2, so only runs on Unix environment | |
569 | 621 | ret.MAKE = "make -j$PARALLELNUM" |
570 | 622 | ret.INSTALLCOMMANDLINE = ret.MAKE .. " install_sw install_ssldirs " .. ret.INSTALLCOMMANDLINE |
571 | 623 | elseif string.sub(confDetail.toolchain, 1, 4) == "MSVC" then |
572 | 624 | -- MSVC version of Makefile supports only nmake, jom is not supported offically |
573 | 625 | -- some pull requests which tries to support jom on MSVC builds are simply closed. |
574 | 626 | -- OpenSSL maintainers said that cmake can't cover their supported platforms, so they use a custom build system. |
575 | - -- It seems reasonable but is not the reason why they don't support a 'speed-boosting drop-in replacement' make tool with just a few workarounds. | |
627 | + -- It seems reasonable but is not the reason why they don't accept modifications about a 'speed-boosting drop-in replacement' make tool with just a few workarounds. | |
576 | 628 | |
577 | 629 | -- currently adding "/FS" to the compiler command line, but it fails randomly. |
578 | 630 | -- Retry is added when build fails, for 3 times. |
@@ -585,14 +637,14 @@ conf.OpenSSL.generateConfTable = function(self, host, job) | ||
585 | 637 | end |
586 | 638 | |
587 | 639 | ret.INSTALLROOT = installRoot |
588 | - ret.INSTALLPATH = confDetail.name | |
640 | + ret.INSTALLPATH = installFolderName | |
589 | 641 | end |
590 | 642 | return ret |
591 | 643 | end |
592 | 644 | |
593 | -conf.OpenSSL.binaryFileDownloadPath = function(self, host, job) | |
594 | - local confHost = conf.host[conf.hostToConfMap[host]] | |
595 | - return conf.OpenSSL.configurations[job]["binaryPackageUrl" .. confHost.makefileTemplate] | |
645 | +conf.OpenSSL.binaryFileDownloadPath = function(self, confHost, job, version) | |
646 | + local pathWithVersionNotSubstituted = conf.OpenSSL.configurations[job]["binaryPackageUrl" .. confHost.makefileTemplate] | |
647 | + return replaceVersion(pathWithVersionNotSubstituted, nil, version) | |
596 | 648 | end |
597 | 649 | |
598 | 650 | conf.buildContent = function(self, buildJob) |
@@ -97,7 +97,7 @@ conf.o1wx6v5 = { | ||
97 | 97 | -------------------------------------------------------------------- |
98 | 98 | |
99 | 99 | conf.o1wx3m7 = { |
100 | - name = "OpenSSL1.1.1q-Windows-x86-MinGW-GCC7.3.0", | |
100 | + name = "OpenSSL1.1.1q-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&", | |
101 | 101 | opensslVersion = "1.1.1q", |
102 | 102 | host = "Win8SH", |
103 | 103 | toolchain = "MinGW730-32", |
@@ -113,7 +113,7 @@ conf.o1wx3m7 = { | ||
113 | 113 | } |
114 | 114 | |
115 | 115 | conf.o1wx6m7 = { |
116 | - name = "OpenSSL1.1.1q-Windows-x86_64-MinGW-GCC7.3.0", | |
116 | + name = "OpenSSL1.1.1q-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
117 | 117 | opensslVersion = "1.1.1q", |
118 | 118 | host = "Win8SH", |
119 | 119 | toolchain = "MinGW730-64", |
@@ -131,7 +131,7 @@ conf.o1wx6m7 = { | ||
131 | 131 | -------------------------------------------------------------------- |
132 | 132 | |
133 | 133 | conf.o1wx3v7 = { |
134 | - name = "OpenSSL1.1.1q-Windows-x86-VS2017-&MSVCVER&", | |
134 | + name = "OpenSSL1.1.1q-Windows-x86-VS2017-&TARGETTOOLVERSION&", | |
135 | 135 | opensslVersion = "1.1.1q", |
136 | 136 | host = "Win10", |
137 | 137 | toolchain = "MSVC2017-32", |
@@ -147,7 +147,7 @@ conf.o1wx3v7 = { | ||
147 | 147 | } |
148 | 148 | |
149 | 149 | conf.o1wx3v7st = { |
150 | - name = "OpenSSL1.1.1q-Windows-x86-VS2017-&MSVCVER&-static", | |
150 | + name = "OpenSSL1.1.1q-Windows-x86-VS2017-&TARGETTOOLVERSION&-static", | |
151 | 151 | opensslVersion = "1.1.1q", |
152 | 152 | host = "Win10", |
153 | 153 | toolchain = "MSVC2017-32", |
@@ -164,7 +164,7 @@ conf.o1wx3v7st = { | ||
164 | 164 | } |
165 | 165 | |
166 | 166 | conf.o1wx6v7 = { |
167 | - name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&MSVCVER&", | |
167 | + name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&TARGETTOOLVERSION&", | |
168 | 168 | opensslVersion = "1.1.1q", |
169 | 169 | host = "Win10", |
170 | 170 | toolchain = "MSVC2017-64", |
@@ -180,7 +180,7 @@ conf.o1wx6v7 = { | ||
180 | 180 | } |
181 | 181 | |
182 | 182 | conf.o1wx6v7st = { |
183 | - name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&MSVCVER&-static", | |
183 | + name = "OpenSSL1.1.1q-Windows-x86_64-VS2017-&TARGETTOOLVERSION&-static", | |
184 | 184 | opensslVersion = "1.1.1q", |
185 | 185 | host = "Win10", |
186 | 186 | toolchain = "MSVC2017-64", |
@@ -199,7 +199,7 @@ conf.o1wx6v7st = { | ||
199 | 199 | -------------------------------------------------------------------- |
200 | 200 | |
201 | 201 | conf.o1wx3v9 = { |
202 | - name = "OpenSSL1.1.1q-Windows-x86-VS2019-&MSVCVER&", | |
202 | + name = "OpenSSL1.1.1q-Windows-x86-VS2019-&TARGETTOOLVERSION&", | |
203 | 203 | opensslVersion = "1.1.1q", |
204 | 204 | host = "Win10", |
205 | 205 | toolchain = "MSVC2019-32", |
@@ -215,7 +215,7 @@ conf.o1wx3v9 = { | ||
215 | 215 | } |
216 | 216 | |
217 | 217 | conf.o1wx6v9 = { |
218 | - name = "OpenSSL1.1.1q-Windows-x86_64-VS2019-&MSVCVER&", | |
218 | + name = "OpenSSL1.1.1q-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
219 | 219 | opensslVersion = "1.1.1q", |
220 | 220 | host = "Win10", |
221 | 221 | toolchain = "MSVC2019-64", |
@@ -334,7 +334,7 @@ conf.o1aalnl = { | ||
334 | 334 | -- OpenSSL 3.0.5 |
335 | 335 | |
336 | 336 | conf.o3wx6v9 = { |
337 | - name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&MSVCVER&", | |
337 | + name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
338 | 338 | opensslVersion = "3.0.5", |
339 | 339 | host = "Win10", |
340 | 340 | toolchain = "MSVC2019-64", |
@@ -350,7 +350,7 @@ conf.o3wx6v9 = { | ||
350 | 350 | } |
351 | 351 | |
352 | 352 | conf.o3wx6v9st = { |
353 | - name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&MSVCVER&-static", | |
353 | + name = "OpenSSL3.0.5-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static", | |
354 | 354 | opensslVersion = "3.0.5", |
355 | 355 | host = "Win10", |
356 | 356 | toolchain = "MSVC2019-64", |
@@ -367,7 +367,7 @@ conf.o3wx6v9st = { | ||
367 | 367 | } |
368 | 368 | |
369 | 369 | conf.o3wx6v2 = { |
370 | - name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&MSVCVER&", | |
370 | + name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&TARGETTOOLVERSION&", | |
371 | 371 | opensslVersion = "3.0.5", |
372 | 372 | host = "Win10", |
373 | 373 | toolchain = "MSVC2022-64", |
@@ -383,7 +383,7 @@ conf.o3wx6v2 = { | ||
383 | 383 | } |
384 | 384 | |
385 | 385 | conf.o3wx6v2st = { |
386 | - name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&MSVCVER&-static", | |
386 | + name = "OpenSSL3.0.5-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static", | |
387 | 387 | opensslVersion = "3.0.5", |
388 | 388 | host = "Win10", |
389 | 389 | toolchain = "MSVC2022-64", |
@@ -402,7 +402,7 @@ conf.o3wx6v2st = { | ||
402 | 402 | -------------------------------------------------------------------- |
403 | 403 | |
404 | 404 | conf.o3wx6m1 = { |
405 | - name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC11.2.0", | |
405 | + name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
406 | 406 | opensslVersion = "3.0.5", |
407 | 407 | host = "Win10SH", |
408 | 408 | toolchain = "MinGW1120-64", |
@@ -419,7 +419,7 @@ conf.o3wx6m1 = { | ||
419 | 419 | } |
420 | 420 | |
421 | 421 | conf.o3wx6m2 = { |
422 | - name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC12.1.0", | |
422 | + name = "OpenSSL3.0.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
423 | 423 | opensslVersion = "3.0.5", |
424 | 424 | host = "Win10SH", |
425 | 425 | toolchain = "MinGW1210-64", |
@@ -438,7 +438,7 @@ conf.o3wx6m2 = { | ||
438 | 438 | -- Note: Current instruction by "o*wx6mu" has nowhere to indicate that this is an LLVM-based toolchain. |
439 | 439 | -- Note: Future version of this build configuration should be called "o*wx6Lu" where "L" means LLVM-based toolchain. |
440 | 440 | conf.o3wx6mu = { |
441 | - name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-14.0.0-ucrt", | |
441 | + name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
442 | 442 | opensslVersion = "3.0.5", |
443 | 443 | host = "Win10SH", |
444 | 444 | toolchain = "MinGWLLVM-ucrt14-64", |
@@ -458,7 +458,7 @@ conf.o3wx6mu = { | ||
458 | 458 | -- Note: Current instruction by "o*wx6mv" has nowhere to indicate that this is an LLVM-based toolchain. |
459 | 459 | -- Note: Future version of this build configuration should be called "o*wx6Lv" where "L" means LLVM-based toolchain. |
460 | 460 | conf.o3wx6mv = { |
461 | - name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-14.0.0-msvcrt", | |
461 | + name = "OpenSSL3.0.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
462 | 462 | opensslVersion = "3.0.5", |
463 | 463 | host = "Win10SH", |
464 | 464 | toolchain = "MinGWLLVM-msvcrt14-64", |
@@ -478,7 +478,7 @@ conf.o3wx6mv = { | ||
478 | 478 | -------------------------------------------------------------------- |
479 | 479 | |
480 | 480 | conf.o3mx6 = { |
481 | - name = "OpenSSL3.0.5-macOS-x86_64-AppleClang&AppleClangVersion&", | |
481 | + name = "OpenSSL3.0.5-macOS-x86_64-AppleClang&TARGETTOOLVERSION&", | |
482 | 482 | opensslVersion = "3.0.5", |
483 | 483 | host = "macOS1015", |
484 | 484 | libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" }, |
@@ -494,7 +494,7 @@ conf.o3mx6 = { | ||
494 | 494 | } |
495 | 495 | |
496 | 496 | conf.o3ma6 = { |
497 | - name = "OpenSSL3.0.5-macOS-arm64_v8a-AppleClang&AppleClangVersion&", | |
497 | + name = "OpenSSL3.0.5-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&", | |
498 | 498 | opensslVersion = "3.0.5", |
499 | 499 | host = "macOSM1", |
500 | 500 | libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" }, |
@@ -610,19 +610,6 @@ conf.o3aaln324 = { | ||
610 | 610 | |
611 | 611 | -------------------------------------------------------------------- |
612 | 612 | |
613 | -local MsvcVer = { | |
614 | - ["MSVC2015"] = "14", | |
615 | - ["MSVC2017"] = "15.9.49", | |
616 | - ["MSVC2019"] = "16.11.16", | |
617 | - ["MSVC2022"] = "17.2.4", | |
618 | -} | |
619 | - | |
620 | -local AppleClangVersion = { | |
621 | - ["macOS1015"] = "13.1.6", | |
622 | - ["macOSM1"] = "13.1.6", | |
623 | - ["macOSLegacy"] = "12.0.5", | |
624 | -} | |
625 | - | |
626 | 613 | for name, value in pairs(conf) do |
627 | 614 | -- sanity check |
628 | 615 | if value.name == nil then |
@@ -646,14 +633,6 @@ for name, value in pairs(conf) do | ||
646 | 633 | if not value.toolchain then |
647 | 634 | value.toolchain = "PATH" |
648 | 635 | end |
649 | - | |
650 | - -- hack MSVCVER into name | |
651 | - if string.sub(value.toolchain, 1, 4) == "MSVC" then | |
652 | - value.name = string.gsub(value.name, "%&MSVCVER%&", MsvcVer[string.sub(value.toolchain, 1, 8)]) | |
653 | - end | |
654 | - if string.find(value.name, "AppleClang") then | |
655 | - value.name = string.gsub(value.name, "%&AppleClangVersion%&", AppleClangVersion[value.host]) | |
656 | - end | |
657 | 636 | end |
658 | 637 | |
659 | 638 | local valueMo = { |
@@ -234,7 +234,7 @@ conf.Q2wx6v5 = { | ||
234 | 234 | } |
235 | 235 | |
236 | 236 | conf.Q2wx3v7 = { |
237 | - name = "Qt5.12.12-Windows-x86-VS2017-&MSVCVER&", | |
237 | + name = "Qt5.12.12-Windows-x86-VS2017-&HOSTTOOLVERSION&", | |
238 | 238 | qtVersion = "5.12.12", |
239 | 239 | host = "Win10", |
240 | 240 | toolchain = "MSVC2017-32", |
@@ -274,7 +274,7 @@ conf.Q2wx3v7 = { | ||
274 | 274 | } |
275 | 275 | |
276 | 276 | conf.Q2wx3v7st = { |
277 | - name = "Qt5.12.12-Windows-x86-VS2017-&MSVCVER&-static", | |
277 | + name = "Qt5.12.12-Windows-x86-VS2017-&HOSTTOOLVERSION&-static", | |
278 | 278 | qtVersion = "5.12.12", |
279 | 279 | host = "Win10", |
280 | 280 | toolchain = "MSVC2017-32", |
@@ -377,7 +377,7 @@ conf.Q2wx3v7st = { | ||
377 | 377 | } |
378 | 378 | |
379 | 379 | conf.Q2wx3v7sf = { |
380 | - name = "Qt5.12.12-Windows-x86-VS2017-&MSVCVER&-staticFull", | |
380 | + name = "Qt5.12.12-Windows-x86-VS2017-&HOSTTOOLVERSION&-staticFull", | |
381 | 381 | qtVersion = "5.12.12", |
382 | 382 | host = "Win10", |
383 | 383 | toolchain = "MSVC2017-32", |
@@ -422,7 +422,7 @@ conf.Q2wx3v7sf = { | ||
422 | 422 | } |
423 | 423 | |
424 | 424 | conf.Q2wx6v7 = { |
425 | - name = "Qt5.12.12-Windows-x86_64-VS2017-&MSVCVER&", | |
425 | + name = "Qt5.12.12-Windows-x86_64-VS2017-&HOSTTOOLVERSION&", | |
426 | 426 | qtVersion = "5.12.12", |
427 | 427 | host = "Win10", |
428 | 428 | toolchain = "MSVC2017-64", |
@@ -462,7 +462,7 @@ conf.Q2wx6v7 = { | ||
462 | 462 | } |
463 | 463 | |
464 | 464 | conf.Q2wx6v7sf = { |
465 | - name = "Qt5.12.12-Windows-x86_64-VS2017-&MSVCVER&-staticFull", | |
465 | + name = "Qt5.12.12-Windows-x86_64-VS2017-&HOSTTOOLVERSION&-staticFull", | |
466 | 466 | qtVersion = "5.12.12", |
467 | 467 | host = "Win10", |
468 | 468 | toolchain = "MSVC2017-64", |
@@ -507,7 +507,7 @@ conf.Q2wx6v7sf = { | ||
507 | 507 | } |
508 | 508 | |
509 | 509 | conf.Q2wx3v9 = { |
510 | - name = "Qt5.12.12-Windows-x86-VS2019-&MSVCVER&", | |
510 | + name = "Qt5.12.12-Windows-x86-VS2019-&HOSTTOOLVERSION&", | |
511 | 511 | qtVersion = "5.12.12", |
512 | 512 | host = "Win10", |
513 | 513 | toolchain = "MSVC2019-32", |
@@ -548,7 +548,7 @@ conf.Q2wx3v9 = { | ||
548 | 548 | } |
549 | 549 | |
550 | 550 | conf.Q2wx6v9 = { |
551 | - name = "Qt5.12.12-Windows-x86_64-VS2019-&MSVCVER&", | |
551 | + name = "Qt5.12.12-Windows-x86_64-VS2019-&HOSTTOOLVERSION&", | |
552 | 552 | qtVersion = "5.12.12", |
553 | 553 | host = "Win10", |
554 | 554 | toolchain = "MSVC2019-64", |
@@ -589,7 +589,7 @@ conf.Q2wx6v9 = { | ||
589 | 589 | } |
590 | 590 | |
591 | 591 | conf.Q2wx3m7 = { |
592 | - name = "Qt5.12.12-Windows-x86-MinGW7.3.0", | |
592 | + name = "Qt5.12.12-Windows-x86-MinGW&HOSTTOOLVERSION&", | |
593 | 593 | qtVersion = "5.12.12", |
594 | 594 | host = "Win8", |
595 | 595 | toolchain = "MinGW730-32", |
@@ -628,7 +628,7 @@ conf.Q2wx3m7 = { | ||
628 | 628 | } |
629 | 629 | |
630 | 630 | conf.Q2wx3m7sf = { |
631 | - name = "Qt5.12.12-Windows-x86-MinGW7.3.0-staticFull", | |
631 | + name = "Qt5.12.12-Windows-x86-MinGW&HOSTTOOLVERSION&-staticFull", | |
632 | 632 | qtVersion = "5.12.12", |
633 | 633 | host = "Win8", |
634 | 634 | toolchain = "MinGW730-32", |
@@ -673,7 +673,7 @@ conf.Q2wx3m7sf = { | ||
673 | 673 | } |
674 | 674 | |
675 | 675 | conf.Q2wx6m7 = { |
676 | - name = "Qt5.12.12-Windows-x86_64-MinGW7.3.0", | |
676 | + name = "Qt5.12.12-Windows-x86_64-MinGW&HOSTTOOLVERSION&", | |
677 | 677 | qtVersion = "5.12.12", |
678 | 678 | host = "Win8", |
679 | 679 | toolchain = "MinGW730-64", |
@@ -712,7 +712,7 @@ conf.Q2wx6m7 = { | ||
712 | 712 | } |
713 | 713 | |
714 | 714 | conf.Q2wx6m7sf = { |
715 | - name = "Qt5.12.12-Windows-x86_64-MinGW7.3.0-staticFull", | |
715 | + name = "Qt5.12.12-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull", | |
716 | 716 | qtVersion = "5.12.12", |
717 | 717 | host = "Win8", |
718 | 718 | toolchain = "MinGW730-64", |
@@ -757,7 +757,7 @@ conf.Q2wx6m7sf = { | ||
757 | 757 | } |
758 | 758 | |
759 | 759 | conf.Q2lx6st = { |
760 | - name = "Qt5.12.12-Linux-x86_64-gcc8.5.0-static", | |
760 | + name = "Qt5.12.12-Linux-x86_64-gcc&HOSTTOOLVERSION&-static", | |
761 | 761 | qtVersion = "5.12.12", |
762 | 762 | host = "CentOS8", |
763 | 763 | variant = {"-static"}, |
@@ -849,7 +849,7 @@ conf.Q2lx6st = { | ||
849 | 849 | } |
850 | 850 | |
851 | 851 | conf.q5_12mLx6st = { |
852 | - name = "Qt5.12.12-macOSLegacy-x86_64-AppleClang&AppleClangVersion&-static", | |
852 | + name = "Qt5.12.12-macOSLegacy-x86_64-AppleClang&HOSTTOOLVERSION&-static", | |
853 | 853 | qtVersion = "5.12.12", |
854 | 854 | host = "macOSLegacy", |
855 | 855 | variant = {"-static"}, |
@@ -945,7 +945,7 @@ conf.q5_12mLx6st = { | ||
945 | 945 | } |
946 | 946 | |
947 | 947 | conf.Q2wx6m7_aa3nl = { |
948 | - name = "Qt5.12.12-Android-arm-Clang-NDKr21e-XWindows-x86_64-MinGW7.3.0", | |
948 | + name = "Qt5.12.12-Android-arm-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
949 | 949 | qtVersion = "5.12.12", |
950 | 950 | host = "Win10", |
951 | 951 | toolchain = "MinGW730-64", |
@@ -999,7 +999,7 @@ conf.Q2wx6m7_aa3nl = { | ||
999 | 999 | } |
1000 | 1000 | |
1001 | 1001 | conf.Q2wx6m7_aa6nl = { |
1002 | - name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-XWindows-x86_64-MinGW7.3.0", | |
1002 | + name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
1003 | 1003 | qtVersion = "5.12.12", |
1004 | 1004 | host = "Win10", |
1005 | 1005 | toolchain = "MinGW730-64", |
@@ -1053,7 +1053,7 @@ conf.Q2wx6m7_aa6nl = { | ||
1053 | 1053 | } |
1054 | 1054 | |
1055 | 1055 | conf.Q2wx6m7_ax3nl = { |
1056 | - name = "Qt5.12.12-Android-x86-Clang-NDKr21e-XWindows-x86_64-MinGW7.3.0", | |
1056 | + name = "Qt5.12.12-Android-x86-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
1057 | 1057 | qtVersion = "5.12.12", |
1058 | 1058 | host = "Win10", |
1059 | 1059 | toolchain = "MinGW730-64", |
@@ -1107,7 +1107,7 @@ conf.Q2wx6m7_ax3nl = { | ||
1107 | 1107 | } |
1108 | 1108 | |
1109 | 1109 | conf.Q2lx6_aa3nl = { |
1110 | - name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0", | |
1110 | + name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
1111 | 1111 | qtVersion = "5.12.12", |
1112 | 1112 | host = "CentOS8", |
1113 | 1113 | target = "Android-21", |
@@ -1160,7 +1160,7 @@ conf.Q2lx6_aa3nl = { | ||
1160 | 1160 | } |
1161 | 1161 | |
1162 | 1162 | conf.Q2lx6_aa6nl = { |
1163 | - name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0", | |
1163 | + name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
1164 | 1164 | qtVersion = "5.12.12", |
1165 | 1165 | host = "CentOS8", |
1166 | 1166 | target = "Android-21", |
@@ -1213,7 +1213,7 @@ conf.Q2lx6_aa6nl = { | ||
1213 | 1213 | } |
1214 | 1214 | |
1215 | 1215 | conf.Q2lx6_ax3nl = { |
1216 | - name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0", | |
1216 | + name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
1217 | 1217 | qtVersion = "5.12.12", |
1218 | 1218 | host = "CentOS8", |
1219 | 1219 | target = "Android-21", |
@@ -1266,7 +1266,7 @@ conf.Q2lx6_ax3nl = { | ||
1266 | 1266 | } |
1267 | 1267 | |
1268 | 1268 | conf.Q2mx6_aa3nl = { |
1269 | - name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
1269 | + name = "Qt5.12.12-Android-arm-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
1270 | 1270 | qtVersion = "5.12.12", |
1271 | 1271 | host = "macOSLegacy", |
1272 | 1272 | target = "Android-21", |
@@ -1319,7 +1319,7 @@ conf.Q2mx6_aa3nl = { | ||
1319 | 1319 | } |
1320 | 1320 | |
1321 | 1321 | conf.Q2mx6_aa6nl = { |
1322 | - name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
1322 | + name = "Qt5.12.12-Android-arm64-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
1323 | 1323 | qtVersion = "5.12.12", |
1324 | 1324 | host = "macOSLegacy", |
1325 | 1325 | target = "Android-21", |
@@ -1372,7 +1372,7 @@ conf.Q2mx6_aa6nl = { | ||
1372 | 1372 | } |
1373 | 1373 | |
1374 | 1374 | conf.Q2mx6_ax3nl = { |
1375 | - name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
1375 | + name = "Qt5.12.12-Android-x86-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
1376 | 1376 | qtVersion = "5.12.12", |
1377 | 1377 | host = "macOSLegacy", |
1378 | 1378 | target = "Android-21", |
@@ -1424,74 +1424,6 @@ conf.Q2mx6_ax3nl = { | ||
1424 | 1424 | OPENSSL_LIBS="&OPENSSLDIR&/lib/libssl.a &OPENSSLDIR&/lib/libcrypto.a", |
1425 | 1425 | } |
1426 | 1426 | |
1427 | -conf.Q2lx6_W = { | |
1428 | - name = "Qt5.12.12-WebAssembly-emscripten1.38.16-xLinux-x86_64-gcc8.5.0", | |
1429 | - qtVersion = "5.12.12", | |
1430 | - host = "CentOS8", | |
1431 | - target = "WebAssembly", | |
1432 | - toolchainT = "emscripten-1.38.16", | |
1433 | - configureParameter = [[ | |
1434 | - -prefix | |
1435 | - / | |
1436 | - -opensource | |
1437 | - -release | |
1438 | - -confirm-license | |
1439 | - -platform | |
1440 | - linux-g++ | |
1441 | - -xplatform | |
1442 | - wasm-emscripten | |
1443 | - -nomake | |
1444 | - examples | |
1445 | - -nomake | |
1446 | - tests | |
1447 | - -no-compile-examples | |
1448 | - -qt-doubleconversion | |
1449 | - -qt-zlib | |
1450 | - -qt-pcre | |
1451 | - -no-icu | |
1452 | - -opengl | |
1453 | - es2 | |
1454 | - -no-ssl | |
1455 | - -sql-sqlite | |
1456 | - -make-tool | |
1457 | - "make -j$PARALLELNUM" | |
1458 | - ]], | |
1459 | -} | |
1460 | - | |
1461 | -conf.Q2mx6_W = { | |
1462 | - name = "Qt5.12.12-WebAssembly-emscripten1.38.16-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
1463 | - qtVersion = "5.12.12", | |
1464 | - host = "macOSLegacy", | |
1465 | - target = "WebAssembly", | |
1466 | - toolchainT = "emscripten-1.38.16", | |
1467 | - configureParameter = [[ | |
1468 | - -prefix | |
1469 | - / | |
1470 | - -opensource | |
1471 | - -release | |
1472 | - -confirm-license | |
1473 | - -platform | |
1474 | - macx-clang | |
1475 | - -xplatform | |
1476 | - wasm-emscripten | |
1477 | - -nomake | |
1478 | - examples | |
1479 | - -nomake | |
1480 | - tests | |
1481 | - -no-compile-examples | |
1482 | - -qt-doubleconversion | |
1483 | - -qt-zlib | |
1484 | - -qt-pcre | |
1485 | - -no-icu | |
1486 | - -opengl | |
1487 | - es2 | |
1488 | - -no-ssl | |
1489 | - -sql-sqlite | |
1490 | - -make-tool | |
1491 | - "make -j$PARALLELNUM" | |
1492 | - ]], | |
1493 | -} | |
1494 | - | |
1495 | 1427 | -------------------------------------------------------------------- |
1496 | 1428 | |
1497 | 1429 | -- Qt 5.15.5 |
@@ -1567,7 +1499,7 @@ conf.Q5wx6v5 = { | ||
1567 | 1499 | } |
1568 | 1500 | |
1569 | 1501 | conf.Q5wx3v7 = { |
1570 | - name = "Qt5.15.5-Windows-x86-VS2017-&MSVCVER&", | |
1502 | + name = "Qt5.15.5-Windows-x86-VS2017-&HOSTTOOLVERSION&", | |
1571 | 1503 | qtVersion = "5.15.5-5", |
1572 | 1504 | host = "Win10", |
1573 | 1505 | toolchain = "MSVC2017-32", |
@@ -1604,7 +1536,7 @@ conf.Q5wx3v7 = { | ||
1604 | 1536 | } |
1605 | 1537 | |
1606 | 1538 | conf.Q5wx6v7 = { |
1607 | - name = "Qt5.15.5-Windows-x86_64-VS2017-&MSVCVER&", | |
1539 | + name = "Qt5.15.5-Windows-x86_64-VS2017-&HOSTTOOLVERSION&", | |
1608 | 1540 | qtVersion = "5.15.5-5", |
1609 | 1541 | host = "Win10", |
1610 | 1542 | toolchain = "MSVC2017-64", |
@@ -1641,7 +1573,7 @@ conf.Q5wx6v7 = { | ||
1641 | 1573 | } |
1642 | 1574 | |
1643 | 1575 | conf.Q5wx3v9 = { |
1644 | - name = "Qt5.15.5-Windows-x86-VS2019-&MSVCVER&", | |
1576 | + name = "Qt5.15.5-Windows-x86-VS2019-&HOSTTOOLVERSION&", | |
1645 | 1577 | qtVersion = "5.15.5-5", |
1646 | 1578 | host = "Win10", |
1647 | 1579 | toolchain = "MSVC2019-32", |
@@ -1677,7 +1609,7 @@ conf.Q5wx3v9 = { | ||
1677 | 1609 | } |
1678 | 1610 | |
1679 | 1611 | conf.Q5wx3v9sf = { |
1680 | - name = "Qt5.15.5-Windows-x86-VS2019-&MSVCVER&-staticFull", | |
1612 | + name = "Qt5.15.5-Windows-x86-VS2019-&HOSTTOOLVERSION&-staticFull", | |
1681 | 1613 | qtVersion = "5.15.5-5", |
1682 | 1614 | host = "Win10", |
1683 | 1615 | toolchain = "MSVC2019-32", |
@@ -1719,7 +1651,7 @@ conf.Q5wx3v9sf = { | ||
1719 | 1651 | } |
1720 | 1652 | |
1721 | 1653 | conf.Q5wx6v9 = { |
1722 | - name = "Qt5.15.5-Windows-x86_64-VS2019-&MSVCVER&", | |
1654 | + name = "Qt5.15.5-Windows-x86_64-VS2019-&HOSTTOOLVERSION&", | |
1723 | 1655 | qtVersion = "5.15.5-5", |
1724 | 1656 | host = "Win10", |
1725 | 1657 | toolchain = "MSVC2019-64", |
@@ -1755,7 +1687,7 @@ conf.Q5wx6v9 = { | ||
1755 | 1687 | } |
1756 | 1688 | |
1757 | 1689 | conf.Q5wx6v9sf = { |
1758 | - name = "Qt5.15.5-Windows-x86_64-VS2019-&MSVCVER&-staticFull", | |
1690 | + name = "Qt5.15.5-Windows-x86_64-VS2019-&HOSTTOOLVERSION&-staticFull", | |
1759 | 1691 | qtVersion = "5.15.5-5", |
1760 | 1692 | host = "Win10", |
1761 | 1693 | toolchain = "MSVC2019-64", |
@@ -1797,7 +1729,7 @@ conf.Q5wx6v9sf = { | ||
1797 | 1729 | } |
1798 | 1730 | |
1799 | 1731 | conf.Q5wx6v2 = { |
1800 | - name = "Qt5.15.5-Windows-x86_64-VS2022-&MSVCVER&", | |
1732 | + name = "Qt5.15.5-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
1801 | 1733 | qtVersion = "5.15.5-5", |
1802 | 1734 | host = "Win10", |
1803 | 1735 | toolchain = "MSVC2022-64", |
@@ -1834,7 +1766,7 @@ conf.Q5wx6v2 = { | ||
1834 | 1766 | } |
1835 | 1767 | |
1836 | 1768 | conf.Q5wx3m8 = { |
1837 | - name = "Qt5.15.5-Windows-x86-MinGW8.1.0", | |
1769 | + name = "Qt5.15.5-Windows-x86-MinGW&HOSTTOOLVERSION&", | |
1838 | 1770 | qtVersion = "5.15.5", |
1839 | 1771 | host = "Win10", |
1840 | 1772 | toolchain = "MinGW810-32", |
@@ -1869,7 +1801,7 @@ conf.Q5wx3m8 = { | ||
1869 | 1801 | } |
1870 | 1802 | |
1871 | 1803 | conf.Q5wx3m8sf = { |
1872 | - name = "Qt5.15.5-Windows-x86-MinGW8.1.0-staticFull", | |
1804 | + name = "Qt5.15.5-Windows-x86-MinGW&HOSTTOOLVERSION&-staticFull", | |
1873 | 1805 | qtVersion = "5.15.5", |
1874 | 1806 | host = "Win10", |
1875 | 1807 | toolchain = "MinGW810-32", |
@@ -1909,7 +1841,7 @@ conf.Q5wx3m8sf = { | ||
1909 | 1841 | } |
1910 | 1842 | |
1911 | 1843 | conf.Q5wx6m8 = { |
1912 | - name = "Qt5.15.5-Windows-x86_64-MinGW8.1.0", | |
1844 | + name = "Qt5.15.5-Windows-x86_64-MinGW&HOSTTOOLVERSION&", | |
1913 | 1845 | qtVersion = "5.15.5", |
1914 | 1846 | host = "Win10", |
1915 | 1847 | toolchain = "MinGW810-64", |
@@ -1944,7 +1876,7 @@ conf.Q5wx6m8 = { | ||
1944 | 1876 | } |
1945 | 1877 | |
1946 | 1878 | conf.Q5wx6m8sf = { |
1947 | - name = "Qt5.15.5-Windows-x86_64-MinGW8.1.0-staticFull", | |
1879 | + name = "Qt5.15.5-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull", | |
1948 | 1880 | qtVersion = "5.15.5", |
1949 | 1881 | host = "Win10", |
1950 | 1882 | toolchain = "MinGW810-64", |
@@ -1984,7 +1916,7 @@ conf.Q5wx6m8sf = { | ||
1984 | 1916 | } |
1985 | 1917 | |
1986 | 1918 | conf.Q5mx6 = { |
1987 | - name = "Qt5.15.5-macOS-x86_64-AppleClang&AppleClangVersion&", | |
1919 | + name = "Qt5.15.5-macOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
1988 | 1920 | qtVersion = "5.15.5-5", |
1989 | 1921 | host = "macOSLegacy", |
1990 | 1922 | configureParameter = [[ |
@@ -2019,7 +1951,7 @@ conf.Q5mx6 = { | ||
2019 | 1951 | } |
2020 | 1952 | |
2021 | 1953 | conf.Q5mx6nf = { |
2022 | - name = "Qt5.15.5-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework", | |
1954 | + name = "Qt5.15.5-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework", | |
2023 | 1955 | qtVersion = "5.15.5-5", |
2024 | 1956 | host = "macOSLegacy", |
2025 | 1957 | variant = {"-noFramework"}, |
@@ -2056,7 +1988,7 @@ conf.Q5mx6nf = { | ||
2056 | 1988 | } |
2057 | 1989 | |
2058 | 1990 | conf.Q5wx6m8_aalnl = { |
2059 | - name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW8.1.0", | |
1991 | + name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
2060 | 1992 | qtVersion = "5.15.5", |
2061 | 1993 | host = "Win10", |
2062 | 1994 | toolchain = "MinGW810-64", |
@@ -2109,7 +2041,7 @@ conf.Q5wx6m8_aalnl = { | ||
2109 | 2041 | } |
2110 | 2042 | |
2111 | 2043 | conf.Q5lx6_aalnl = { |
2112 | - name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0", | |
2044 | + name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
2113 | 2045 | qtVersion = "5.15.5", |
2114 | 2046 | host = "CentOS8", |
2115 | 2047 | target = "Android-21", |
@@ -2161,7 +2093,7 @@ conf.Q5lx6_aalnl = { | ||
2161 | 2093 | } |
2162 | 2094 | |
2163 | 2095 | conf.Q5mx6_aalnl = { |
2164 | - name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
2096 | + name = "Qt5.15.5-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
2165 | 2097 | qtVersion = "5.15.5", |
2166 | 2098 | host = "macOSLegacy", |
2167 | 2099 | target = "Android-21", |
@@ -2213,7 +2145,7 @@ conf.Q5mx6_aalnl = { | ||
2213 | 2145 | } |
2214 | 2146 | |
2215 | 2147 | conf.Q5wx6m8_W = { |
2216 | - name = "Qt5.15.5-WebAssembly-emscripten1.39.8-xWindows-x86_64-MinGW8.1.0", | |
2148 | + name = "Qt5.15.5-WebAssembly-emscripten&TARGETEMCCVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
2217 | 2149 | qtVersion = "5.15.5", |
2218 | 2150 | host = "Win10", |
2219 | 2151 | toolchain = "MinGW810-64", |
@@ -2249,7 +2181,7 @@ conf.Q5wx6m8_W = { | ||
2249 | 2181 | } |
2250 | 2182 | |
2251 | 2183 | conf.Q5lx6_W = { |
2252 | - name = "Qt5.15.5-WebAssembly-emscripten1.39.8-xLinux-x86_64-gcc8.5.0", | |
2184 | + name = "Qt5.15.5-WebAssembly-emscripten&TARGETEMCCVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
2253 | 2185 | qtVersion = "5.15.5", |
2254 | 2186 | host = "CentOS8", |
2255 | 2187 | target = "WebAssembly", |
@@ -2284,7 +2216,7 @@ conf.Q5lx6_W = { | ||
2284 | 2216 | } |
2285 | 2217 | |
2286 | 2218 | conf.Q5mx6_W = { |
2287 | - name = "Qt5.15.5-WebAssembly-emscripten1.39.8-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
2219 | + name = "Qt5.15.5-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
2288 | 2220 | qtVersion = "5.15.5", |
2289 | 2221 | host = "macOSLegacy", |
2290 | 2222 | target = "WebAssembly", |
@@ -2321,7 +2253,7 @@ conf.Q5mx6_W = { | ||
2321 | 2253 | -------------------------------------------------------------------- |
2322 | 2254 | |
2323 | 2255 | conf.q5_kdewx3m8 = { |
2324 | - name = "Qt5.15-KDE-Windows-x86-MinGW8.1.0", | |
2256 | + name = "Qt5.15-KDE-Windows-x86-MinGW&HOSTTOOLVERSION&", | |
2325 | 2257 | qtVersion = "5.15.k", |
2326 | 2258 | host = "Win10", |
2327 | 2259 | toolchain = "MinGW810-32", |
@@ -2356,7 +2288,7 @@ conf.q5_kdewx3m8 = { | ||
2356 | 2288 | } |
2357 | 2289 | |
2358 | 2290 | conf.q5_kdewx6m8 = { |
2359 | - name = "Qt5.15-KDE-Windows-x86_64-MinGW8.1.0", | |
2291 | + name = "Qt5.15-KDE-Windows-x86_64-MinGW&HOSTTOOLVERSION&", | |
2360 | 2292 | qtVersion = "5.15.k", |
2361 | 2293 | host = "Win10", |
2362 | 2294 | toolchain = "MinGW810-64", |
@@ -2391,7 +2323,7 @@ conf.q5_kdewx6m8 = { | ||
2391 | 2323 | } |
2392 | 2324 | |
2393 | 2325 | conf.q5_kdewx3v9 = { |
2394 | - name = "Qt5.15-KDE-Windows-x86-VS2019-&MSVCVER&", | |
2326 | + name = "Qt5.15-KDE-Windows-x86-VS2019-&HOSTTOOLVERSION&", | |
2395 | 2327 | qtVersion = "5.15.k", |
2396 | 2328 | host = "Win10", |
2397 | 2329 | toolchain = "MSVC2019-32", |
@@ -2427,7 +2359,7 @@ conf.q5_kdewx3v9 = { | ||
2427 | 2359 | } |
2428 | 2360 | |
2429 | 2361 | conf.q5_kdewx6v9 = { |
2430 | - name = "Qt5.15-KDE-Windows-x86_64-VS2019-&MSVCVER&", | |
2362 | + name = "Qt5.15-KDE-Windows-x86_64-VS2019-&HOSTTOOLVERSION&", | |
2431 | 2363 | qtVersion = "5.15.k", |
2432 | 2364 | host = "Win10", |
2433 | 2365 | toolchain = "MSVC2019-64", |
@@ -2463,7 +2395,7 @@ conf.q5_kdewx6v9 = { | ||
2463 | 2395 | } |
2464 | 2396 | |
2465 | 2397 | conf.q5_kdewx6v2 = { |
2466 | - name = "Qt5.15-KDE-Windows-x86_64-VS2022-&MSVCVER&", | |
2398 | + name = "Qt5.15-KDE-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
2467 | 2399 | qtVersion = "5.15.k", |
2468 | 2400 | host = "Win10", |
2469 | 2401 | toolchain = "MSVC2022-64", |
@@ -2499,7 +2431,7 @@ conf.q5_kdewx6v2 = { | ||
2499 | 2431 | } |
2500 | 2432 | |
2501 | 2433 | conf.q5_kdemx6 = { |
2502 | - name = "Qt5.15-KDE-macOS-x86_64-AppleClang&AppleClangVersion&", | |
2434 | + name = "Qt5.15-KDE-macOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
2503 | 2435 | qtVersion = "5.15.k", |
2504 | 2436 | host = "macOS1015", |
2505 | 2437 | configureParameter = [[ |
@@ -2534,7 +2466,7 @@ conf.q5_kdemx6 = { | ||
2534 | 2466 | } |
2535 | 2467 | |
2536 | 2468 | conf.q5_kdemx6nf = { |
2537 | - name = "Qt5.15-KDE-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework", | |
2469 | + name = "Qt5.15-KDE-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework", | |
2538 | 2470 | qtVersion = "5.15.k", |
2539 | 2471 | host = "macOS1015", |
2540 | 2472 | variant = {"-noFramework"}, |
@@ -2571,7 +2503,7 @@ conf.q5_kdemx6nf = { | ||
2571 | 2503 | } |
2572 | 2504 | |
2573 | 2505 | conf.q5_kdewx6m8_aalnl = { |
2574 | - name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW8.1.0", | |
2506 | + name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
2575 | 2507 | qtVersion = "5.15.k", |
2576 | 2508 | host = "Win10", |
2577 | 2509 | toolchain = "MinGW810-64", |
@@ -2624,7 +2556,7 @@ conf.q5_kdewx6m8_aalnl = { | ||
2624 | 2556 | } |
2625 | 2557 | |
2626 | 2558 | conf.q5_kdelx6_aalnl = { |
2627 | - name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc8.5.0", | |
2559 | + name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
2628 | 2560 | qtVersion = "5.15.k", |
2629 | 2561 | host = "CentOS8", |
2630 | 2562 | target = "Android-21", |
@@ -2676,7 +2608,7 @@ conf.q5_kdelx6_aalnl = { | ||
2676 | 2608 | } |
2677 | 2609 | |
2678 | 2610 | conf.q5_kdemx6_aalnl = { |
2679 | - name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
2611 | + name = "Qt5.15-KDE-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
2680 | 2612 | qtVersion = "5.15.k", |
2681 | 2613 | host = "macOS1015", |
2682 | 2614 | target = "Android-21", |
@@ -2730,7 +2662,7 @@ conf.q5_kdemx6_aalnl = { | ||
2730 | 2662 | -------------------------------------------------------------------- |
2731 | 2663 | |
2732 | 2664 | conf.q6_2wx6v9 = { |
2733 | - name = "Qt6.2.4-Windows-x86_64-VS2019-&MSVCVER&", | |
2665 | + name = "Qt6.2.4-Windows-x86_64-VS2019-&HOSTTOOLVERSION&", | |
2734 | 2666 | qtVersion = "6.2.4", |
2735 | 2667 | host = "Win10", |
2736 | 2668 | toolchain = "MSVC2019-64", |
@@ -2766,7 +2698,7 @@ conf.q6_2wx6v9 = { | ||
2766 | 2698 | } |
2767 | 2699 | |
2768 | 2700 | conf.q6_2wx6v9st = { |
2769 | - name = "Qt6.2.4-Windows-x86_64-VS2019-&MSVCVER&-static", | |
2701 | + name = "Qt6.2.4-Windows-x86_64-VS2019-&HOSTTOOLVERSION&-static", | |
2770 | 2702 | qtVersion = "6.2.4", |
2771 | 2703 | host = "Win10", |
2772 | 2704 | toolchain = "MSVC2019-64", |
@@ -2823,7 +2755,7 @@ conf.q6_2wx6v9st = { | ||
2823 | 2755 | } |
2824 | 2756 | |
2825 | 2757 | conf.q6_2wx6v9sf = { |
2826 | - name = "Qt6.2.4-Windows-x86_64-VS2019-&MSVCVER&-staticFull", | |
2758 | + name = "Qt6.2.4-Windows-x86_64-VS2019-&HOSTTOOLVERSION&-staticFull", | |
2827 | 2759 | qtVersion = "6.2.4", |
2828 | 2760 | host = "Win10", |
2829 | 2761 | toolchain = "MSVC2019-64", |
@@ -2859,7 +2791,7 @@ conf.q6_2wx6v9sf = { | ||
2859 | 2791 | } |
2860 | 2792 | |
2861 | 2793 | conf.q6_2wx6v9_wa6v9 = { |
2862 | - name = "Qt6.2.4-Windows-arm64-VS2019-&MSVCVER&-XWindows-x86_64-VS2019-&MSVCVER&", | |
2794 | + name = "Qt6.2.4-Windows-arm64-VS2019-&HOSTTOOLVERSION&-XWindows-x86_64-VS2019-&HOSTTOOLVERSION&", | |
2863 | 2795 | qtVersion = "6.2.4", |
2864 | 2796 | host = "Win10", |
2865 | 2797 | target = "Win10Arm", |
@@ -2895,7 +2827,7 @@ conf.q6_2wx6v9_wa6v9 = { | ||
2895 | 2827 | } |
2896 | 2828 | |
2897 | 2829 | conf.q6_2wx6v2 = { |
2898 | - name = "Qt6.2.4-Windows-x86_64-VS2022-&MSVCVER&", | |
2830 | + name = "Qt6.2.4-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
2899 | 2831 | qtVersion = "6.2.4", |
2900 | 2832 | host = "Win10", |
2901 | 2833 | toolchain = "MSVC2022-64", |
@@ -2930,7 +2862,7 @@ conf.q6_2wx6v2 = { | ||
2930 | 2862 | } |
2931 | 2863 | |
2932 | 2864 | conf.q6_2wx6m1 = { |
2933 | - name = "Qt6.2.4-Windows-x86_64-MinGW11.2.0", | |
2865 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&", | |
2934 | 2866 | qtVersion = "6.2.4", |
2935 | 2867 | host = "Win10", |
2936 | 2868 | toolchain = "MinGW1120-64", |
@@ -2964,7 +2896,7 @@ conf.q6_2wx6m1 = { | ||
2964 | 2896 | } |
2965 | 2897 | |
2966 | 2898 | conf.q6_2wx6m1st = { |
2967 | - name = "Qt6.2.4-Windows-x86_64-MinGW11.2.0-static", | |
2899 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static", | |
2968 | 2900 | qtVersion = "6.2.4", |
2969 | 2901 | host = "Win10", |
2970 | 2902 | toolchain = "MinGW1120-64", |
@@ -3022,7 +2954,7 @@ conf.q6_2wx6m1st = { | ||
3022 | 2954 | } |
3023 | 2955 | |
3024 | 2956 | conf.q6_2wx6m1sf = { |
3025 | - name = "Qt6.2.4-Windows-x86_64-MinGW11.2.0-staticFull", | |
2957 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull", | |
3026 | 2958 | qtVersion = "6.2.4", |
3027 | 2959 | host = "Win10", |
3028 | 2960 | toolchain = "MinGW1120-64", |
@@ -3059,7 +2991,7 @@ conf.q6_2wx6m1sf = { | ||
3059 | 2991 | } |
3060 | 2992 | |
3061 | 2993 | conf.q6_2wx6m2 = { |
3062 | - name = "Qt6.2.4-Windows-x86_64-MinGW12.1.0", | |
2994 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&", | |
3063 | 2995 | qtVersion = "6.2.4", |
3064 | 2996 | host = "Win10", |
3065 | 2997 | toolchain = "MinGW1210-64", |
@@ -3093,7 +3025,7 @@ conf.q6_2wx6m2 = { | ||
3093 | 3025 | } |
3094 | 3026 | |
3095 | 3027 | conf.q6_2wx6m2sf = { |
3096 | - name = "Qt6.2.4-Windows-x86_64-MinGW12.1.0-staticFull", | |
3028 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-staticFull", | |
3097 | 3029 | qtVersion = "6.2.4", |
3098 | 3030 | host = "Win10", |
3099 | 3031 | toolchain = "MinGW1210-64", |
@@ -3132,7 +3064,7 @@ conf.q6_2wx6m2sf = { | ||
3132 | 3064 | -- Note: Current instruction by "q6_*wx6mu" has nowhere to indicate that this is an LLVM-based toolchain. |
3133 | 3065 | -- Future version of this build configuration should be called "q6_*wx6Lu" where "L" means LLVM-based toolchain. |
3134 | 3066 | conf.q6_2wx6mu = { |
3135 | - name = "Qt6.2.4-Windows-x86_64-llvm-mingw-14.0.0-ucrt", | |
3067 | + name = "Qt6.2.4-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt", | |
3136 | 3068 | qtVersion = "6.2.4", |
3137 | 3069 | host = "Win10", |
3138 | 3070 | toolchain = "MinGWLLVM-ucrt14-64", |
@@ -3173,7 +3105,7 @@ conf.q6_2wx6mu = { | ||
3173 | 3105 | -- Note: Current instruction by "q6_*wx6mv" has nowhere to indicate that this is an LLVM-based toolchain. |
3174 | 3106 | -- Note: Future version of this build configuration should be called "q6_*wx6Lv" where "L" means LLVM-based toolchain. |
3175 | 3107 | conf.q6_2wx6mv = { |
3176 | - name = "Qt6.2.4-Windows-x86_64-llvm-mingw-14.0.0-msvcrt", | |
3108 | + name = "Qt6.2.4-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt", | |
3177 | 3109 | qtVersion = "6.2.4", |
3178 | 3110 | host = "Win10", |
3179 | 3111 | toolchain = "MinGWLLVM-msvcrt14-64", |
@@ -3212,7 +3144,7 @@ conf.q6_2wx6mv = { | ||
3212 | 3144 | } |
3213 | 3145 | |
3214 | 3146 | conf.q6_2lx6st = { |
3215 | - name = "Qt6.2.4-Linux-x86_64-gcc8.5.0-static", | |
3147 | + name = "Qt6.2.4-Linux-x86_64-gcc&HOSTTOOLVERSION&-static", | |
3216 | 3148 | qtVersion = "6.2.4", |
3217 | 3149 | host = "CentOS8", |
3218 | 3150 | variant = {"-static"}, |
@@ -3264,7 +3196,7 @@ conf.q6_2lx6st = { | ||
3264 | 3196 | } |
3265 | 3197 | |
3266 | 3198 | conf.q6_2mx6 = { |
3267 | - name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&", | |
3199 | + name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
3268 | 3200 | qtVersion = "6.2.4", |
3269 | 3201 | host = "macOS1015", |
3270 | 3202 | opensslConf = "o3mx6", |
@@ -3301,7 +3233,7 @@ conf.q6_2mx6 = { | ||
3301 | 3233 | } |
3302 | 3234 | |
3303 | 3235 | conf.q6_2mx6nf = { |
3304 | - name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework", | |
3236 | + name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework", | |
3305 | 3237 | qtVersion = "6.2.4", |
3306 | 3238 | host = "macOS1015", |
3307 | 3239 | variant = {"-noFramework"}, |
@@ -3339,7 +3271,7 @@ conf.q6_2mx6nf = { | ||
3339 | 3271 | } |
3340 | 3272 | |
3341 | 3273 | conf.q6_2mx6st = { |
3342 | - name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&-static", | |
3274 | + name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-static", | |
3343 | 3275 | qtVersion = "6.2.4", |
3344 | 3276 | host = "macOS1015", |
3345 | 3277 | variant = {"-static"}, |
@@ -3396,7 +3328,7 @@ conf.q6_2mx6st = { | ||
3396 | 3328 | } |
3397 | 3329 | |
3398 | 3330 | conf.q6_2mx6sf = { |
3399 | - name = "Qt6.2.4-macOS-x86_64-AppleClang&AppleClangVersion&-staticFull", | |
3331 | + name = "Qt6.2.4-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-staticFull", | |
3400 | 3332 | qtVersion = "6.2.4", |
3401 | 3333 | host = "macOS1015", |
3402 | 3334 | variant = {"-staticFull"}, |
@@ -3432,7 +3364,7 @@ conf.q6_2mx6sf = { | ||
3432 | 3364 | } |
3433 | 3365 | |
3434 | 3366 | conf.q6_2ma6 = { |
3435 | - name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&AppleClangVersion&", | |
3367 | + name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&", | |
3436 | 3368 | qtVersion = "6.2.4", |
3437 | 3369 | host = "macOSM1", |
3438 | 3370 | opensslConf = "o3ma6", |
@@ -3469,7 +3401,7 @@ conf.q6_2ma6 = { | ||
3469 | 3401 | } |
3470 | 3402 | |
3471 | 3403 | conf.q6_2ma6nf = { |
3472 | - name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&AppleClangVersion&-noFramework", | |
3404 | + name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-noFramework", | |
3473 | 3405 | qtVersion = "6.2.4", |
3474 | 3406 | host = "macOSM1", |
3475 | 3407 | variant = {"-noFramework"}, |
@@ -3507,7 +3439,7 @@ conf.q6_2ma6nf = { | ||
3507 | 3439 | } |
3508 | 3440 | |
3509 | 3441 | conf.q6_2ma6sf = { |
3510 | - name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&AppleClangVersion&-staticFull", | |
3442 | + name = "Qt6.2.4-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-staticFull", | |
3511 | 3443 | qtVersion = "6.2.4", |
3512 | 3444 | host = "macOSM1", |
3513 | 3445 | variant = {"-staticFull"}, |
@@ -3543,7 +3475,7 @@ conf.q6_2ma6sf = { | ||
3543 | 3475 | } |
3544 | 3476 | |
3545 | 3477 | conf.q6_2wx6m1_aa3n3 = { |
3546 | - name = "Qt6.2.4-Android-arm-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0", | |
3478 | + name = "Qt6.2.4-Android-arm-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
3547 | 3479 | qtVersion = "6.2.4", |
3548 | 3480 | host = "Win10", |
3549 | 3481 | target = "Android-24", |
@@ -3582,7 +3514,7 @@ conf.q6_2wx6m1_aa3n3 = { | ||
3582 | 3514 | } |
3583 | 3515 | |
3584 | 3516 | conf.q6_2wx6m1_aa6n3 = { |
3585 | - name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0", | |
3517 | + name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
3586 | 3518 | qtVersion = "6.2.4", |
3587 | 3519 | host = "Win10", |
3588 | 3520 | target = "Android-24", |
@@ -3621,7 +3553,7 @@ conf.q6_2wx6m1_aa6n3 = { | ||
3621 | 3553 | } |
3622 | 3554 | |
3623 | 3555 | conf.q6_2wx6m1_ax3n3 = { |
3624 | - name = "Qt6.2.4-Android-x86-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0", | |
3556 | + name = "Qt6.2.4-Android-x86-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
3625 | 3557 | qtVersion = "6.2.4", |
3626 | 3558 | host = "Win10", |
3627 | 3559 | target = "Android-24", |
@@ -3660,7 +3592,7 @@ conf.q6_2wx6m1_ax3n3 = { | ||
3660 | 3592 | } |
3661 | 3593 | |
3662 | 3594 | conf.q6_2wx6m1_ax6n3 = { |
3663 | - name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0", | |
3595 | + name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
3664 | 3596 | qtVersion = "6.2.4", |
3665 | 3597 | host = "Win10", |
3666 | 3598 | target = "Android-24", |
@@ -3699,7 +3631,7 @@ conf.q6_2wx6m1_ax6n3 = { | ||
3699 | 3631 | } |
3700 | 3632 | |
3701 | 3633 | conf.q6_2lx6_aa3n3 = { |
3702 | - name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0", | |
3634 | + name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
3703 | 3635 | qtVersion = "6.2.4", |
3704 | 3636 | host = "CentOS8", |
3705 | 3637 | target = "Android-24", |
@@ -3736,7 +3668,7 @@ conf.q6_2lx6_aa3n3 = { | ||
3736 | 3668 | } |
3737 | 3669 | |
3738 | 3670 | conf.q6_2lx6_aa6n3 = { |
3739 | - name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0", | |
3671 | + name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
3740 | 3672 | qtVersion = "6.2.4", |
3741 | 3673 | host = "CentOS8", |
3742 | 3674 | target = "Android-24", |
@@ -3773,7 +3705,7 @@ conf.q6_2lx6_aa6n3 = { | ||
3773 | 3705 | } |
3774 | 3706 | |
3775 | 3707 | conf.q6_2lx6_ax3n3 = { |
3776 | - name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0", | |
3708 | + name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
3777 | 3709 | qtVersion = "6.2.4", |
3778 | 3710 | host = "CentOS8", |
3779 | 3711 | target = "Android-24", |
@@ -3810,7 +3742,7 @@ conf.q6_2lx6_ax3n3 = { | ||
3810 | 3742 | } |
3811 | 3743 | |
3812 | 3744 | conf.q6_2lx6_ax6n3 = { |
3813 | - name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0", | |
3745 | + name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
3814 | 3746 | qtVersion = "6.2.4", |
3815 | 3747 | host = "CentOS8", |
3816 | 3748 | target = "Android-24", |
@@ -3847,7 +3779,7 @@ conf.q6_2lx6_ax6n3 = { | ||
3847 | 3779 | } |
3848 | 3780 | |
3849 | 3781 | conf.q6_2mx6_aa3n3 = { |
3850 | - name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
3782 | + name = "Qt6.2.4-Android-arm-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
3851 | 3783 | qtVersion = "6.2.4", |
3852 | 3784 | host = "macOS1015", |
3853 | 3785 | target = "Android-24", |
@@ -3884,7 +3816,7 @@ conf.q6_2mx6_aa3n3 = { | ||
3884 | 3816 | } |
3885 | 3817 | |
3886 | 3818 | conf.q6_2mx6_aa6n3 = { |
3887 | - name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
3819 | + name = "Qt6.2.4-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
3888 | 3820 | qtVersion = "6.2.4", |
3889 | 3821 | host = "macOS1015", |
3890 | 3822 | target = "Android-24", |
@@ -3921,7 +3853,7 @@ conf.q6_2mx6_aa6n3 = { | ||
3921 | 3853 | } |
3922 | 3854 | |
3923 | 3855 | conf.q6_2mx6_ax3n3 = { |
3924 | - name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
3856 | + name = "Qt6.2.4-Android-x86-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
3925 | 3857 | qtVersion = "6.2.4", |
3926 | 3858 | host = "macOS1015", |
3927 | 3859 | target = "Android-24", |
@@ -3958,7 +3890,7 @@ conf.q6_2mx6_ax3n3 = { | ||
3958 | 3890 | } |
3959 | 3891 | |
3960 | 3892 | conf.q6_2mx6_ax6n3 = { |
3961 | - name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
3893 | + name = "Qt6.2.4-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
3962 | 3894 | qtVersion = "6.2.4", |
3963 | 3895 | host = "macOS1015", |
3964 | 3896 | target = "Android-24", |
@@ -3996,7 +3928,7 @@ conf.q6_2mx6_ax6n3 = { | ||
3996 | 3928 | |
3997 | 3929 | -- WebAssembly uses emcmake which don't need a toolchain file |
3998 | 3930 | conf.q6_2wx6m1_W = { |
3999 | - name = "Qt6.2.4-WebAssembly-emscripten2.0.14-xWindows-x86_64-MinGW11.2.0", | |
3931 | + name = "Qt6.2.4-WebAssembly-emscripten&TARGETEMCCVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
4000 | 3932 | qtVersion = "6.2.4", |
4001 | 3933 | host = "Win10", |
4002 | 3934 | toolchain = "MinGW1120-64", |
@@ -4028,7 +3960,7 @@ conf.q6_2wx6m1_W = { | ||
4028 | 3960 | } |
4029 | 3961 | |
4030 | 3962 | conf.q6_2lx6_W = { |
4031 | - name = "Qt6.2.4-WebAssembly-emscripten2.0.14-xLinux-x86_64-gcc8.5.0", | |
3963 | + name = "Qt6.2.4-WebAssembly-emscripten&TARGETEMCCVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
4032 | 3964 | qtVersion = "6.2.4", |
4033 | 3965 | host = "CentOS8", |
4034 | 3966 | target = "WebAssembly", |
@@ -4057,7 +3989,7 @@ conf.q6_2lx6_W = { | ||
4057 | 3989 | } |
4058 | 3990 | |
4059 | 3991 | conf.q6_2mx6_W = { |
4060 | - name = "Qt6.2.4-WebAssembly-emscripten2.0.14-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
3992 | + name = "Qt6.2.4-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
4061 | 3993 | qtVersion = "6.2.4", |
4062 | 3994 | host = "macOS1015", |
4063 | 3995 | target = "WebAssembly", |
@@ -4088,7 +4020,7 @@ conf.q6_2mx6_W = { | ||
4088 | 4020 | -------------------------------------------------------------------- |
4089 | 4021 | |
4090 | 4022 | conf.q6_3wx6v9 = { |
4091 | - name = "Qt6.3.1-Windows-x86_64-VS2019-&MSVCVER&", | |
4023 | + name = "Qt6.3.1-Windows-x86_64-VS2019-&HOSTTOOLVERSION&", | |
4092 | 4024 | qtVersion = "6.3.1", |
4093 | 4025 | host = "Win10", |
4094 | 4026 | toolchain = "MSVC2019-64", |
@@ -4124,7 +4056,7 @@ conf.q6_3wx6v9 = { | ||
4124 | 4056 | } |
4125 | 4057 | |
4126 | 4058 | conf.q6_3wx6v2 = { |
4127 | - name = "Qt6.3.1-Windows-x86_64-VS2022-&MSVCVER&", | |
4059 | + name = "Qt6.3.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
4128 | 4060 | qtVersion = "6.3.1", |
4129 | 4061 | host = "Win10", |
4130 | 4062 | toolchain = "MSVC2022-64", |
@@ -4159,7 +4091,7 @@ conf.q6_3wx6v2 = { | ||
4159 | 4091 | } |
4160 | 4092 | |
4161 | 4093 | conf.q6_3wx6v2st = { |
4162 | - name = "Qt6.3.1-Windows-x86_64-VS2022-&MSVCVER&-static", | |
4094 | + name = "Qt6.3.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static", | |
4163 | 4095 | qtVersion = "6.3.1", |
4164 | 4096 | host = "Win10", |
4165 | 4097 | toolchain = "MSVC2022-64", |
@@ -4216,7 +4148,7 @@ conf.q6_3wx6v2st = { | ||
4216 | 4148 | } |
4217 | 4149 | |
4218 | 4150 | conf.q6_3wx6v2_wa6v2 = { |
4219 | - name = "Qt6.3.1-Windows-arm64-VS2022-&MSVCVER&-XWindows-x86_64-VS2022-&MSVCVER&", | |
4151 | + name = "Qt6.3.1-Windows-arm64-VS2022-&HOSTTOOLVERSION&-XWindows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
4220 | 4152 | qtVersion = "6.3.1", |
4221 | 4153 | host = "Win10", |
4222 | 4154 | target = "Win10Arm", |
@@ -4252,7 +4184,7 @@ conf.q6_3wx6v2_wa6v2 = { | ||
4252 | 4184 | } |
4253 | 4185 | |
4254 | 4186 | conf.q6_3wx6m1 = { |
4255 | - name = "Qt6.3.1-Windows-x86_64-MinGW11.2.0", | |
4187 | + name = "Qt6.3.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&", | |
4256 | 4188 | qtVersion = "6.3.1", |
4257 | 4189 | host = "Win10", |
4258 | 4190 | toolchain = "MinGW1120-64", |
@@ -4286,7 +4218,7 @@ conf.q6_3wx6m1 = { | ||
4286 | 4218 | } |
4287 | 4219 | |
4288 | 4220 | conf.q6_3wx6m1st = { |
4289 | - name = "Qt6.3.1-Windows-x86_64-MinGW11.2.0-static", | |
4221 | + name = "Qt6.3.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-static", | |
4290 | 4222 | qtVersion = "6.3.1", |
4291 | 4223 | host = "Win10", |
4292 | 4224 | toolchain = "MinGW1120-64", |
@@ -4344,7 +4276,7 @@ conf.q6_3wx6m1st = { | ||
4344 | 4276 | } |
4345 | 4277 | |
4346 | 4278 | conf.q6_3wx6m2 = { |
4347 | - name = "Qt6.3.1-Windows-x86_64-MinGW12.1.0", | |
4279 | + name = "Qt6.3.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&", | |
4348 | 4280 | qtVersion = "6.3.1", |
4349 | 4281 | host = "Win10", |
4350 | 4282 | toolchain = "MinGW1210-64", |
@@ -4380,7 +4312,7 @@ conf.q6_3wx6m2 = { | ||
4380 | 4312 | -- Note: Current instruction by "q6_*wx6mu" has nowhere to indicate that this is an LLVM-based toolchain. |
4381 | 4313 | -- Note: Future version of this build configuration should be called "q6_*wx6Lu" where "L" means LLVM-based toolchain. |
4382 | 4314 | conf.q6_3wx6mu = { |
4383 | - name = "Qt6.3.1-Windows-x86_64-llvm-mingw-14.0.0-ucrt", | |
4315 | + name = "Qt6.3.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt", | |
4384 | 4316 | qtVersion = "6.3.1", |
4385 | 4317 | host = "Win10", |
4386 | 4318 | toolchain = "MinGWLLVM-ucrt14-64", |
@@ -4421,7 +4353,7 @@ conf.q6_3wx6mu = { | ||
4421 | 4353 | -- Note: Current instruction by "q6_*wx6mv" has nowhere to indicate that this is an LLVM-based toolchain. |
4422 | 4354 | -- Note: Future version of this build configuration should be called "q6_*wx6Lv" where "L" means LLVM-based toolchain. |
4423 | 4355 | conf.q6_3wx6mv = { |
4424 | - name = "Qt6.3.1-Windows-x86_64-llvm-mingw-14.0.0-msvcrt", | |
4356 | + name = "Qt6.3.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt", | |
4425 | 4357 | qtVersion = "6.3.1", |
4426 | 4358 | host = "Win10", |
4427 | 4359 | toolchain = "MinGWLLVM-msvcrt14-64", |
@@ -4460,7 +4392,7 @@ conf.q6_3wx6mv = { | ||
4460 | 4392 | } |
4461 | 4393 | |
4462 | 4394 | conf.q6_3lx6st = { |
4463 | - name = "Qt6.3.1-Linux-x86_64-gcc8.5.0-static", | |
4395 | + name = "Qt6.3.1-Linux-x86_64-gcc&HOSTTOOLVERSION&-static", | |
4464 | 4396 | qtVersion = "6.3.1", |
4465 | 4397 | host = "CentOS8", |
4466 | 4398 | variant = {"-static"}, |
@@ -4512,7 +4444,7 @@ conf.q6_3lx6st = { | ||
4512 | 4444 | } |
4513 | 4445 | |
4514 | 4446 | conf.q6_3mx6 = { |
4515 | - name = "Qt6.3.1-macOS-x86_64-AppleClang&AppleClangVersion&", | |
4447 | + name = "Qt6.3.1-macOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
4516 | 4448 | qtVersion = "6.3.1", |
4517 | 4449 | host = "macOS1015", |
4518 | 4450 | opensslConf = "o3mx6", |
@@ -4550,7 +4482,7 @@ conf.q6_3mx6 = { | ||
4550 | 4482 | } |
4551 | 4483 | |
4552 | 4484 | conf.q6_3mx6nf = { |
4553 | - name = "Qt6.3.1-macOS-x86_64-AppleClang&AppleClangVersion&-noFramework", | |
4485 | + name = "Qt6.3.1-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework", | |
4554 | 4486 | qtVersion = "6.3.1", |
4555 | 4487 | host = "macOS1015", |
4556 | 4488 | variant = {"-noFramework"}, |
@@ -4589,7 +4521,7 @@ conf.q6_3mx6nf = { | ||
4589 | 4521 | } |
4590 | 4522 | |
4591 | 4523 | conf.q6_3mx6st = { |
4592 | - name = "Qt6.3.1-macOS-x86_64-AppleClang&AppleClangVersion&-static", | |
4524 | + name = "Qt6.3.1-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-static", | |
4593 | 4525 | qtVersion = "6.3.1", |
4594 | 4526 | host = "macOS1015", |
4595 | 4527 | variant = {"-static"}, |
@@ -4646,7 +4578,7 @@ conf.q6_3mx6st = { | ||
4646 | 4578 | } |
4647 | 4579 | |
4648 | 4580 | conf.q6_3ma6 = { |
4649 | - name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&AppleClangVersion&", | |
4581 | + name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&", | |
4650 | 4582 | qtVersion = "6.3.1", |
4651 | 4583 | host = "macOSM1", |
4652 | 4584 | opensslConf = "o3ma6", |
@@ -4684,7 +4616,7 @@ conf.q6_3ma6 = { | ||
4684 | 4616 | } |
4685 | 4617 | |
4686 | 4618 | conf.q6_3ma6nf = { |
4687 | - name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&AppleClangVersion&-noFramework", | |
4619 | + name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-noFramework", | |
4688 | 4620 | qtVersion = "6.3.1", |
4689 | 4621 | host = "macOSM1", |
4690 | 4622 | variant = {"-noFramework"}, |
@@ -4723,7 +4655,7 @@ conf.q6_3ma6nf = { | ||
4723 | 4655 | } |
4724 | 4656 | |
4725 | 4657 | conf.q6_3ma6st = { |
4726 | - name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&AppleClangVersion&-static", | |
4658 | + name = "Qt6.3.1-macOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&-static", | |
4727 | 4659 | qtVersion = "6.3.1", |
4728 | 4660 | host = "macOSM1", |
4729 | 4661 | variant = {"-static"}, |
@@ -4780,7 +4712,7 @@ conf.q6_3ma6st = { | ||
4780 | 4712 | } |
4781 | 4713 | |
4782 | 4714 | conf.q6_3wx6m1_aa6n3 = { |
4783 | - name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0", | |
4715 | + name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
4784 | 4716 | qtVersion = "6.3.1", |
4785 | 4717 | host = "Win10", |
4786 | 4718 | target = "Android-24", |
@@ -4819,7 +4751,7 @@ conf.q6_3wx6m1_aa6n3 = { | ||
4819 | 4751 | } |
4820 | 4752 | |
4821 | 4753 | conf.q6_3wx6m1_ax6n3 = { |
4822 | - name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW11.2.0", | |
4754 | + name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-XWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
4823 | 4755 | qtVersion = "6.3.1", |
4824 | 4756 | host = "Win10", |
4825 | 4757 | target = "Android-24", |
@@ -4858,7 +4790,7 @@ conf.q6_3wx6m1_ax6n3 = { | ||
4858 | 4790 | } |
4859 | 4791 | |
4860 | 4792 | conf.q6_3lx6_aa6n3 = { |
4861 | - name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0", | |
4793 | + name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
4862 | 4794 | qtVersion = "6.3.1", |
4863 | 4795 | host = "CentOS8", |
4864 | 4796 | target = "Android-24", |
@@ -4895,7 +4827,7 @@ conf.q6_3lx6_aa6n3 = { | ||
4895 | 4827 | } |
4896 | 4828 | |
4897 | 4829 | conf.q6_3lx6_ax6n3 = { |
4898 | - name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc8.5.0", | |
4830 | + name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
4899 | 4831 | qtVersion = "6.3.1", |
4900 | 4832 | host = "CentOS8", |
4901 | 4833 | target = "Android-24", |
@@ -4932,7 +4864,7 @@ conf.q6_3lx6_ax6n3 = { | ||
4932 | 4864 | } |
4933 | 4865 | |
4934 | 4866 | conf.q6_3mx6_aa6n3 = { |
4935 | - name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
4867 | + name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
4936 | 4868 | qtVersion = "6.3.1", |
4937 | 4869 | host = "macOS1015", |
4938 | 4870 | target = "Android-24", |
@@ -4969,7 +4901,7 @@ conf.q6_3mx6_aa6n3 = { | ||
4969 | 4901 | } |
4970 | 4902 | |
4971 | 4903 | conf.q6_3mx6_ax6n3 = { |
4972 | - name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
4904 | + name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
4973 | 4905 | qtVersion = "6.3.1", |
4974 | 4906 | host = "macOS1015", |
4975 | 4907 | target = "Android-24", |
@@ -5006,7 +4938,7 @@ conf.q6_3mx6_ax6n3 = { | ||
5006 | 4938 | } |
5007 | 4939 | |
5008 | 4940 | conf.q6_3ma6_aa6n3 = { |
5009 | - name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&AppleClangVersion&", | |
4941 | + name = "Qt6.3.1-Android-arm64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&", | |
5010 | 4942 | qtVersion = "6.3.1", |
5011 | 4943 | host = "macOSM1", |
5012 | 4944 | target = "Android-24", |
@@ -5043,7 +4975,7 @@ conf.q6_3ma6_aa6n3 = { | ||
5043 | 4975 | } |
5044 | 4976 | |
5045 | 4977 | conf.q6_3ma6_ax6n3 = { |
5046 | - name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&AppleClangVersion&", | |
4978 | + name = "Qt6.3.1-Android-x86_64-Clang-NDKr23c-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&", | |
5047 | 4979 | qtVersion = "6.3.1", |
5048 | 4980 | host = "macOSM1", |
5049 | 4981 | target = "Android-24", |
@@ -5081,7 +5013,7 @@ conf.q6_3ma6_ax6n3 = { | ||
5081 | 5013 | |
5082 | 5014 | -- WebAssembly uses emcmake which don't need a toolchain file |
5083 | 5015 | conf.q6_3wx6m1_W = { |
5084 | - name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xWindows-x86_64-MinGW11.2.0", | |
5016 | + name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&", | |
5085 | 5017 | qtVersion = "6.3.1", |
5086 | 5018 | host = "Win10", |
5087 | 5019 | toolchain = "MinGW1120-64", |
@@ -5113,7 +5045,7 @@ conf.q6_3wx6m1_W = { | ||
5113 | 5045 | } |
5114 | 5046 | |
5115 | 5047 | conf.q6_3lx6_W = { |
5116 | - name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xLinux-x86_64-gcc8.5.0", | |
5048 | + name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
5117 | 5049 | qtVersion = "6.3.1", |
5118 | 5050 | host = "CentOS8", |
5119 | 5051 | target = "WebAssembly", |
@@ -5142,7 +5074,7 @@ conf.q6_3lx6_W = { | ||
5142 | 5074 | } |
5143 | 5075 | |
5144 | 5076 | conf.q6_3mx6_W = { |
5145 | - name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xmacOS-x86_64-AppleClang&AppleClangVersion&", | |
5077 | + name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&", | |
5146 | 5078 | qtVersion = "6.3.1", |
5147 | 5079 | host = "macOS1015", |
5148 | 5080 | target = "WebAssembly", |
@@ -5171,7 +5103,7 @@ conf.q6_3mx6_W = { | ||
5171 | 5103 | } |
5172 | 5104 | |
5173 | 5105 | conf.q6_3ma6_W = { |
5174 | - name = "Qt6.3.1-WebAssembly-emscripten3.0.0-xmacOS-arm64_v8a-AppleClang&AppleClangVersion&", | |
5106 | + name = "Qt6.3.1-WebAssembly-emscripten&TARGETEMCCVERSION&-xmacOS-arm64_v8a-AppleClang&HOSTTOOLVERSION&", | |
5175 | 5107 | qtVersion = "6.3.1", |
5176 | 5108 | host = "macOS1015", |
5177 | 5109 | target = "WebAssembly", |
@@ -5218,19 +5150,6 @@ local QQtPatcherVersion = { | ||
5218 | 5150 | |
5219 | 5151 | setmetatable(QQtPatcherVersion, versionMo) |
5220 | 5152 | |
5221 | -local MsvcVer = { | |
5222 | - ["MSVC2015"] = "14", | |
5223 | - ["MSVC2017"] = "15.9.49", | |
5224 | - ["MSVC2019"] = "16.11.16", | |
5225 | - ["MSVC2022"] = "17.2.4", | |
5226 | -} | |
5227 | - | |
5228 | -local AppleClangVersion = { | |
5229 | - ["macOS1015"] = "13.1.6", | |
5230 | - ["macOSM1"] = "13.1.6", | |
5231 | - ["macOSLegacy"] = "12.0.5", | |
5232 | -} | |
5233 | - | |
5234 | 5153 | local Qt6StaticConf = { |
5235 | 5154 | Win10 = { |
5236 | 5155 | ["6.2.4"] = "q6_2wx6m1st", |
@@ -5285,14 +5204,6 @@ for name, value in pairs(conf) do | ||
5285 | 5204 | if not value.toolchain then |
5286 | 5205 | value.toolchain = "PATH" |
5287 | 5206 | end |
5288 | - | |
5289 | - -- hack MSVCVER into name | |
5290 | - if string.sub(value.toolchain, 1, 4) == "MSVC" then | |
5291 | - value.name = string.gsub(value.name, "%&MSVCVER%&", MsvcVer[string.sub(value.toolchain, 1, 8)]) | |
5292 | - end | |
5293 | - if string.find(value.name, "AppleClang") then | |
5294 | - value.name = string.gsub(value.name, "%&AppleClangVersion%&", AppleClangVersion[value.host]) | |
5295 | - end | |
5296 | 5207 | end |
5297 | 5208 | |
5298 | 5209 | local valueMo = { |