Revision | 74a99d3917620eb00c7dffbc2b9b8a418eef1552 (tree) |
---|---|
Zeit | 2023-05-30 08:21:37 |
Autor | Fs <Fsu0413@vip....> |
Commiter | Fs |
更新更新更
@@ -40,6 +40,8 @@ conf.host.win = { | ||
40 | 40 | ["MinGW1120-64"] = "D:\\mingw-w64\\11.2.0-4\\mingw64\\bin", |
41 | 41 | ["MinGW1220-64"] = "D:\\mingw-w64\\12.2.0\\mingw64\\bin", |
42 | 42 | ["MinGW122u-64"] = "D:\\mingw-w64\\12.2.0u\\mingw64\\bin", |
43 | + ["MinGW1310-64"] = "D:\\mingw-w64\\13.1.0\\mingw64\\bin", | |
44 | + ["MinGW131u-64"] = "D:\\mingw-w64\\13.1.0u\\mingw64\\bin", | |
43 | 45 | |
44 | 46 | -- MinGW toolchains with Clang / LLVM, currently used in Qt 6 only |
45 | 47 | -- LLVM always acts as an cross compiler, but the target libraries are architecture-dependent |
@@ -99,6 +101,8 @@ conf.host.msys = { | ||
99 | 101 | ["MinGW1120-64"] = "/d/mingw-w64/11.2.0-4/mingw64/bin/", |
100 | 102 | ["MinGW1220-64"] = "/d/mingw-w64/12.2.0/mingw64/bin/", |
101 | 103 | ["MinGW122u-64"] = "/d/mingw-w64/12.2.0u/mingw64/bin/", |
104 | + ["MinGW1310-64"] = "/d/mingw-w64/13.1.0/mingw64/bin/", | |
105 | + ["MinGW131u-64"] = "/d/mingw-w64/13.1.0u/mingw64/bin/", | |
102 | 106 | |
103 | 107 | ["MinGWLLVM-msvcrt15-64"] = {"/d/mingw-w64/llvm-mingw-20220906-msvcrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20220906-msvcrt-x86_64/bin"}, |
104 | 108 | ["MinGWLLVM-ucrt15-64"] = {"/d/mingw-w64/llvm-mingw-20220906-ucrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20220906-ucrt-x86_64/bin"}, |
@@ -4,8 +4,8 @@ local conf = {} | ||
4 | 4 | --[[ |
5 | 5 | abbrs: |
6 | 6 | mariadb Versions: |
7 | - m3_1: mariadb connector C 3.1.20 | |
8 | - m3_3: mariadb connector C 3.3.4 | |
7 | + m3_1: mariadb connector C 3.1.21 | |
8 | + m3_3: mariadb connector C 3.3.5 | |
9 | 9 | |
10 | 10 | Platforms: |
11 | 11 | w: Windows |
@@ -29,6 +29,8 @@ abbrs: | ||
29 | 29 | g1: MinGW-w64, with GCC 11.2.0 |
30 | 30 | g2: MinGW-w64, msvcrt, with GCC 12.2.0 |
31 | 31 | p2: MinGW-w64, ucrt, with GCC 12.2.0 |
32 | + g3: MinGW-w64, msvcrt, with GCC 13.1.0 | |
33 | + p3: MinGW-w64, ucrt, with GCC 13.1.0 | |
32 | 34 | s5: LLVM/Clang based MinGW-w64, msvcrt, with LLVM 15 |
33 | 35 | u5: LLVM/Clang based MinGW-w64, ucrt, with LLVM 15 |
34 | 36 | s6: LLVM/Clang based MinGW-w64, msvcrt, with LLVM 16 |
@@ -38,11 +40,11 @@ abbrs: | ||
38 | 40 | |
39 | 41 | -------------------------------------------------------------------- |
40 | 42 | |
41 | --- mariadb connector 3.1.20 | |
43 | +-- mariadb connector 3.1.21 | |
42 | 44 | |
43 | 45 | conf.m3_1wx3v5 = { |
44 | - name = "mariadb_connector_c3.1.20-Windows-x86-VS2015", | |
45 | - mariadbVersion = "3.1.20", | |
46 | + name = "mariadb_connector_c3.1.21-Windows-x86-VS2015", | |
47 | + mariadbVersion = "3.1.21", | |
46 | 48 | host = "Win8", |
47 | 49 | toolchain = "MSVC2015-32", |
48 | 50 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -64,8 +66,8 @@ conf.m3_1wx3v5 = { | ||
64 | 66 | } |
65 | 67 | |
66 | 68 | conf.m3_1wx6v5 = { |
67 | - name = "mariadb_connector_c3.1.20-Windows-x86_64-VS2015", | |
68 | - mariadbVersion = "3.1.20", | |
69 | + name = "mariadb_connector_c3.1.21-Windows-x86_64-VS2015", | |
70 | + mariadbVersion = "3.1.21", | |
69 | 71 | host = "Win8", |
70 | 72 | toolchain = "MSVC2015-64", |
71 | 73 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -87,8 +89,8 @@ conf.m3_1wx6v5 = { | ||
87 | 89 | } |
88 | 90 | |
89 | 91 | conf.m3_1wx3v7 = { |
90 | - name = "mariadb_connector_c3.1.20-Windows-x86-VS2017-&TARGETTOOLVERSION&", | |
91 | - mariadbVersion = "3.1.20", | |
92 | + name = "mariadb_connector_c3.1.21-Windows-x86-VS2017-&TARGETTOOLVERSION&", | |
93 | + mariadbVersion = "3.1.21", | |
92 | 94 | host = "Win10", |
93 | 95 | toolchain = "MSVC2017-32", |
94 | 96 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -110,8 +112,8 @@ conf.m3_1wx3v7 = { | ||
110 | 112 | } |
111 | 113 | |
112 | 114 | conf.m3_1wx6v7 = { |
113 | - name = "mariadb_connector_c3.1.20-Windows-x86_64-VS2017-&TARGETTOOLVERSION&", | |
114 | - mariadbVersion = "3.1.20", | |
115 | + name = "mariadb_connector_c3.1.21-Windows-x86_64-VS2017-&TARGETTOOLVERSION&", | |
116 | + mariadbVersion = "3.1.21", | |
115 | 117 | host = "Win10", |
116 | 118 | toolchain = "MSVC2017-64", |
117 | 119 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -133,8 +135,8 @@ conf.m3_1wx6v7 = { | ||
133 | 135 | } |
134 | 136 | |
135 | 137 | conf.m3_1wx3v9 = { |
136 | - name = "mariadb_connector_c3.1.20-Windows-x86-VS2019-&TARGETTOOLVERSION&", | |
137 | - mariadbVersion = "3.1.20", | |
138 | + name = "mariadb_connector_c3.1.21-Windows-x86-VS2019-&TARGETTOOLVERSION&", | |
139 | + mariadbVersion = "3.1.21", | |
138 | 140 | host = "Win10", |
139 | 141 | toolchain = "MSVC2019-32", |
140 | 142 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -156,8 +158,8 @@ conf.m3_1wx3v9 = { | ||
156 | 158 | } |
157 | 159 | |
158 | 160 | conf.m3_1wx6v9 = { |
159 | - name = "mariadb_connector_c3.1.20-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
160 | - mariadbVersion = "3.1.20", | |
161 | + name = "mariadb_connector_c3.1.21-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
162 | + mariadbVersion = "3.1.21", | |
161 | 163 | host = "Win10", |
162 | 164 | toolchain = "MSVC2019-64", |
163 | 165 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -179,8 +181,8 @@ conf.m3_1wx6v9 = { | ||
179 | 181 | } |
180 | 182 | |
181 | 183 | conf.m3_1wx6v2 = { |
182 | - name = "mariadb_connector_c3.1.20-Windows-x86_64-VS2022-&TARGETTOOLVERSION&", | |
183 | - mariadbVersion = "3.1.20", | |
184 | + name = "mariadb_connector_c3.1.21-Windows-x86_64-VS2022-&TARGETTOOLVERSION&", | |
185 | + mariadbVersion = "3.1.21", | |
184 | 186 | host = "Win10", |
185 | 187 | toolchain = "MSVC2022-64", |
186 | 188 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -205,8 +207,8 @@ conf.m3_1wx6v2 = { | ||
205 | 207 | |
206 | 208 | -- build failed due to conflicting function definition??? |
207 | 209 | conf.m3_1wx3g8 = { |
208 | - name = "mariadb_connector_c3.1.20-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&", | |
209 | - mariadbVersion = "3.1.20", | |
210 | + name = "mariadb_connector_c3.1.21-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&", | |
211 | + mariadbVersion = "3.1.21", | |
210 | 212 | host = "Win10", |
211 | 213 | toolchain = "MinGW810-32", |
212 | 214 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -228,8 +230,8 @@ conf.m3_1wx3g8 = { | ||
228 | 230 | } |
229 | 231 | |
230 | 232 | conf.m3_1wx6g8 = { |
231 | - name = "mariadb_connector_c3.1.20-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
232 | - mariadbVersion = "3.1.20", | |
233 | + name = "mariadb_connector_c3.1.21-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
234 | + mariadbVersion = "3.1.21", | |
233 | 235 | host = "Win10", |
234 | 236 | toolchain = "MinGW810-64", |
235 | 237 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -253,8 +255,8 @@ conf.m3_1wx6g8 = { | ||
253 | 255 | -------------------------------------------------------------------- |
254 | 256 | |
255 | 257 | conf.m3_1mal = { |
256 | - name = "mariadb_connector_c3.1.20-macOS-ALL-AppleClang&TARGETTOOLVERSION&", | |
257 | - mariadbVersion = "3.1.20", | |
258 | + name = "mariadb_connector_c3.1.21-macOS-ALL-AppleClang&TARGETTOOLVERSION&", | |
259 | + mariadbVersion = "3.1.21", | |
258 | 260 | host = "macOSM1", |
259 | 261 | libPath = { "lib/mariadb/libmariadb.3.dylib" }, |
260 | 262 | configureParameter = [[ |
@@ -277,11 +279,11 @@ conf.m3_1mal = { | ||
277 | 279 | |
278 | 280 | -------------------------------------------------------------------- |
279 | 281 | |
280 | --- mariadb connector 3.3.4 | |
282 | +-- mariadb connector 3.3.5 | |
281 | 283 | |
282 | 284 | conf.m3_3wx6v9 = { |
283 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
284 | - mariadbVersion = "3.3.4", | |
285 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
286 | + mariadbVersion = "3.3.5", | |
285 | 287 | host = "Win10", |
286 | 288 | toolchain = "MSVC2019-64", |
287 | 289 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -303,8 +305,8 @@ conf.m3_3wx6v9 = { | ||
303 | 305 | } |
304 | 306 | |
305 | 307 | conf.m3_3wx6v2 = { |
306 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-VS2022-&TARGETTOOLVERSION&", | |
307 | - mariadbVersion = "3.3.4", | |
308 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-VS2022-&TARGETTOOLVERSION&", | |
309 | + mariadbVersion = "3.3.5", | |
308 | 310 | host = "Win10", |
309 | 311 | toolchain = "MSVC2022-64", |
310 | 312 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -328,8 +330,8 @@ conf.m3_3wx6v2 = { | ||
328 | 330 | -------------------------------------------------------------------- |
329 | 331 | |
330 | 332 | conf.m3_3wx6g1 = { |
331 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
332 | - mariadbVersion = "3.3.4", | |
333 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
334 | + mariadbVersion = "3.3.5", | |
333 | 335 | host = "Win10", |
334 | 336 | toolchain = "MinGW1120-64", |
335 | 337 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -351,8 +353,8 @@ conf.m3_3wx6g1 = { | ||
351 | 353 | } |
352 | 354 | |
353 | 355 | conf.m3_3wx6p2 = { |
354 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt", | |
355 | - mariadbVersion = "3.3.4", | |
356 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt", | |
357 | + mariadbVersion = "3.3.5", | |
356 | 358 | host = "Win10", |
357 | 359 | toolchain = "MinGW122u-64", |
358 | 360 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -374,8 +376,8 @@ conf.m3_3wx6p2 = { | ||
374 | 376 | } |
375 | 377 | |
376 | 378 | conf.m3_3wx6g2 = { |
377 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt", | |
378 | - mariadbVersion = "3.3.4", | |
379 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt", | |
380 | + mariadbVersion = "3.3.5", | |
379 | 381 | host = "Win10", |
380 | 382 | toolchain = "MinGW1220-64", |
381 | 383 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -396,11 +398,57 @@ conf.m3_3wx6g2 = { | ||
396 | 398 | ]], |
397 | 399 | } |
398 | 400 | |
401 | +conf.m3_3wx6p3 = { | |
402 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt", | |
403 | + mariadbVersion = "3.3.5", | |
404 | + host = "Win10", | |
405 | + toolchain = "MinGW131u-64", | |
406 | + libPath = { "lib\\mariadb\\libmariadb.dll" }, | |
407 | + configureParameter = [[ | |
408 | + -GNinja | |
409 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
410 | + -DCMAKE_BUILD_TYPE="Release" | |
411 | + -DCLIENT_PLUGIN_DIALOG=STATIC | |
412 | + -DCLIENT_PLUGIN_CLIENT_ED25519=STATIC | |
413 | + -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=STATIC | |
414 | + -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC | |
415 | + -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=STATIC | |
416 | + -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC | |
417 | + -DCLIENT_PLUGIN_PVIO_NPIPE=STATIC | |
418 | + -DCLIENT_PLUGIN_PVIO_SHMEM=STATIC | |
419 | + -DWITH_SSL=SCHANNEL | |
420 | + -DCMAKE_C_FLAGS="-Dstrerror_r(a,b,c)=strerror_s(b,c,a)" | |
421 | + ]], | |
422 | +} | |
423 | + | |
424 | +conf.m3_3wx6g3 = { | |
425 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt", | |
426 | + mariadbVersion = "3.3.5", | |
427 | + host = "Win10", | |
428 | + toolchain = "MinGW1310-64", | |
429 | + libPath = { "lib\\mariadb\\libmariadb.dll" }, | |
430 | + configureParameter = [[ | |
431 | + -GNinja | |
432 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
433 | + -DCMAKE_BUILD_TYPE="Release" | |
434 | + -DCLIENT_PLUGIN_DIALOG=STATIC | |
435 | + -DCLIENT_PLUGIN_CLIENT_ED25519=STATIC | |
436 | + -DCLIENT_PLUGIN_CACHING_SHA2_PASSWORD=STATIC | |
437 | + -DCLIENT_PLUGIN_SHA256_PASSWORD=STATIC | |
438 | + -DCLIENT_PLUGIN_AUTH_GSSAPI_CLIENT=STATIC | |
439 | + -DCLIENT_PLUGIN_MYSQL_CLEAR_PASSWORD=STATIC | |
440 | + -DCLIENT_PLUGIN_PVIO_NPIPE=STATIC | |
441 | + -DCLIENT_PLUGIN_PVIO_SHMEM=STATIC | |
442 | + -DWITH_SSL=SCHANNEL | |
443 | + -DCMAKE_C_FLAGS="-Dstrerror_r(a,b,c)=strerror_s(b,c,a)" | |
444 | + ]], | |
445 | +} | |
446 | + | |
399 | 447 | -------------------------------------------------------------------- |
400 | 448 | |
401 | 449 | conf.m3_3wx6u5 = { |
402 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
403 | - mariadbVersion = "3.3.4", | |
450 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
451 | + mariadbVersion = "3.3.5", | |
404 | 452 | host = "Win10", |
405 | 453 | toolchain = "MinGWLLVM-ucrt15-64", |
406 | 454 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -424,8 +472,8 @@ conf.m3_3wx6u5 = { | ||
424 | 472 | } |
425 | 473 | |
426 | 474 | conf.m3_3wx6s5 = { |
427 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
428 | - mariadbVersion = "3.3.4", | |
475 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
476 | + mariadbVersion = "3.3.5", | |
429 | 477 | host = "Win10", |
430 | 478 | toolchain = "MinGWLLVM-msvcrt15-64", |
431 | 479 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -450,8 +498,8 @@ conf.m3_3wx6s5 = { | ||
450 | 498 | -------------------------------------------------------------------- |
451 | 499 | |
452 | 500 | conf.m3_3wx6u6 = { |
453 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
454 | - mariadbVersion = "3.3.4", | |
501 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
502 | + mariadbVersion = "3.3.5", | |
455 | 503 | host = "Win10", |
456 | 504 | toolchain = "MinGWLLVM-ucrt16-64", |
457 | 505 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -475,8 +523,8 @@ conf.m3_3wx6u6 = { | ||
475 | 523 | } |
476 | 524 | |
477 | 525 | conf.m3_3wx6s6 = { |
478 | - name = "mariadb_connector_c3.3.4-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
479 | - mariadbVersion = "3.3.4", | |
526 | + name = "mariadb_connector_c3.3.5-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
527 | + mariadbVersion = "3.3.5", | |
480 | 528 | host = "Win10", |
481 | 529 | toolchain = "MinGWLLVM-msvcrt16-64", |
482 | 530 | libPath = { "lib\\mariadb\\libmariadb.dll" }, |
@@ -502,8 +550,8 @@ conf.m3_3wx6s6 = { | ||
502 | 550 | -------------------------------------------------------------------- |
503 | 551 | |
504 | 552 | conf.m3_3mal = { |
505 | - name = "mariadb_connector_c3.3.4-macOS-ALL-AppleClang&TARGETTOOLVERSION&", | |
506 | - mariadbVersion = "3.3.4", | |
553 | + name = "mariadb_connector_c3.3.5-macOS-ALL-AppleClang&TARGETTOOLVERSION&", | |
554 | + mariadbVersion = "3.3.5", | |
507 | 555 | host = "macOSM1", |
508 | 556 | libPath = { "lib/mariadb/libmariadb.3.dylib" }, |
509 | 557 | configureParameter = [[ |
@@ -4,8 +4,8 @@ local conf = {} | ||
4 | 4 | --[[ |
5 | 5 | abbrs: |
6 | 6 | OpenSSL Versions: |
7 | - o1: OpenSSL 1.1.1t-2 | |
8 | - o3: OpenSSL 3.0.8-2 | |
7 | + o1: OpenSSL 1.1.1u | |
8 | + o3: OpenSSL 3.0.9 | |
9 | 9 | |
10 | 10 | Platforms: |
11 | 11 | w: Windows |
@@ -31,6 +31,8 @@ abbrs: | ||
31 | 31 | g1: MinGW-w64, with GCC 11.2.0 |
32 | 32 | g2: MinGW-w64, msvcrt, with GCC 12.2.0 |
33 | 33 | p2: MinGW-w64, ucrt, with GCC 12.2.0 |
34 | + g3: MinGW-w64, msvcrt, with GCC 13.1.0 | |
35 | + p3: MinGW-w64, ucrt, with GCC 13.1.0 | |
34 | 36 | s5: LLVM/Clang based MinGW-w64, msvcrt, with LLVM 15 |
35 | 37 | u5: LLVM/Clang based MinGW-w64, ucrt, with LLVM 15 |
36 | 38 | s6: LLVM/Clang based MinGW-w64, msvcrt, with LLVM 16 |
@@ -46,11 +48,11 @@ abbrs: | ||
46 | 48 | |
47 | 49 | -------------------------------------------------------------------- |
48 | 50 | |
49 | --- OpenSSL 1.1.1t-2 | |
51 | +-- OpenSSL 1.1.1u | |
50 | 52 | |
51 | 53 | conf.o1_1wx3v5 = { |
52 | - name = "OpenSSL1.1.1t-2-Windows-x86-VS2015", | |
53 | - opensslVersion = "1.1.1t-2", | |
54 | + name = "OpenSSL1.1.1u-Windows-x86-VS2015", | |
55 | + opensslVersion = "1.1.1u", | |
54 | 56 | host = "Win8", |
55 | 57 | toolchain = "MSVC2015-32", |
56 | 58 | libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" }, |
@@ -66,8 +68,8 @@ conf.o1_1wx3v5 = { | ||
66 | 68 | } |
67 | 69 | |
68 | 70 | conf.o1_1wx3v5st = { |
69 | - name = "OpenSSL1.1.1t-2-Windows-x86-VS2015-static", | |
70 | - opensslVersion = "1.1.1t-2", | |
71 | + name = "OpenSSL1.1.1u-Windows-x86-VS2015-static", | |
72 | + opensslVersion = "1.1.1u", | |
71 | 73 | host = "Win8", |
72 | 74 | toolchain = "MSVC2015-32", |
73 | 75 | variant = {"-static"}, |
@@ -85,8 +87,8 @@ conf.o1_1wx3v5st = { | ||
85 | 87 | } |
86 | 88 | |
87 | 89 | conf.o1_1wx6v5 = { |
88 | - name = "OpenSSL1.1.1t-2-Windows-x86_64-VS2015", | |
89 | - opensslVersion = "1.1.1t-2", | |
90 | + name = "OpenSSL1.1.1u-Windows-x86_64-VS2015", | |
91 | + opensslVersion = "1.1.1u", | |
90 | 92 | host = "Win8", |
91 | 93 | toolchain = "MSVC2015-64", |
92 | 94 | libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" }, |
@@ -104,8 +106,8 @@ conf.o1_1wx6v5 = { | ||
104 | 106 | -------------------------------------------------------------------- |
105 | 107 | |
106 | 108 | conf.o1_1wx3g7 = { |
107 | - name = "OpenSSL1.1.1t-2-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&", | |
108 | - opensslVersion = "1.1.1t-2", | |
109 | + name = "OpenSSL1.1.1u-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&", | |
110 | + opensslVersion = "1.1.1u", | |
109 | 111 | host = "Win8SH", |
110 | 112 | toolchain = "MinGW730-32", |
111 | 113 | libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" }, |
@@ -120,8 +122,8 @@ conf.o1_1wx3g7 = { | ||
120 | 122 | } |
121 | 123 | |
122 | 124 | conf.o1_1wx6g7 = { |
123 | - name = "OpenSSL1.1.1t-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
124 | - opensslVersion = "1.1.1t-2", | |
125 | + name = "OpenSSL1.1.1u-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
126 | + opensslVersion = "1.1.1u", | |
125 | 127 | host = "Win8SH", |
126 | 128 | toolchain = "MinGW730-64", |
127 | 129 | libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" }, |
@@ -138,8 +140,8 @@ conf.o1_1wx6g7 = { | ||
138 | 140 | -------------------------------------------------------------------- |
139 | 141 | |
140 | 142 | conf.o1_1wx3v7 = { |
141 | - name = "OpenSSL1.1.1t-2-Windows-x86-VS2017-&TARGETTOOLVERSION&", | |
142 | - opensslVersion = "1.1.1t-2", | |
143 | + name = "OpenSSL1.1.1u-Windows-x86-VS2017-&TARGETTOOLVERSION&", | |
144 | + opensslVersion = "1.1.1u", | |
143 | 145 | host = "Win10", |
144 | 146 | toolchain = "MSVC2017-32", |
145 | 147 | libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" }, |
@@ -155,8 +157,8 @@ conf.o1_1wx3v7 = { | ||
155 | 157 | } |
156 | 158 | |
157 | 159 | conf.o1_1wx3v7st = { |
158 | - name = "OpenSSL1.1.1t-2-Windows-x86-VS2017-&TARGETTOOLVERSION&-static", | |
159 | - opensslVersion = "1.1.1t-2", | |
160 | + name = "OpenSSL1.1.1u-Windows-x86-VS2017-&TARGETTOOLVERSION&-static", | |
161 | + opensslVersion = "1.1.1u", | |
160 | 162 | host = "Win10", |
161 | 163 | toolchain = "MSVC2017-32", |
162 | 164 | variant = {"-static"}, |
@@ -174,8 +176,8 @@ conf.o1_1wx3v7st = { | ||
174 | 176 | } |
175 | 177 | |
176 | 178 | conf.o1_1wx6v7 = { |
177 | - name = "OpenSSL1.1.1t-2-Windows-x86_64-VS2017-&TARGETTOOLVERSION&", | |
178 | - opensslVersion = "1.1.1t-2", | |
179 | + name = "OpenSSL1.1.1u-Windows-x86_64-VS2017-&TARGETTOOLVERSION&", | |
180 | + opensslVersion = "1.1.1u", | |
179 | 181 | host = "Win10", |
180 | 182 | toolchain = "MSVC2017-64", |
181 | 183 | libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" }, |
@@ -193,8 +195,8 @@ conf.o1_1wx6v7 = { | ||
193 | 195 | -------------------------------------------------------------------- |
194 | 196 | |
195 | 197 | conf.o1_1wx3v9 = { |
196 | - name = "OpenSSL1.1.1t-2-Windows-x86-VS2019-&TARGETTOOLVERSION&", | |
197 | - opensslVersion = "1.1.1t-2", | |
198 | + name = "OpenSSL1.1.1u-Windows-x86-VS2019-&TARGETTOOLVERSION&", | |
199 | + opensslVersion = "1.1.1u", | |
198 | 200 | host = "Win10", |
199 | 201 | toolchain = "MSVC2019-32", |
200 | 202 | libPath = { "bin\\libssl-1_1.dll", "bin\\libcrypto-1_1.dll" }, |
@@ -210,8 +212,8 @@ conf.o1_1wx3v9 = { | ||
210 | 212 | } |
211 | 213 | |
212 | 214 | conf.o1_1wx6v9 = { |
213 | - name = "OpenSSL1.1.1t-2-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
214 | - opensslVersion = "1.1.1t-2", | |
215 | + name = "OpenSSL1.1.1u-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
216 | + opensslVersion = "1.1.1u", | |
215 | 217 | host = "Win10", |
216 | 218 | toolchain = "MSVC2019-64", |
217 | 219 | libPath = { "bin\\libssl-1_1-x64.dll", "bin\\libcrypto-1_1-x64.dll" }, |
@@ -229,8 +231,8 @@ conf.o1_1wx6v9 = { | ||
229 | 231 | -------------------------------------------------------------------- |
230 | 232 | |
231 | 233 | conf.o1_1aa3nl = { |
232 | - name = "OpenSSL1.1.1t-2-Android-arm-NDKr21eAPI21", | |
233 | - opensslVersion = "1.1.1t-2", | |
234 | + name = "OpenSSL1.1.1u-Android-arm-NDKr21eAPI21", | |
235 | + opensslVersion = "1.1.1u", | |
234 | 236 | host = "CentOS8", |
235 | 237 | target = "Android-21", |
236 | 238 | toolchainT = "Android-21-r21e-arm", |
@@ -255,8 +257,8 @@ conf.o1_1aa3nl = { | ||
255 | 257 | } |
256 | 258 | |
257 | 259 | conf.o1_1aa6nl = { |
258 | - name = "OpenSSL1.1.1t-2-Android-arm64-NDKr21eAPI21", | |
259 | - opensslVersion = "1.1.1t-2", | |
260 | + name = "OpenSSL1.1.1u-Android-arm64-NDKr21eAPI21", | |
261 | + opensslVersion = "1.1.1u", | |
260 | 262 | host = "CentOS8", |
261 | 263 | target = "Android-21", |
262 | 264 | toolchainT = "Android-21-r21e-arm64", |
@@ -276,8 +278,8 @@ conf.o1_1aa6nl = { | ||
276 | 278 | } |
277 | 279 | |
278 | 280 | conf.o1_1ax3nl = { |
279 | - name = "OpenSSL1.1.1t-2-Android-x86-NDKr21eAPI21", | |
280 | - opensslVersion = "1.1.1t-2", | |
281 | + name = "OpenSSL1.1.1u-Android-x86-NDKr21eAPI21", | |
282 | + opensslVersion = "1.1.1u", | |
281 | 283 | host = "CentOS8", |
282 | 284 | target = "Android-21", |
283 | 285 | toolchainT = "Android-21-r21e-x86", |
@@ -297,8 +299,8 @@ conf.o1_1ax3nl = { | ||
297 | 299 | } |
298 | 300 | |
299 | 301 | conf.o1_1ax6nl = { |
300 | - name = "OpenSSL1.1.1t-2-Android-x86_64-NDKr21eAPI21", | |
301 | - opensslVersion = "1.1.1t-2", | |
302 | + name = "OpenSSL1.1.1u-Android-x86_64-NDKr21eAPI21", | |
303 | + opensslVersion = "1.1.1u", | |
302 | 304 | host = "CentOS8", |
303 | 305 | target = "Android-21", |
304 | 306 | toolchainT = "Android-21-r21e-x86_64", |
@@ -318,8 +320,8 @@ conf.o1_1ax6nl = { | ||
318 | 320 | } |
319 | 321 | |
320 | 322 | conf.o1_1aalnl = { |
321 | - name = "OpenSSL1.1.1t-2-Android-ALL-NDKr21eAPI21", | |
322 | - opensslVersion = "1.1.1t-2", | |
323 | + name = "OpenSSL1.1.1u-Android-ALL-NDKr21eAPI21", | |
324 | + opensslVersion = "1.1.1u", | |
323 | 325 | host = "CentOS8", |
324 | 326 | opensslUnifyType = "Android", |
325 | 327 | opensslUnifyArch = { |
@@ -333,8 +335,8 @@ conf.o1_1aalnl = { | ||
333 | 335 | -------------------------------------------------------------------- |
334 | 336 | |
335 | 337 | conf.o1_1aa3n321 = { |
336 | - name = "OpenSSL1.1.1t-2-Android-arm-NDKr23cAPI21", | |
337 | - opensslVersion = "1.1.1t-2", | |
338 | + name = "OpenSSL1.1.1u-Android-arm-NDKr23cAPI21", | |
339 | + opensslVersion = "1.1.1u", | |
338 | 340 | host = "CentOS8", |
339 | 341 | target = "Android-21", |
340 | 342 | toolchainT = "Android-21-r23c-arm", |
@@ -359,8 +361,8 @@ conf.o1_1aa3n321 = { | ||
359 | 361 | } |
360 | 362 | |
361 | 363 | conf.o1_1aa6n321 = { |
362 | - name = "OpenSSL1.1.1t-2-Android-arm64-NDKr23cAPI21", | |
363 | - opensslVersion = "1.1.1t-2", | |
364 | + name = "OpenSSL1.1.1u-Android-arm64-NDKr23cAPI21", | |
365 | + opensslVersion = "1.1.1u", | |
364 | 366 | host = "CentOS8", |
365 | 367 | target = "Android-21", |
366 | 368 | toolchainT = "Android-21-r23c-arm64", |
@@ -380,8 +382,8 @@ conf.o1_1aa6n321 = { | ||
380 | 382 | } |
381 | 383 | |
382 | 384 | conf.o1_1ax3n321 = { |
383 | - name = "OpenSSL1.1.1t-2-Android-x86-NDKr23cAPI21", | |
384 | - opensslVersion = "1.1.1t-2", | |
385 | + name = "OpenSSL1.1.1u-Android-x86-NDKr23cAPI21", | |
386 | + opensslVersion = "1.1.1u", | |
385 | 387 | host = "CentOS8", |
386 | 388 | target = "Android-21", |
387 | 389 | toolchainT = "Android-21-r23c-x86", |
@@ -401,8 +403,8 @@ conf.o1_1ax3n321 = { | ||
401 | 403 | } |
402 | 404 | |
403 | 405 | conf.o1_1ax6n321 = { |
404 | - name = "OpenSSL1.1.1t-2-Android-x86_64-NDKr23cAPI21", | |
405 | - opensslVersion = "1.1.1t-2", | |
406 | + name = "OpenSSL1.1.1u-Android-x86_64-NDKr23cAPI21", | |
407 | + opensslVersion = "1.1.1u", | |
406 | 408 | host = "CentOS8", |
407 | 409 | target = "Android-21", |
408 | 410 | toolchainT = "Android-21-r23c-x86_64", |
@@ -422,8 +424,8 @@ conf.o1_1ax6n321 = { | ||
422 | 424 | } |
423 | 425 | |
424 | 426 | conf.o1_1aaln321 = { |
425 | - name = "OpenSSL1.1.1t-2-Android-ALL-NDKr23cAPI21", | |
426 | - opensslVersion = "1.1.1t-2", | |
427 | + name = "OpenSSL1.1.1u-Android-ALL-NDKr23cAPI21", | |
428 | + opensslVersion = "1.1.1u", | |
427 | 429 | host = "CentOS8", |
428 | 430 | opensslUnifyType = "Android", |
429 | 431 | opensslUnifyArch = { |
@@ -436,11 +438,11 @@ conf.o1_1aaln321 = { | ||
436 | 438 | |
437 | 439 | -------------------------------------------------------------------- |
438 | 440 | |
439 | --- OpenSSL 3.0.8-2 | |
441 | +-- OpenSSL 3.0.9 | |
440 | 442 | |
441 | 443 | conf.o3_0wx6v9 = { |
442 | - name = "OpenSSL3.0.8-2-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
443 | - opensslVersion = "3.0.8-2", | |
444 | + name = "OpenSSL3.0.9-Windows-x86_64-VS2019-&TARGETTOOLVERSION&", | |
445 | + opensslVersion = "3.0.9", | |
444 | 446 | host = "Win10", |
445 | 447 | toolchain = "MSVC2019-64", |
446 | 448 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -456,8 +458,8 @@ conf.o3_0wx6v9 = { | ||
456 | 458 | } |
457 | 459 | |
458 | 460 | conf.o3_0wx6v9st = { |
459 | - name = "OpenSSL3.0.8-2-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static", | |
460 | - opensslVersion = "3.0.8-2", | |
461 | + name = "OpenSSL3.0.9-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static", | |
462 | + opensslVersion = "3.0.9", | |
461 | 463 | host = "Win10", |
462 | 464 | toolchain = "MSVC2019-64", |
463 | 465 | variant = {"-static"}, |
@@ -475,8 +477,8 @@ conf.o3_0wx6v9st = { | ||
475 | 477 | } |
476 | 478 | |
477 | 479 | conf.o3_0wx6v2 = { |
478 | - name = "OpenSSL3.0.8-2-Windows-x86_64-VS2022-&TARGETTOOLVERSION&", | |
479 | - opensslVersion = "3.0.8-2", | |
480 | + name = "OpenSSL3.0.9-Windows-x86_64-VS2022-&TARGETTOOLVERSION&", | |
481 | + opensslVersion = "3.0.9", | |
480 | 482 | host = "Win10", |
481 | 483 | toolchain = "MSVC2022-64", |
482 | 484 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -492,8 +494,8 @@ conf.o3_0wx6v2 = { | ||
492 | 494 | } |
493 | 495 | |
494 | 496 | conf.o3_0wx6v2st = { |
495 | - name = "OpenSSL3.0.8-2-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static", | |
496 | - opensslVersion = "3.0.8-2", | |
497 | + name = "OpenSSL3.0.9-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static", | |
498 | + opensslVersion = "3.0.9", | |
497 | 499 | host = "Win10", |
498 | 500 | toolchain = "MSVC2022-64", |
499 | 501 | variant = {"-static"}, |
@@ -513,8 +515,8 @@ conf.o3_0wx6v2st = { | ||
513 | 515 | -------------------------------------------------------------------- |
514 | 516 | |
515 | 517 | conf.o3_0wx6g1 = { |
516 | - name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
517 | - opensslVersion = "3.0.8-2", | |
518 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&", | |
519 | + opensslVersion = "3.0.9", | |
518 | 520 | host = "Win10SH", |
519 | 521 | toolchain = "MinGW1120-64", |
520 | 522 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -530,8 +532,8 @@ conf.o3_0wx6g1 = { | ||
530 | 532 | } |
531 | 533 | |
532 | 534 | conf.o3_0wx6p2 = { |
533 | - name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt", | |
534 | - opensslVersion = "3.0.8-2", | |
535 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt", | |
536 | + opensslVersion = "3.0.9", | |
535 | 537 | host = "Win10SH", |
536 | 538 | toolchain = "MinGW122u-64", |
537 | 539 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -547,8 +549,8 @@ conf.o3_0wx6p2 = { | ||
547 | 549 | } |
548 | 550 | |
549 | 551 | conf.o3_0wx6g2 = { |
550 | - name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt", | |
551 | - opensslVersion = "3.0.8-2", | |
552 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt", | |
553 | + opensslVersion = "3.0.9", | |
552 | 554 | host = "Win10SH", |
553 | 555 | toolchain = "MinGW1220-64", |
554 | 556 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -563,9 +565,43 @@ conf.o3_0wx6g2 = { | ||
563 | 565 | ]], |
564 | 566 | } |
565 | 567 | |
568 | +conf.o3_0wx6p3 = { | |
569 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt", | |
570 | + opensslVersion = "3.0.9", | |
571 | + host = "Win10SH", | |
572 | + toolchain = "MinGW131u-64", | |
573 | + libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, | |
574 | + configureParameter = [[ | |
575 | + no-asm | |
576 | + shared | |
577 | + enable-static-engine | |
578 | + --prefix=&INSTALLROOT& | |
579 | + --openssldir=&INSTALLROOT&/ssl | |
580 | + --libdir=&INSTALLROOT&/lib | |
581 | + mingw64 | |
582 | + ]], | |
583 | +} | |
584 | + | |
585 | +conf.o3_0wx6g3 = { | |
586 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt", | |
587 | + opensslVersion = "3.0.9", | |
588 | + host = "Win10SH", | |
589 | + toolchain = "MinGW1310-64", | |
590 | + libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, | |
591 | + configureParameter = [[ | |
592 | + no-asm | |
593 | + shared | |
594 | + enable-static-engine | |
595 | + --prefix=&INSTALLROOT& | |
596 | + --openssldir=&INSTALLROOT&/ssl | |
597 | + --libdir=&INSTALLROOT&/lib | |
598 | + mingw64 | |
599 | + ]], | |
600 | +} | |
601 | + | |
566 | 602 | conf.o3_0wx6u5 = { |
567 | - name = "OpenSSL3.0.8-2-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
568 | - opensslVersion = "3.0.8-2", | |
603 | + name = "OpenSSL3.0.9-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
604 | + opensslVersion = "3.0.9", | |
569 | 605 | host = "Win10SH", |
570 | 606 | toolchain = "MinGWLLVM-ucrt15-64", |
571 | 607 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -582,8 +618,8 @@ conf.o3_0wx6u5 = { | ||
582 | 618 | } |
583 | 619 | |
584 | 620 | conf.o3_0wx6s5 = { |
585 | - name = "OpenSSL3.0.8-2-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
586 | - opensslVersion = "3.0.8-2", | |
621 | + name = "OpenSSL3.0.9-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
622 | + opensslVersion = "3.0.9", | |
587 | 623 | host = "Win10SH", |
588 | 624 | toolchain = "MinGWLLVM-msvcrt15-64", |
589 | 625 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -600,8 +636,8 @@ conf.o3_0wx6s5 = { | ||
600 | 636 | } |
601 | 637 | |
602 | 638 | conf.o3_0wx6u6 = { |
603 | - name = "OpenSSL3.0.8-2-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
604 | - opensslVersion = "3.0.8-2", | |
639 | + name = "OpenSSL3.0.9-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt", | |
640 | + opensslVersion = "3.0.9", | |
605 | 641 | host = "Win10SH", |
606 | 642 | toolchain = "MinGWLLVM-ucrt16-64", |
607 | 643 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -618,8 +654,8 @@ conf.o3_0wx6u6 = { | ||
618 | 654 | } |
619 | 655 | |
620 | 656 | conf.o3_0wx6s6 = { |
621 | - name = "OpenSSL3.0.8-2-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
622 | - opensslVersion = "3.0.8-2", | |
657 | + name = "OpenSSL3.0.9-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt", | |
658 | + opensslVersion = "3.0.9", | |
623 | 659 | host = "Win10SH", |
624 | 660 | toolchain = "MinGWLLVM-msvcrt16-64", |
625 | 661 | libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" }, |
@@ -638,8 +674,8 @@ conf.o3_0wx6s6 = { | ||
638 | 674 | -------------------------------------------------------------------- |
639 | 675 | |
640 | 676 | conf.o3_0wx6g1st = { |
641 | - name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-static", | |
642 | - opensslVersion = "3.0.8-2", | |
677 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-static", | |
678 | + opensslVersion = "3.0.9", | |
643 | 679 | host = "Win10SH", |
644 | 680 | toolchain = "MinGW1120-64", |
645 | 681 | variant = {"-static"}, |
@@ -658,8 +694,8 @@ conf.o3_0wx6g1st = { | ||
658 | 694 | } |
659 | 695 | |
660 | 696 | conf.o3_0wx6p2st = { |
661 | - name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static", | |
662 | - opensslVersion = "3.0.8-2", | |
697 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static", | |
698 | + opensslVersion = "3.0.9", | |
663 | 699 | host = "Win10SH", |
664 | 700 | toolchain = "MinGW122u-64", |
665 | 701 | variant = {"-static"}, |
@@ -678,8 +714,8 @@ conf.o3_0wx6p2st = { | ||
678 | 714 | } |
679 | 715 | |
680 | 716 | conf.o3_0wx6g2st = { |
681 | - name = "OpenSSL3.0.8-2-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static", | |
682 | - opensslVersion = "3.0.8-2", | |
717 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static", | |
718 | + opensslVersion = "3.0.9", | |
683 | 719 | host = "Win10SH", |
684 | 720 | toolchain = "MinGW1220-64", |
685 | 721 | variant = {"-static"}, |
@@ -697,12 +733,52 @@ conf.o3_0wx6g2st = { | ||
697 | 733 | ]], |
698 | 734 | } |
699 | 735 | |
736 | +conf.o3_0wx6p3st = { | |
737 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static", | |
738 | + opensslVersion = "3.0.9", | |
739 | + host = "Win10SH", | |
740 | + toolchain = "MinGW131u-64", | |
741 | + variant = {"-static"}, | |
742 | + staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" }, | |
743 | + configureParameter = [[ | |
744 | + no-asm | |
745 | + no-shared | |
746 | + enable-static-engine | |
747 | + --prefix=&INSTALLROOT& | |
748 | + --openssldir=&INSTALLROOT&/ssl | |
749 | + --libdir=&INSTALLROOT&/lib | |
750 | + mingw64 | |
751 | + --static | |
752 | + -static-libgcc | |
753 | + ]], | |
754 | +} | |
755 | + | |
756 | +conf.o3_0wx6g3st = { | |
757 | + name = "OpenSSL3.0.9-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static", | |
758 | + opensslVersion = "3.0.9", | |
759 | + host = "Win10SH", | |
760 | + toolchain = "MinGW1310-64", | |
761 | + variant = {"-static"}, | |
762 | + staticlibPath = { "lib\\libssl.a", "lib\\libcrypto.a" }, | |
763 | + configureParameter = [[ | |
764 | + no-asm | |
765 | + no-shared | |
766 | + enable-static-engine | |
767 | + --prefix=&INSTALLROOT& | |
768 | + --openssldir=&INSTALLROOT&/ssl | |
769 | + --libdir=&INSTALLROOT&/lib | |
770 | + mingw64 | |
771 | + --static | |
772 | + -static-libgcc | |
773 | + ]], | |
774 | +} | |
775 | + | |
700 | 776 | -------------------------------------------------------------------- |
701 | 777 | |
702 | 778 | -- cross build this configuration for easy unify |
703 | 779 | conf.o3_0mx6 = { |
704 | - name = "OpenSSL3.0.8-2-macOS-x86_64-AppleClang&TARGETTOOLVERSION&", | |
705 | - opensslVersion = "3.0.8-2", | |
780 | + name = "OpenSSL3.0.9-macOS-x86_64-AppleClang&TARGETTOOLVERSION&", | |
781 | + opensslVersion = "3.0.9", | |
706 | 782 | host = "macOSM1", |
707 | 783 | libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" }, |
708 | 784 | staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" }, |
@@ -718,8 +794,8 @@ conf.o3_0mx6 = { | ||
718 | 794 | } |
719 | 795 | |
720 | 796 | conf.o3_0ma6 = { |
721 | - name = "OpenSSL3.0.8-2-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&", | |
722 | - opensslVersion = "3.0.8-2", | |
797 | + name = "OpenSSL3.0.9-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&", | |
798 | + opensslVersion = "3.0.9", | |
723 | 799 | host = "macOSM1", |
724 | 800 | libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" }, |
725 | 801 | staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" }, |
@@ -735,8 +811,8 @@ conf.o3_0ma6 = { | ||
735 | 811 | } |
736 | 812 | |
737 | 813 | conf.o3_0mal = { |
738 | - name = "OpenSSL3.0.8-2-macOS-ALL-AppleClang&TARGETTOOLVERSION&", | |
739 | - opensslVersion = "3.0.8-2", | |
814 | + name = "OpenSSL3.0.9-macOS-ALL-AppleClang&TARGETTOOLVERSION&", | |
815 | + opensslVersion = "3.0.9", | |
740 | 816 | host = "macOSM1", |
741 | 817 | libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" }, |
742 | 818 | staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" }, |
@@ -750,8 +826,8 @@ conf.o3_0mal = { | ||
750 | 826 | -------------------------------------------------------------------- |
751 | 827 | |
752 | 828 | conf.o3_0aa3n324 = { |
753 | - name = "OpenSSL3.0.8-2-Android-arm-NDKr23cAPI24", | |
754 | - opensslVersion = "3.0.8-2", | |
829 | + name = "OpenSSL3.0.9-Android-arm-NDKr23cAPI24", | |
830 | + opensslVersion = "3.0.9", | |
755 | 831 | host = "CentOS8", |
756 | 832 | target = "Android-24", |
757 | 833 | toolchainT = "Android-24-r23c-arm", |
@@ -776,8 +852,8 @@ conf.o3_0aa3n324 = { | ||
776 | 852 | } |
777 | 853 | |
778 | 854 | conf.o3_0aa6n324 = { |
779 | - name = "OpenSSL3.0.8-2-Android-arm64-NDKr23cAPI24", | |
780 | - opensslVersion = "3.0.8-2", | |
855 | + name = "OpenSSL3.0.9-Android-arm64-NDKr23cAPI24", | |
856 | + opensslVersion = "3.0.9", | |
781 | 857 | host = "CentOS8", |
782 | 858 | target = "Android-24", |
783 | 859 | toolchainT = "Android-24-r23c-arm64", |
@@ -797,8 +873,8 @@ conf.o3_0aa6n324 = { | ||
797 | 873 | } |
798 | 874 | |
799 | 875 | conf.o3_0ax3n324 = { |
800 | - name = "OpenSSL3.0.8-2-Android-x86-NDKr23cAPI24", | |
801 | - opensslVersion = "3.0.8-2", | |
876 | + name = "OpenSSL3.0.9-Android-x86-NDKr23cAPI24", | |
877 | + opensslVersion = "3.0.9", | |
802 | 878 | host = "CentOS8", |
803 | 879 | target = "Android-24", |
804 | 880 | toolchainT = "Android-24-r23c-x86", |
@@ -818,8 +894,8 @@ conf.o3_0ax3n324 = { | ||
818 | 894 | } |
819 | 895 | |
820 | 896 | conf.o3_0ax6n324 = { |
821 | - name = "OpenSSL3.0.8-2-Android-x86_64-NDKr23cAPI24", | |
822 | - opensslVersion = "3.0.8-2", | |
897 | + name = "OpenSSL3.0.9-Android-x86_64-NDKr23cAPI24", | |
898 | + opensslVersion = "3.0.9", | |
823 | 899 | host = "CentOS8", |
824 | 900 | target = "Android-24", |
825 | 901 | toolchainT = "Android-24-r23c-x86_64", |
@@ -839,8 +915,8 @@ conf.o3_0ax6n324 = { | ||
839 | 915 | } |
840 | 916 | |
841 | 917 | conf.o3_0aaln324 = { |
842 | - name = "OpenSSL3.0.8-2-Android-ALL-NDKr23cAPI24", | |
843 | - opensslVersion = "3.0.8-2", | |
918 | + name = "OpenSSL3.0.9-Android-ALL-NDKr23cAPI24", | |
919 | + opensslVersion = "3.0.9", | |
844 | 920 | host = "CentOS8", |
845 | 921 | opensslUnifyType = "Android", |
846 | 922 | opensslUnifyArch = { |
@@ -853,8 +929,8 @@ conf.o3_0aaln324 = { | ||
853 | 929 | -------------------------------------------------------------------- |
854 | 930 | |
855 | 931 | conf.o3_0aa3n527 = { |
856 | - name = "OpenSSL3.0.8-2-Android-arm-NDKr25API27", | |
857 | - opensslVersion = "3.0.8-2", | |
932 | + name = "OpenSSL3.0.9-Android-arm-NDKr25API27", | |
933 | + opensslVersion = "3.0.9", | |
858 | 934 | host = "Rocky9", |
859 | 935 | target = "Android-27", |
860 | 936 | toolchainT = "Android-27-r25c-arm", |
@@ -879,8 +955,8 @@ conf.o3_0aa3n527 = { | ||
879 | 955 | } |
880 | 956 | |
881 | 957 | conf.o3_0aa6n527 = { |
882 | - name = "OpenSSL3.0.8-2-Android-arm64-NDKr25API27", | |
883 | - opensslVersion = "3.0.8-2", | |
958 | + name = "OpenSSL3.0.9-Android-arm64-NDKr25API27", | |
959 | + opensslVersion = "3.0.9", | |
884 | 960 | host = "Rocky9", |
885 | 961 | target = "Android-27", |
886 | 962 | toolchainT = "Android-27-r25c-arm64", |
@@ -900,8 +976,8 @@ conf.o3_0aa6n527 = { | ||
900 | 976 | } |
901 | 977 | |
902 | 978 | conf.o3_0ax3n527 = { |
903 | - name = "OpenSSL3.0.8-2-Android-x86-NDKr25API27", | |
904 | - opensslVersion = "3.0.8-2", | |
979 | + name = "OpenSSL3.0.9-Android-x86-NDKr25API27", | |
980 | + opensslVersion = "3.0.9", | |
905 | 981 | host = "Rocky9", |
906 | 982 | target = "Android-27", |
907 | 983 | toolchainT = "Android-27-r25c-x86", |
@@ -921,8 +997,8 @@ conf.o3_0ax3n527 = { | ||
921 | 997 | } |
922 | 998 | |
923 | 999 | conf.o3_0ax6n527 = { |
924 | - name = "OpenSSL3.0.8-2-Android-x86_64-NDKr25API27", | |
925 | - opensslVersion = "3.0.8-2", | |
1000 | + name = "OpenSSL3.0.9-Android-x86_64-NDKr25API27", | |
1001 | + opensslVersion = "3.0.9", | |
926 | 1002 | host = "Rocky9", |
927 | 1003 | target = "Android-27", |
928 | 1004 | toolchainT = "Android-27-r25c-x86_64", |
@@ -942,8 +1018,8 @@ conf.o3_0ax6n527 = { | ||
942 | 1018 | } |
943 | 1019 | |
944 | 1020 | conf.o3_0aaln527 = { |
945 | - name = "OpenSSL3.0.8-2-Android-ALL-NDKr25API27", | |
946 | - opensslVersion = "3.0.8-2", | |
1021 | + name = "OpenSSL3.0.9-Android-ALL-NDKr25API27", | |
1022 | + opensslVersion = "3.0.9", | |
947 | 1023 | host = "Rocky9", |
948 | 1024 | opensslUnifyType = "Android", |
949 | 1025 | opensslUnifyArch = { |
@@ -6,9 +6,8 @@ abbrs: | ||
6 | 6 | Qt Versions: |
7 | 7 | q5_12: Qt 5.12.12/Discontinued Qt 5 LTS |
8 | 8 | q5_15: Qt 5.15.9/Previous Qt 5 LTS w/ latest QtWebEngine and latest QtScript |
9 | - q6_2: Qt 6.2.4/Latest Qt 6 LTS w/ latest QtWebEngine | |
10 | - q6_4: Qt 6.4.3 | |
11 | - q6_5: Qt 6.5.0 (Pre-release) | |
9 | + q6_2: Qt 6.2.4/Latest Qt 6 LTS w/o QtWebEngine | |
10 | + q6_5: Qt 6.5.1 | |
12 | 11 | If prefixed with a lower-case "m", it is a modified Qt version |
13 | 12 | |
14 | 13 | Platforms: |
@@ -38,6 +37,8 @@ abbrs: | ||
38 | 37 | g1: MinGW-w64, with GCC 11.2.0 |
39 | 38 | g2: MinGW-w64, msvcrt, with GCC 12.2.0 |
40 | 39 | p2: MinGW-w64, ucrt, with GCC 12.2.0 |
40 | + g3: MinGW-w64, msvcrt, with GCC 13.1.0 | |
41 | + p3: MinGW-w64, ucrt, with GCC 13.1.0 | |
41 | 42 | s5: LLVM/Clang based MinGW-w64, msvcrt, with LLVM 15 |
42 | 43 | u5: LLVM/Clang based MinGW-w64, ucrt, with LLVM 15 |
43 | 44 | s6: LLVM/Clang based MinGW-w64, msvcrt, with LLVM 16 |
@@ -1417,7 +1418,7 @@ conf.q5_15wx6v5sf = { | ||
1417 | 1418 | |
1418 | 1419 | conf.q5_15wx3v7 = { |
1419 | 1420 | name = "Qt5.15.9-Windows-x86-VS2017-&HOSTTOOLVERSION&", |
1420 | - qtVersion = "5.15.9-4", | |
1421 | + qtVersion = "5.15.9-5", | |
1421 | 1422 | host = "Win10", |
1422 | 1423 | toolchain = "MSVC2017-32", |
1423 | 1424 | mysqlConf = "m3_1wx3v7", |
@@ -1500,7 +1501,7 @@ conf.q5_15wx3v7sf = { | ||
1500 | 1501 | |
1501 | 1502 | conf.q5_15wx6v7 = { |
1502 | 1503 | name = "Qt5.15.9-Windows-x86_64-VS2017-&HOSTTOOLVERSION&", |
1503 | - qtVersion = "5.15.9-4", | |
1504 | + qtVersion = "5.15.9-5", | |
1504 | 1505 | host = "Win10", |
1505 | 1506 | toolchain = "MSVC2017-64", |
1506 | 1507 | mysqlConf = "m3_1wx6v7", |
@@ -1583,7 +1584,7 @@ conf.q5_15wx6v7sf = { | ||
1583 | 1584 | |
1584 | 1585 | conf.q5_15wx3v9 = { |
1585 | 1586 | name = "Qt5.15.9-Windows-x86-VS2019-&HOSTTOOLVERSION&", |
1586 | - qtVersion = "5.15.9-4", | |
1587 | + qtVersion = "5.15.9-5", | |
1587 | 1588 | host = "Win10", |
1588 | 1589 | toolchain = "MSVC2019-32", |
1589 | 1590 | mysqlConf = "m3_1wx3v9", |
@@ -1623,7 +1624,7 @@ conf.q5_15wx3v9 = { | ||
1623 | 1624 | |
1624 | 1625 | conf.q5_15wx3v9sf = { |
1625 | 1626 | name = "Qt5.15.9-Windows-x86-VS2019-&HOSTTOOLVERSION&-staticFull", |
1626 | - qtVersion = "5.15.9-4", | |
1627 | + qtVersion = "5.15.9-5", | |
1627 | 1628 | host = "Win10", |
1628 | 1629 | toolchain = "MSVC2019-32", |
1629 | 1630 | variant = {"-staticFull"}, |
@@ -1665,7 +1666,7 @@ conf.q5_15wx3v9sf = { | ||
1665 | 1666 | |
1666 | 1667 | conf.q5_15wx6v9 = { |
1667 | 1668 | name = "Qt5.15.9-Windows-x86_64-VS2019-&HOSTTOOLVERSION&", |
1668 | - qtVersion = "5.15.9-4", | |
1669 | + qtVersion = "5.15.9-5", | |
1669 | 1670 | host = "Win10", |
1670 | 1671 | toolchain = "MSVC2019-64", |
1671 | 1672 | mysqlConf = "m3_1wx6v9", |
@@ -1705,7 +1706,7 @@ conf.q5_15wx6v9 = { | ||
1705 | 1706 | |
1706 | 1707 | conf.q5_15wx6v9sf = { |
1707 | 1708 | name = "Qt5.15.9-Windows-x86_64-VS2019-&HOSTTOOLVERSION&-staticFull", |
1708 | - qtVersion = "5.15.9-4", | |
1709 | + qtVersion = "5.15.9-5", | |
1709 | 1710 | host = "Win10", |
1710 | 1711 | toolchain = "MSVC2019-64", |
1711 | 1712 | variant = {"-staticFull"}, |
@@ -1747,7 +1748,7 @@ conf.q5_15wx6v9sf = { | ||
1747 | 1748 | |
1748 | 1749 | conf.q5_15wx6v2 = { |
1749 | 1750 | name = "Qt5.15.9-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", |
1750 | - qtVersion = "5.15.9-4", | |
1751 | + qtVersion = "5.15.9-5", | |
1751 | 1752 | host = "Win10", |
1752 | 1753 | toolchain = "MSVC2022-64", |
1753 | 1754 | mysqlConf = "m3_1wx6v2", |
@@ -2050,7 +2051,7 @@ conf.q5_15wx6g2 = { | ||
2050 | 2051 | |
2051 | 2052 | conf.q5_15mal = { |
2052 | 2053 | name = "Qt5.15.9-macOS-Universal-AppleClang&HOSTTOOLVERSION&", |
2053 | - qtVersion = "5.15.9-4", | |
2054 | + qtVersion = "5.15.9-5", | |
2054 | 2055 | host = "macOSM1", |
2055 | 2056 | mysqlConf = "m3_1mal", |
2056 | 2057 | configureParameter = [[ |
@@ -2090,7 +2091,7 @@ conf.q5_15mal = { | ||
2090 | 2091 | |
2091 | 2092 | conf.q5_15malnf = { |
2092 | 2093 | name = "Qt5.15.9-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework", |
2093 | - qtVersion = "5.15.9-4", | |
2094 | + qtVersion = "5.15.9-5", | |
2094 | 2095 | host = "macOSM1", |
2095 | 2096 | variant = {"-noFramework"}, |
2096 | 2097 | mysqlConf = "m3_1mal", |
@@ -2133,7 +2134,7 @@ conf.q5_15malnf = { | ||
2133 | 2134 | |
2134 | 2135 | conf.q5_15malsf = { |
2135 | 2136 | name = "Qt5.15.9-macOS-Universal-AppleClang&HOSTTOOLVERSION&-staticFull", |
2136 | - qtVersion = "5.15.9-4", | |
2137 | + qtVersion = "5.15.9-5", | |
2137 | 2138 | host = "macOSM1", |
2138 | 2139 | variant = {"-staticFull"}, |
2139 | 2140 | configureParameter = [[ |
@@ -3232,6 +3233,160 @@ conf.q6_2wx6g2sf = { | ||
3232 | 3233 | ]], |
3233 | 3234 | } |
3234 | 3235 | |
3236 | +conf.q6_2wx6p3 = { | |
3237 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt", | |
3238 | + qtVersion = "6.2.4", | |
3239 | + host = "Win10", | |
3240 | + toolchain = "MinGW131u-64", | |
3241 | + opensslConf = "o3_0wx6p3", | |
3242 | + mysqlConf = "m3_3wx6p3", | |
3243 | + useCMake = "20", | |
3244 | + configureParameter = [[ | |
3245 | + -G"Ninja" | |
3246 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
3247 | + -DBUILD_SHARED_LIBS=ON | |
3248 | + -DCMAKE_BUILD_TYPE="Release" | |
3249 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
3250 | + -DBUILD_WITH_PCH=ON | |
3251 | + -DQT_BUILD_EXAMPLES=OFF | |
3252 | + -DQT_BUILD_TESTS=OFF | |
3253 | + -DFEATURE_doubleconversion=ON | |
3254 | + -DFEATURE_system_doubleconversion=OFF | |
3255 | + -DFEATURE_system_zlib=OFF | |
3256 | + -DFEATURE_system_pcre2=OFF | |
3257 | + -DFEATURE_icu=OFF | |
3258 | + -DFEATURE_opengl_dynamic=ON | |
3259 | + -DFEATURE_ssl=ON | |
3260 | + -DFEATURE_openssl=ON | |
3261 | + -DINPUT_openssl=linked | |
3262 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
3263 | + -DFEATURE_schannel=ON | |
3264 | + -DFEATURE_sql_sqlite=ON | |
3265 | + -DFEATURE_sql_odbc=ON | |
3266 | + -DFEATURE_sql_mysql=ON | |
3267 | + -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb" | |
3268 | + -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a" | |
3269 | + -DFEATURE_system_sqlite=OFF | |
3270 | + -DBUILD_qtopcua=OFF | |
3271 | + ]], | |
3272 | +} | |
3273 | + | |
3274 | +conf.q6_2wx6p3sf = { | |
3275 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt-staticFull", | |
3276 | + qtVersion = "6.2.4", | |
3277 | + host = "Win10", | |
3278 | + toolchain = "MinGW131u-64", | |
3279 | + variant = {"-staticFull"}, | |
3280 | + opensslConf = "o3_0wx6p3st", | |
3281 | + useCMake = "Latest", | |
3282 | + configureParameter = [[ | |
3283 | + -G"Ninja" | |
3284 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
3285 | + -DBUILD_SHARED_LIBS=OFF | |
3286 | + -DFEATURE_static_runtime=ON | |
3287 | + -DCMAKE_BUILD_TYPE="Release" | |
3288 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
3289 | + -DBUILD_WITH_PCH=ON | |
3290 | + -DQT_BUILD_EXAMPLES=OFF | |
3291 | + -DQT_BUILD_TESTS=OFF | |
3292 | + -DFEATURE_relocatable=ON | |
3293 | + -DFEATURE_doubleconversion=ON | |
3294 | + -DFEATURE_system_doubleconversion=OFF | |
3295 | + -DFEATURE_system_zlib=OFF | |
3296 | + -DFEATURE_system_pcre2=OFF | |
3297 | + -DFEATURE_icu=OFF | |
3298 | + -DFEATURE_opengl_dynamic=ON | |
3299 | + -DFEATURE_ssl=ON | |
3300 | + -DFEATURE_openssl=ON | |
3301 | + -DINPUT_openssl=linked | |
3302 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
3303 | + -DOPENSSL_USE_STATIC_LIBS=TRUE | |
3304 | + -DFEATURE_schannel=ON | |
3305 | + -DFEATURE_sql_sqlite=ON | |
3306 | + -DFEATURE_sql_odbc=ON | |
3307 | + -DFEATURE_system_sqlite=OFF | |
3308 | + -DBUILD_qtopcua=OFF | |
3309 | + -DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++" | |
3310 | + ]], | |
3311 | +} | |
3312 | + | |
3313 | +conf.q6_2wx6g3 = { | |
3314 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
3315 | + qtVersion = "6.2.4", | |
3316 | + host = "Win10", | |
3317 | + toolchain = "MinGW1310-64", | |
3318 | + opensslConf = "o3_0wx6g3", | |
3319 | + mysqlConf = "m3_3wx6g3", | |
3320 | + useCMake = "20", | |
3321 | + configureParameter = [[ | |
3322 | + -G"Ninja" | |
3323 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
3324 | + -DBUILD_SHARED_LIBS=ON | |
3325 | + -DCMAKE_BUILD_TYPE="Release" | |
3326 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
3327 | + -DBUILD_WITH_PCH=ON | |
3328 | + -DQT_BUILD_EXAMPLES=OFF | |
3329 | + -DQT_BUILD_TESTS=OFF | |
3330 | + -DFEATURE_doubleconversion=ON | |
3331 | + -DFEATURE_system_doubleconversion=OFF | |
3332 | + -DFEATURE_system_zlib=OFF | |
3333 | + -DFEATURE_system_pcre2=OFF | |
3334 | + -DFEATURE_icu=OFF | |
3335 | + -DFEATURE_opengl_dynamic=ON | |
3336 | + -DFEATURE_ssl=ON | |
3337 | + -DFEATURE_openssl=ON | |
3338 | + -DINPUT_openssl=linked | |
3339 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
3340 | + -DFEATURE_schannel=ON | |
3341 | + -DFEATURE_sql_sqlite=ON | |
3342 | + -DFEATURE_sql_odbc=ON | |
3343 | + -DFEATURE_sql_mysql=ON | |
3344 | + -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb" | |
3345 | + -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a" | |
3346 | + -DFEATURE_system_sqlite=OFF | |
3347 | + -DBUILD_qtopcua=OFF | |
3348 | + ]], | |
3349 | +} | |
3350 | + | |
3351 | +conf.q6_2wx6g3sf = { | |
3352 | + name = "Qt6.2.4-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-staticFull", | |
3353 | + qtVersion = "6.2.4", | |
3354 | + host = "Win10", | |
3355 | + toolchain = "MinGW1310-64", | |
3356 | + variant = {"-staticFull"}, | |
3357 | + opensslConf = "o3_0wx6g3st", | |
3358 | + useCMake = "Latest", | |
3359 | + configureParameter = [[ | |
3360 | + -G"Ninja" | |
3361 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
3362 | + -DBUILD_SHARED_LIBS=OFF | |
3363 | + -DFEATURE_static_runtime=ON | |
3364 | + -DCMAKE_BUILD_TYPE="Release" | |
3365 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
3366 | + -DBUILD_WITH_PCH=ON | |
3367 | + -DQT_BUILD_EXAMPLES=OFF | |
3368 | + -DQT_BUILD_TESTS=OFF | |
3369 | + -DFEATURE_relocatable=ON | |
3370 | + -DFEATURE_doubleconversion=ON | |
3371 | + -DFEATURE_system_doubleconversion=OFF | |
3372 | + -DFEATURE_system_zlib=OFF | |
3373 | + -DFEATURE_system_pcre2=OFF | |
3374 | + -DFEATURE_icu=OFF | |
3375 | + -DFEATURE_opengl_dynamic=ON | |
3376 | + -DFEATURE_ssl=ON | |
3377 | + -DFEATURE_openssl=ON | |
3378 | + -DINPUT_openssl=linked | |
3379 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
3380 | + -DOPENSSL_USE_STATIC_LIBS=TRUE | |
3381 | + -DFEATURE_schannel=ON | |
3382 | + -DFEATURE_sql_sqlite=ON | |
3383 | + -DFEATURE_sql_odbc=ON | |
3384 | + -DFEATURE_system_sqlite=OFF | |
3385 | + -DBUILD_qtopcua=OFF | |
3386 | + -DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++" | |
3387 | + ]], | |
3388 | +} | |
3389 | + | |
3235 | 3390 | conf.q6_2wx6u5 = { |
3236 | 3391 | name = "Qt6.2.4-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt", |
3237 | 3392 | qtVersion = "6.2.4", |
@@ -4182,8 +4337,8 @@ conf.q6_2mal_W = { | ||
4182 | 4337 | -------------------------------------------------------------------- |
4183 | 4338 | |
4184 | 4339 | conf.q6_5wx6v2 = { |
4185 | - name = "Qt6.5.0-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
4186 | - qtVersion = "6.5.0", | |
4340 | + name = "Qt6.5.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
4341 | + qtVersion = "6.5.1", | |
4187 | 4342 | host = "Win10", |
4188 | 4343 | toolchain = "MSVC2022-64", |
4189 | 4344 | opensslConf = "o3_0wx6v2", |
@@ -4222,8 +4377,8 @@ conf.q6_5wx6v2 = { | ||
4222 | 4377 | } |
4223 | 4378 | |
4224 | 4379 | conf.q6_5wx6v2st = { |
4225 | - name = "Qt6.5.0-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static", | |
4226 | - qtVersion = "6.5.0", | |
4380 | + name = "Qt6.5.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static", | |
4381 | + qtVersion = "6.5.1", | |
4227 | 4382 | host = "Win10", |
4228 | 4383 | toolchain = "MSVC2022-64", |
4229 | 4384 | variant = {"-static"}, |
@@ -4286,8 +4441,8 @@ conf.q6_5wx6v2st = { | ||
4286 | 4441 | } |
4287 | 4442 | |
4288 | 4443 | conf.q6_5wx6v2sf = { |
4289 | - name = "Qt6.5.0-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-staticFull", | |
4290 | - qtVersion = "6.5.0", | |
4444 | + name = "Qt6.5.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-staticFull", | |
4445 | + qtVersion = "6.5.1", | |
4291 | 4446 | host = "Win10", |
4292 | 4447 | toolchain = "MSVC2022-64", |
4293 | 4448 | variant = {"-staticFull"}, |
@@ -4325,8 +4480,8 @@ conf.q6_5wx6v2sf = { | ||
4325 | 4480 | } |
4326 | 4481 | |
4327 | 4482 | conf.q6_5wx6v2_wa6v2 = { |
4328 | - name = "Qt6.5.0-Windows-arm64-VS2022-&HOSTTOOLVERSION&-xWindows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
4329 | - qtVersion = "6.5.0", | |
4483 | + name = "Qt6.5.1-Windows-arm64-VS2022-&HOSTTOOLVERSION&-xWindows-x86_64-VS2022-&HOSTTOOLVERSION&", | |
4484 | + qtVersion = "6.5.1", | |
4330 | 4485 | host = "Win10", |
4331 | 4486 | target = "Win10Arm", |
4332 | 4487 | toolchain = "MSVC2022-64", -- only a placeholder here, in fact it uses "toolchainT" instead of "toolchain" |
@@ -4361,8 +4516,8 @@ conf.q6_5wx6v2_wa6v2 = { | ||
4361 | 4516 | } |
4362 | 4517 | |
4363 | 4518 | conf.q6_5wx6p2 = { |
4364 | - name = "Qt6.5.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt", | |
4365 | - qtVersion = "6.5.0", | |
4519 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt", | |
4520 | + qtVersion = "6.5.1", | |
4366 | 4521 | host = "Win10", |
4367 | 4522 | toolchain = "MinGW122u-64", |
4368 | 4523 | opensslConf = "o3_0wx6p2", |
@@ -4399,8 +4554,8 @@ conf.q6_5wx6p2 = { | ||
4399 | 4554 | } |
4400 | 4555 | |
4401 | 4556 | conf.q6_5wx6p2sf = { |
4402 | - name = "Qt6.5.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt-staticFull", | |
4403 | - qtVersion = "6.5.0", | |
4557 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt-staticFull", | |
4558 | + qtVersion = "6.5.1", | |
4404 | 4559 | host = "Win10", |
4405 | 4560 | toolchain = "MinGW122u-64", |
4406 | 4561 | variant = {"-staticFull"}, |
@@ -4439,8 +4594,8 @@ conf.q6_5wx6p2sf = { | ||
4439 | 4594 | } |
4440 | 4595 | |
4441 | 4596 | conf.q6_5wx6g2 = { |
4442 | - name = "Qt6.5.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
4443 | - qtVersion = "6.5.0", | |
4597 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
4598 | + qtVersion = "6.5.1", | |
4444 | 4599 | host = "Win10", |
4445 | 4600 | toolchain = "MinGW1220-64", |
4446 | 4601 | opensslConf = "o3_0wx6g2", |
@@ -4477,8 +4632,8 @@ conf.q6_5wx6g2 = { | ||
4477 | 4632 | } |
4478 | 4633 | |
4479 | 4634 | conf.q6_5wx6g2st = { |
4480 | - name = "Qt6.5.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-static", | |
4481 | - qtVersion = "6.5.0", | |
4635 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-static", | |
4636 | + qtVersion = "6.5.1", | |
4482 | 4637 | host = "Win10", |
4483 | 4638 | toolchain = "MinGW1220-64", |
4484 | 4639 | variant = {"-static"}, |
@@ -4542,8 +4697,8 @@ conf.q6_5wx6g2st = { | ||
4542 | 4697 | } |
4543 | 4698 | |
4544 | 4699 | conf.q6_5wx6g2sf = { |
4545 | - name = "Qt6.5.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-staticFull", | |
4546 | - qtVersion = "6.5.0", | |
4700 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-staticFull", | |
4701 | + qtVersion = "6.5.1", | |
4547 | 4702 | host = "Win10", |
4548 | 4703 | toolchain = "MinGW1220-64", |
4549 | 4704 | variant = {"-staticFull"}, |
@@ -4581,9 +4736,165 @@ conf.q6_5wx6g2sf = { | ||
4581 | 4736 | ]], |
4582 | 4737 | } |
4583 | 4738 | |
4739 | +conf.q6_5wx6p3 = { | |
4740 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt", | |
4741 | + qtVersion = "6.5.1", | |
4742 | + host = "Win10", | |
4743 | + toolchain = "MinGW131u-64", | |
4744 | + opensslConf = "o3_0wx6p3", | |
4745 | + mysqlConf = "m3_3wx6p3", | |
4746 | + useCMake = "20", | |
4747 | + configureParameter = [[ | |
4748 | + -G"Ninja" | |
4749 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
4750 | + -DBUILD_SHARED_LIBS=ON | |
4751 | + -DCMAKE_BUILD_TYPE="Release" | |
4752 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
4753 | + -DBUILD_WITH_PCH=ON | |
4754 | + -DQT_BUILD_EXAMPLES=OFF | |
4755 | + -DQT_BUILD_TESTS=OFF | |
4756 | + -DFEATURE_doubleconversion=ON | |
4757 | + -DFEATURE_system_doubleconversion=OFF | |
4758 | + -DFEATURE_system_zlib=OFF | |
4759 | + -DFEATURE_system_pcre2=OFF | |
4760 | + -DFEATURE_icu=OFF | |
4761 | + -DFEATURE_opengl_dynamic=ON | |
4762 | + -DFEATURE_ssl=ON | |
4763 | + -DFEATURE_openssl=ON | |
4764 | + -DINPUT_openssl=linked | |
4765 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
4766 | + -DFEATURE_schannel=ON | |
4767 | + -DFEATURE_sql_sqlite=ON | |
4768 | + -DFEATURE_sql_odbc=ON | |
4769 | + -DFEATURE_sql_mysql=ON | |
4770 | + -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb" | |
4771 | + -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a" | |
4772 | + -DFEATURE_system_sqlite=OFF | |
4773 | + -DBUILD_qtgrpc=OFF | |
4774 | + ]], | |
4775 | +} | |
4776 | + | |
4777 | +conf.q6_5wx6p3sf = { | |
4778 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt-staticFull", | |
4779 | + qtVersion = "6.5.1", | |
4780 | + host = "Win10", | |
4781 | + toolchain = "MinGW131u-64", | |
4782 | + variant = {"-staticFull"}, | |
4783 | + opensslConf = "o3_0wx6p3st", | |
4784 | + useCMake = "Latest", | |
4785 | + configureParameter = [[ | |
4786 | + -G"Ninja" | |
4787 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
4788 | + -DBUILD_SHARED_LIBS=OFF | |
4789 | + -DFEATURE_static_runtime=ON | |
4790 | + -DCMAKE_BUILD_TYPE="Release" | |
4791 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
4792 | + -DBUILD_WITH_PCH=ON | |
4793 | + -DQT_BUILD_EXAMPLES=OFF | |
4794 | + -DQT_BUILD_TESTS=OFF | |
4795 | + -DFEATURE_relocatable=ON | |
4796 | + -DFEATURE_doubleconversion=ON | |
4797 | + -DFEATURE_system_doubleconversion=OFF | |
4798 | + -DFEATURE_system_zlib=OFF | |
4799 | + -DFEATURE_system_pcre2=OFF | |
4800 | + -DFEATURE_icu=OFF | |
4801 | + -DFEATURE_opengl_dynamic=ON | |
4802 | + -DFEATURE_ssl=ON | |
4803 | + -DFEATURE_openssl=ON | |
4804 | + -DINPUT_openssl=linked | |
4805 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
4806 | + -DOPENSSL_USE_STATIC_LIBS=TRUE | |
4807 | + -DFEATURE_schannel=ON | |
4808 | + -DFEATURE_sql_sqlite=ON | |
4809 | + -DFEATURE_sql_odbc=ON | |
4810 | + -DFEATURE_system_sqlite=OFF | |
4811 | + -DBUILD_qtgrpc=OFF | |
4812 | + -DBUILD_qtwebengine=OFF | |
4813 | + -DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++" | |
4814 | + ]], | |
4815 | +} | |
4816 | + | |
4817 | +conf.q6_5wx6g3 = { | |
4818 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
4819 | + qtVersion = "6.5.1", | |
4820 | + host = "Win10", | |
4821 | + toolchain = "MinGW1310-64", | |
4822 | + opensslConf = "o3_0wx6g3", | |
4823 | + mysqlConf = "m3_3wx6g3", | |
4824 | + useCMake = "20", | |
4825 | + configureParameter = [[ | |
4826 | + -G"Ninja" | |
4827 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
4828 | + -DBUILD_SHARED_LIBS=ON | |
4829 | + -DCMAKE_BUILD_TYPE="Release" | |
4830 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
4831 | + -DBUILD_WITH_PCH=ON | |
4832 | + -DQT_BUILD_EXAMPLES=OFF | |
4833 | + -DQT_BUILD_TESTS=OFF | |
4834 | + -DFEATURE_doubleconversion=ON | |
4835 | + -DFEATURE_system_doubleconversion=OFF | |
4836 | + -DFEATURE_system_zlib=OFF | |
4837 | + -DFEATURE_system_pcre2=OFF | |
4838 | + -DFEATURE_icu=OFF | |
4839 | + -DFEATURE_opengl_dynamic=ON | |
4840 | + -DFEATURE_ssl=ON | |
4841 | + -DFEATURE_openssl=ON | |
4842 | + -DINPUT_openssl=linked | |
4843 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
4844 | + -DFEATURE_schannel=ON | |
4845 | + -DFEATURE_sql_sqlite=ON | |
4846 | + -DFEATURE_sql_odbc=ON | |
4847 | + -DFEATURE_sql_mysql=ON | |
4848 | + -DMySQL_INCLUDE_DIR="&MYSQLPREFIX&\include\mariadb" | |
4849 | + -DMySQL_LIBRARY="&MYSQLPREFIX&\lib\mariadb\liblibmariadb.dll.a" | |
4850 | + -DFEATURE_system_sqlite=OFF | |
4851 | + -DBUILD_qtgrpc=OFF | |
4852 | + ]], | |
4853 | +} | |
4854 | + | |
4855 | +conf.q6_5wx6g3sf = { | |
4856 | + name = "Qt6.5.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-staticFull", | |
4857 | + qtVersion = "6.5.1", | |
4858 | + host = "Win10", | |
4859 | + toolchain = "MinGW1310-64", | |
4860 | + variant = {"-staticFull"}, | |
4861 | + opensslConf = "o3_0wx6g3st", | |
4862 | + useCMake = "Latest", | |
4863 | + configureParameter = [[ | |
4864 | + -G"Ninja" | |
4865 | + -DCMAKE_INSTALL_PREFIX=&INSTALLROOT& | |
4866 | + -DBUILD_SHARED_LIBS=OFF | |
4867 | + -DFEATURE_static_runtime=ON | |
4868 | + -DCMAKE_BUILD_TYPE="Release" | |
4869 | + -DQT_QMAKE_TARGET_MKSPEC=win32-g++ | |
4870 | + -DBUILD_WITH_PCH=ON | |
4871 | + -DQT_BUILD_EXAMPLES=OFF | |
4872 | + -DQT_BUILD_TESTS=OFF | |
4873 | + -DFEATURE_relocatable=ON | |
4874 | + -DFEATURE_doubleconversion=ON | |
4875 | + -DFEATURE_system_doubleconversion=OFF | |
4876 | + -DFEATURE_system_zlib=OFF | |
4877 | + -DFEATURE_system_pcre2=OFF | |
4878 | + -DFEATURE_icu=OFF | |
4879 | + -DFEATURE_opengl_dynamic=ON | |
4880 | + -DFEATURE_ssl=ON | |
4881 | + -DFEATURE_openssl=ON | |
4882 | + -DINPUT_openssl=linked | |
4883 | + -DOPENSSL_ROOT_DIR=&OPENSSLDIR& | |
4884 | + -DOPENSSL_USE_STATIC_LIBS=TRUE | |
4885 | + -DFEATURE_schannel=ON | |
4886 | + -DFEATURE_sql_sqlite=ON | |
4887 | + -DFEATURE_sql_odbc=ON | |
4888 | + -DFEATURE_system_sqlite=OFF | |
4889 | + -DBUILD_qtgrpc=OFF | |
4890 | + -DBUILD_qtwebengine=OFF | |
4891 | + -DCMAKE_EXE_LINKER_FLAGS="--static -static-libgcc -static-libstdc++" | |
4892 | + ]], | |
4893 | +} | |
4894 | + | |
4584 | 4895 | conf.q6_5wx6u6 = { |
4585 | - name = "Qt6.5.0-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt", | |
4586 | - qtVersion = "6.5.0", | |
4896 | + name = "Qt6.5.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt", | |
4897 | + qtVersion = "6.5.1", | |
4587 | 4898 | host = "Win10", |
4588 | 4899 | toolchain = "MinGWLLVM-ucrt16-64", |
4589 | 4900 | opensslConf = "o3_0wx6u6", |
@@ -4624,8 +4935,8 @@ conf.q6_5wx6u6 = { | ||
4624 | 4935 | } |
4625 | 4936 | |
4626 | 4937 | conf.q6_5wx6s6 = { |
4627 | - name = "Qt6.5.0-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt", | |
4628 | - qtVersion = "6.5.0", | |
4938 | + name = "Qt6.5.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt", | |
4939 | + qtVersion = "6.5.1", | |
4629 | 4940 | host = "Win10", |
4630 | 4941 | toolchain = "MinGWLLVM-msvcrt16-64", |
4631 | 4942 | opensslConf = "o3_0wx6s6", |
@@ -4666,8 +4977,8 @@ conf.q6_5wx6s6 = { | ||
4666 | 4977 | } |
4667 | 4978 | |
4668 | 4979 | conf.q6_5lx6st = { |
4669 | - name = "Qt6.5.0-Linux-x86_64-gcc&HOSTTOOLVERSION&-static", | |
4670 | - qtVersion = "6.5.0", | |
4980 | + name = "Qt6.5.1-Linux-x86_64-gcc&HOSTTOOLVERSION&-static", | |
4981 | + qtVersion = "6.5.1", | |
4671 | 4982 | host = "Rocky9", |
4672 | 4983 | variant = {"-static"}, |
4673 | 4984 | useCMake = "Latest", |
@@ -4724,8 +5035,8 @@ conf.q6_5lx6st = { | ||
4724 | 5035 | } |
4725 | 5036 | |
4726 | 5037 | conf.q6_5mal = { |
4727 | - name = "Qt6.5.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
4728 | - qtVersion = "6.5.0", | |
5038 | + name = "Qt6.5.1-macOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
5039 | + qtVersion = "6.5.1", | |
4729 | 5040 | host = "macOSM1", |
4730 | 5041 | opensslConf = "o3_0mal", |
4731 | 5042 | mysqlConf = "m3_3mal", |
@@ -4767,8 +5078,8 @@ conf.q6_5mal = { | ||
4767 | 5078 | } |
4768 | 5079 | |
4769 | 5080 | conf.q6_5malnf = { |
4770 | - name = "Qt6.5.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework", | |
4771 | - qtVersion = "6.5.0", | |
5081 | + name = "Qt6.5.1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework", | |
5082 | + qtVersion = "6.5.1", | |
4772 | 5083 | host = "macOSM1", |
4773 | 5084 | variant = {"-noFramework"}, |
4774 | 5085 | opensslConf = "o3_0mal", |
@@ -4811,8 +5122,8 @@ conf.q6_5malnf = { | ||
4811 | 5122 | } |
4812 | 5123 | |
4813 | 5124 | conf.q6_5malst = { |
4814 | - name = "Qt6.5.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static", | |
4815 | - qtVersion = "6.5.0", | |
5125 | + name = "Qt6.5.1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static", | |
5126 | + qtVersion = "6.5.1", | |
4816 | 5127 | host = "macOSM1", |
4817 | 5128 | variant = {"-static"}, |
4818 | 5129 | opensslConf = "o3_0mal", |
@@ -4874,8 +5185,8 @@ conf.q6_5malst = { | ||
4874 | 5185 | } |
4875 | 5186 | |
4876 | 5187 | conf.q6_5malsf = { |
4877 | - name = "Qt6.5.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&-staticFull", | |
4878 | - qtVersion = "6.5.0", | |
5188 | + name = "Qt6.5.1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-staticFull", | |
5189 | + qtVersion = "6.5.1", | |
4879 | 5190 | host = "macOSM1", |
4880 | 5191 | variant = {"-staticFull"}, |
4881 | 5192 | opensslConf = "o3_0mal", |
@@ -4912,8 +5223,8 @@ conf.q6_5malsf = { | ||
4912 | 5223 | } |
4913 | 5224 | |
4914 | 5225 | conf.q6_5wx6g2_aa6n5 = { |
4915 | - name = "Qt6.5.0-Android-arm64-Clang-NDKr25c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
4916 | - qtVersion = "6.5.0", | |
5226 | + name = "Qt6.5.1-Android-arm64-Clang-NDKr25c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
5227 | + qtVersion = "6.5.1", | |
4917 | 5228 | host = "Win10", |
4918 | 5229 | target = "Android-27", |
4919 | 5230 | toolchain = "MinGW1220-64", |
@@ -4951,8 +5262,8 @@ conf.q6_5wx6g2_aa6n5 = { | ||
4951 | 5262 | } |
4952 | 5263 | |
4953 | 5264 | conf.q6_5wx6g2_ax6n5 = { |
4954 | - name = "Qt6.5.0-Android-x86_64-Clang-NDKr25c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
4955 | - qtVersion = "6.5.0", | |
5265 | + name = "Qt6.5.1-Android-x86_64-Clang-NDKr25c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
5266 | + qtVersion = "6.5.1", | |
4956 | 5267 | host = "Win10", |
4957 | 5268 | target = "Android-27", |
4958 | 5269 | toolchain = "MinGW1220-64", |
@@ -4990,8 +5301,8 @@ conf.q6_5wx6g2_ax6n5 = { | ||
4990 | 5301 | } |
4991 | 5302 | |
4992 | 5303 | conf.q6_5lx6_aa6n5 = { |
4993 | - name = "Qt6.5.0-Android-arm64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
4994 | - qtVersion = "6.5.0", | |
5304 | + name = "Qt6.5.1-Android-arm64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
5305 | + qtVersion = "6.5.1", | |
4995 | 5306 | host = "Rocky9", |
4996 | 5307 | target = "Android-27", |
4997 | 5308 | toolchainT = "Android-27-r25c-arm64", |
@@ -5027,8 +5338,8 @@ conf.q6_5lx6_aa6n5 = { | ||
5027 | 5338 | } |
5028 | 5339 | |
5029 | 5340 | conf.q6_5lx6_ax6n5 = { |
5030 | - name = "Qt6.5.0-Android-x86_64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
5031 | - qtVersion = "6.5.0", | |
5341 | + name = "Qt6.5.1-Android-x86_64-Clang-NDKr25c-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
5342 | + qtVersion = "6.5.1", | |
5032 | 5343 | host = "Rocky9", |
5033 | 5344 | target = "Android-27", |
5034 | 5345 | toolchainT = "Android-27-r25c-x86_64", |
@@ -5064,8 +5375,8 @@ conf.q6_5lx6_ax6n5 = { | ||
5064 | 5375 | } |
5065 | 5376 | |
5066 | 5377 | conf.q6_5mal_aa6n5 = { |
5067 | - name = "Qt6.5.0-Android-arm64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
5068 | - qtVersion = "6.5.0", | |
5378 | + name = "Qt6.5.1-Android-arm64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
5379 | + qtVersion = "6.5.1", | |
5069 | 5380 | host = "macOSM1", |
5070 | 5381 | target = "Android-27", |
5071 | 5382 | toolchainT = "Android-27-r25c-arm64", |
@@ -5101,8 +5412,8 @@ conf.q6_5mal_aa6n5 = { | ||
5101 | 5412 | } |
5102 | 5413 | |
5103 | 5414 | conf.q6_5mal_ax6n5 = { |
5104 | - name = "Qt6.5.0-Android-x86_64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
5105 | - qtVersion = "6.5.0", | |
5415 | + name = "Qt6.5.1-Android-x86_64-Clang-NDKr25c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
5416 | + qtVersion = "6.5.1", | |
5106 | 5417 | host = "macOSM1", |
5107 | 5418 | target = "Android-27", |
5108 | 5419 | toolchainT = "Android-27-r25c-x86_64", |
@@ -5139,8 +5450,8 @@ conf.q6_5mal_ax6n5 = { | ||
5139 | 5450 | |
5140 | 5451 | -- WebAssembly uses emcmake which don't need a toolchain file |
5141 | 5452 | conf.q6_5wx6g2_W = { |
5142 | - name = "Qt6.5.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
5143 | - qtVersion = "6.5.0", | |
5453 | + name = "Qt6.5.1-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt", | |
5454 | + qtVersion = "6.5.1", | |
5144 | 5455 | host = "Win10", |
5145 | 5456 | toolchain = "MinGW1220-64", |
5146 | 5457 | target = "WebAssembly", |
@@ -5170,8 +5481,8 @@ conf.q6_5wx6g2_W = { | ||
5170 | 5481 | } |
5171 | 5482 | |
5172 | 5483 | conf.q6_5lx6_W = { |
5173 | - name = "Qt6.5.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
5174 | - qtVersion = "6.5.0", | |
5484 | + name = "Qt6.5.1-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&", | |
5485 | + qtVersion = "6.5.1", | |
5175 | 5486 | host = "Rocky9", |
5176 | 5487 | target = "WebAssembly", |
5177 | 5488 | toolchainT = "emscripten-3.1.25", |
@@ -5200,8 +5511,8 @@ conf.q6_5lx6_W = { | ||
5200 | 5511 | } |
5201 | 5512 | |
5202 | 5513 | conf.q6_5mal_W = { |
5203 | - name = "Qt6.5.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
5204 | - qtVersion = "6.5.0", | |
5514 | + name = "Qt6.5.1-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&", | |
5515 | + qtVersion = "6.5.1", | |
5205 | 5516 | host = "macOSM1", |
5206 | 5517 | target = "WebAssembly", |
5207 | 5518 | toolchainT = "emscripten-3.1.25", |
@@ -5251,23 +5562,23 @@ setmetatable(QQtPatcherVersion, versionMo) | ||
5251 | 5562 | local Qt6StaticConf = { |
5252 | 5563 | Win10 = { |
5253 | 5564 | ["6.2.4"] = "q6_2wx6g1st", |
5254 | - ["6.5.0"] = "q6_5wx6g2st", | |
5565 | + ["6.5.1"] = "q6_5wx6g2st", | |
5255 | 5566 | }, |
5256 | 5567 | Win10MSVC2019 = { |
5257 | 5568 | ["6.2.4"] = "q6_2wx6v9st", |
5258 | 5569 | }, |
5259 | 5570 | Win10MSVC2022 = { |
5260 | - ["6.5.0"] = "q6_5wx6v2st", | |
5571 | + ["6.5.1"] = "q6_5wx6v2st", | |
5261 | 5572 | }, |
5262 | 5573 | CentOS8 = { |
5263 | 5574 | ["6.2.4"] = "q6_2lx6st", |
5264 | 5575 | }, |
5265 | 5576 | Rocky9 = { |
5266 | - ["6.5.0"] = "q6_5lx6st", | |
5577 | + ["6.5.1"] = "q6_5lx6st", | |
5267 | 5578 | }, |
5268 | 5579 | macOSM1 = { |
5269 | 5580 | ["6.2.4"] = "q6_2malst", |
5270 | - ["6.5.0"] = "q6_5malst", | |
5581 | + ["6.5.1"] = "q6_5malst", | |
5271 | 5582 | }, |
5272 | 5583 | } |
5273 | 5584 |
@@ -5311,9 +5622,9 @@ local valueMo = { | ||
5311 | 5622 | |
5312 | 5623 | local Win10SrcPackagePrefixWorkaroundVersions = { |
5313 | 5624 | "5.12.12", |
5314 | - "5.15.9-4", | |
5625 | + "5.15.9-5", | |
5315 | 5626 | "6.2.4", |
5316 | - "6.5.0", | |
5627 | + "6.5.1", | |
5317 | 5628 | } |
5318 | 5629 | |
5319 | 5630 | for name, value in pairs(conf) do |