From afe089bd20fa93ab21bf01bb72591afcc0a1d48d Mon Sep 17 00:00:00 2001 From: Perdixky <3293789706@qq.com> Date: Thu, 23 Oct 2025 20:43:45 +0800 Subject: [PATCH 1/6] Add gtl package. --- packages/g/gtl/xmake.lua | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 packages/g/gtl/xmake.lua diff --git a/packages/g/gtl/xmake.lua b/packages/g/gtl/xmake.lua new file mode 100644 index 00000000000..00c934c4758 --- /dev/null +++ b/packages/g/gtl/xmake.lua @@ -0,0 +1,32 @@ +package ("gtl") + + set_kind("library", {headeronly = true}) + set_homepage("https://github.com/greg7mdp/gtl") + set_description("Greg's Template Library of useful classes.") + set_license("Apache-2.0") + set_urls("https://github.com/greg7mdp/gtl.git") + + add_versions("1.01", "94cb5022283a2c6f54188ccf565d36784b1cf84bd4e7c74e954db2dc18753403") + add_versions("v1.1.0", "d18b6124c51e99d8e7e2cc1f1b3e8a8c649c2872b7a1e9987417c9166c9f427f") + add_versions("v1.1.1", "3c87cad50bc2de6d17596c796c81521ff80b00d66674faa52f147544c4951270") + add_versions("v1.1.2", "22ac9fb43608c7ddccb983096f5dadb036e5d3122d9194cdb42fee67d754c552") + add_versions("v1.1.3", "c667690eeecf37f660d8a61bca1076e845154bc535c44ec0d2404c04c66ae228") + add_versions("v1.1.4", "b51b9951d11fb73ed22360a96a3f6c691c15202c3b14c79dcdd498da80b6502d") + add_versions("v1.1.5", "2d943d2ccc33c6c662918efc51782dac414354a1458441f16041a98eec164bda") + add_versions("v1.1.6", "d90224c0b26deeab730b02857a20c6c7dee014ecd7a76aaa7a469c35049fe3a9") + add_versions("v1.1.8", "6bda4c07bd966a88740ee07e3df23863a93d7b5365e0eea7f13cde9eda961b86") + add_versions("v1.2.0", "1547ab78f62725c380f50972f7a49ffd3671ded17a3cb34305da5c953c6ba8e7") + + add_deps("cmake") + on_install("windows", "linux", "macosx", "mingw", "msys", function (package) + local configs = { + "-DGTL_BUILD_TESTS=OFF", + "-DGTL_BUILD_EXAMPLES=OFF", + "-DGTL_BUILD_BENCHMARKS=OFF", + } + import("package.tools.cmake").install(package, configs) + end) + + on_test(function (package) + assert(package:has_cxxincludes("gtl/phmap.hpp")) + end) From 53dc3fd7c0fd1293576e7c391562a0dc258dc332 Mon Sep 17 00:00:00 2001 From: Perdixky <3293789706@qq.com> Date: Thu, 23 Oct 2025 21:00:20 +0800 Subject: [PATCH 2/6] fix some errors --- packages/g/gtl/xmake.lua | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/packages/g/gtl/xmake.lua b/packages/g/gtl/xmake.lua index 00c934c4758..20c4b584490 100644 --- a/packages/g/gtl/xmake.lua +++ b/packages/g/gtl/xmake.lua @@ -4,25 +4,30 @@ package ("gtl") set_homepage("https://github.com/greg7mdp/gtl") set_description("Greg's Template Library of useful classes.") set_license("Apache-2.0") - set_urls("https://github.com/greg7mdp/gtl.git") + set_urls("https://github.com/greg7mdp/gtl/archive/refs/tags/$(version).tar.gz", {version = function (version) + return version:startswith("v") and version or ("v" .. version) + end}) + add_urls("https://github.com/greg7mdp/gtl.git", {version = function (version) + return version:startswith("v") and version or ("v" .. version) + end}) add_versions("1.01", "94cb5022283a2c6f54188ccf565d36784b1cf84bd4e7c74e954db2dc18753403") - add_versions("v1.1.0", "d18b6124c51e99d8e7e2cc1f1b3e8a8c649c2872b7a1e9987417c9166c9f427f") - add_versions("v1.1.1", "3c87cad50bc2de6d17596c796c81521ff80b00d66674faa52f147544c4951270") - add_versions("v1.1.2", "22ac9fb43608c7ddccb983096f5dadb036e5d3122d9194cdb42fee67d754c552") - add_versions("v1.1.3", "c667690eeecf37f660d8a61bca1076e845154bc535c44ec0d2404c04c66ae228") - add_versions("v1.1.4", "b51b9951d11fb73ed22360a96a3f6c691c15202c3b14c79dcdd498da80b6502d") - add_versions("v1.1.5", "2d943d2ccc33c6c662918efc51782dac414354a1458441f16041a98eec164bda") - add_versions("v1.1.6", "d90224c0b26deeab730b02857a20c6c7dee014ecd7a76aaa7a469c35049fe3a9") - add_versions("v1.1.8", "6bda4c07bd966a88740ee07e3df23863a93d7b5365e0eea7f13cde9eda961b86") - add_versions("v1.2.0", "1547ab78f62725c380f50972f7a49ffd3671ded17a3cb34305da5c953c6ba8e7") + add_versions("1.1.0", "d18b6124c51e99d8e7e2cc1f1b3e8a8c649c2872b7a1e9987417c9166c9f427f") + add_versions("1.1.1", "3c87cad50bc2de6d17596c796c81521ff80b00d66674faa52f147544c4951270") + add_versions("1.1.2", "22ac9fb43608c7ddccb983096f5dadb036e5d3122d9194cdb42fee67d754c552") + add_versions("1.1.3", "c667690eeecf37f660d8a61bca1076e845154bc535c44ec0d2404c04c66ae228") + add_versions("1.1.4", "b51b9951d11fb73ed22360a96a3f6c691c15202c3b14c79dcdd498da80b6502d") + add_versions("1.1.5", "2d943d2ccc33c6c662918efc51782dac414354a1458441f16041a98eec164bda") + add_versions("1.1.6", "d90224c0b26deeab730b02857a20c6c7dee014ecd7a76aaa7a469c35049fe3a9") + add_versions("1.1.8", "6bda4c07bd966a88740ee07e3df23863a93d7b5365e0eea7f13cde9eda961b86") + add_versions("1.2.0", "1547ab78f62725c380f50972f7a49ffd3671ded17a3cb34305da5c953c6ba8e7") add_deps("cmake") - on_install("windows", "linux", "macosx", "mingw", "msys", function (package) + on_install(function (package) local configs = { - "-DGTL_BUILD_TESTS=OFF", - "-DGTL_BUILD_EXAMPLES=OFF", - "-DGTL_BUILD_BENCHMARKS=OFF", + "-DGTL_BUILD_TESTS=OFF", + "-DGTL_BUILD_EXAMPLES=OFF", + "-DGTL_BUILD_BENCHMARKS=OFF", } import("package.tools.cmake").install(package, configs) end) From cdfa89403c7202b32bfe04e9e925b28f9460fae3 Mon Sep 17 00:00:00 2001 From: Perdixky <3293789706@qq.com> Date: Thu, 23 Oct 2025 22:19:07 +0800 Subject: [PATCH 3/6] set language version as c++20 --- packages/g/gtl/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/g/gtl/xmake.lua b/packages/g/gtl/xmake.lua index 20c4b584490..1a414974e6f 100644 --- a/packages/g/gtl/xmake.lua +++ b/packages/g/gtl/xmake.lua @@ -33,5 +33,5 @@ package ("gtl") end) on_test(function (package) - assert(package:has_cxxincludes("gtl/phmap.hpp")) + assert(package:has_cxxincludes("gtl/phmap.hpp", {configs = {languages = "cxx20"}})) end) From 22b6008ca3bac6248cacfd9481c03f6b074f6a96 Mon Sep 17 00:00:00 2001 From: Saikari Date: Thu, 23 Oct 2025 18:55:50 +0300 Subject: [PATCH 4/6] Update xmake.lua --- packages/g/gtl/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/g/gtl/xmake.lua b/packages/g/gtl/xmake.lua index 1a414974e6f..95e1d9ec7f1 100644 --- a/packages/g/gtl/xmake.lua +++ b/packages/g/gtl/xmake.lua @@ -23,6 +23,14 @@ package ("gtl") add_versions("1.2.0", "1547ab78f62725c380f50972f7a49ffd3671ded17a3cb34305da5c953c6ba8e7") add_deps("cmake") + + on_check("android", function (package) + import("core.tool.toolchain") + local ndk = toolchain.load("ndk", {plat = package:plat(), arch = package:arch()}) + local ndkver = ndk:config("ndkver") + assert(ndkver and tonumber(ndkver) > 25, "package(gtl): need ndk revision >= 26 for android") + end) + on_install(function (package) local configs = { "-DGTL_BUILD_TESTS=OFF", From 704e7dfed29ff99e599d41a35067a77779041053 Mon Sep 17 00:00:00 2001 From: Saikari Date: Thu, 23 Oct 2025 18:59:04 +0300 Subject: [PATCH 5/6] Update xmake.lua --- packages/g/gtl/xmake.lua | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/g/gtl/xmake.lua b/packages/g/gtl/xmake.lua index 95e1d9ec7f1..751942010ae 100644 --- a/packages/g/gtl/xmake.lua +++ b/packages/g/gtl/xmake.lua @@ -1,13 +1,11 @@ package ("gtl") - set_kind("library", {headeronly = true}) set_homepage("https://github.com/greg7mdp/gtl") set_description("Greg's Template Library of useful classes.") set_license("Apache-2.0") - set_urls("https://github.com/greg7mdp/gtl/archive/refs/tags/$(version).tar.gz", {version = function (version) - return version:startswith("v") and version or ("v" .. version) - end}) - add_urls("https://github.com/greg7mdp/gtl.git", {version = function (version) + + add_urls("https://github.com/greg7mdp/gtl/archive/refs/tags/$(version).tar.gz", + "https://github.com/greg7mdp/gtl.git", {version = function (version) return version:startswith("v") and version or ("v" .. version) end}) @@ -33,13 +31,13 @@ package ("gtl") on_install(function (package) local configs = { - "-DGTL_BUILD_TESTS=OFF", - "-DGTL_BUILD_EXAMPLES=OFF", - "-DGTL_BUILD_BENCHMARKS=OFF", - } + "-DGTL_BUILD_TESTS=OFF", + "-DGTL_BUILD_EXAMPLES=OFF", + "-DGTL_BUILD_BENCHMARKS=OFF" + } import("package.tools.cmake").install(package, configs) end) on_test(function (package) - assert(package:has_cxxincludes("gtl/phmap.hpp", {configs = {languages = "cxx20"}})) + assert(package:has_cxxincludes("gtl/phmap.hpp", {configs = {languages = "c++20"}})) end) From 84ccfb8b4334160a0d7da28bdda9da74523a063d Mon Sep 17 00:00:00 2001 From: Saikari Date: Thu, 23 Oct 2025 19:22:40 +0300 Subject: [PATCH 6/6] Update xmake.lua --- packages/g/gtl/xmake.lua | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/packages/g/gtl/xmake.lua b/packages/g/gtl/xmake.lua index 751942010ae..ffdb69149b1 100644 --- a/packages/g/gtl/xmake.lua +++ b/packages/g/gtl/xmake.lua @@ -1,24 +1,21 @@ -package ("gtl") +package("gtl") set_kind("library", {headeronly = true}) set_homepage("https://github.com/greg7mdp/gtl") set_description("Greg's Template Library of useful classes.") set_license("Apache-2.0") - add_urls("https://github.com/greg7mdp/gtl/archive/refs/tags/$(version).tar.gz", - "https://github.com/greg7mdp/gtl.git", {version = function (version) - return version:startswith("v") and version or ("v" .. version) - end}) + add_urls("https://github.com/greg7mdp/gtl/archive/refs/tags/v$(version).tar.gz", + "https://github.com/greg7mdp/gtl.git") - add_versions("1.01", "94cb5022283a2c6f54188ccf565d36784b1cf84bd4e7c74e954db2dc18753403") - add_versions("1.1.0", "d18b6124c51e99d8e7e2cc1f1b3e8a8c649c2872b7a1e9987417c9166c9f427f") - add_versions("1.1.1", "3c87cad50bc2de6d17596c796c81521ff80b00d66674faa52f147544c4951270") - add_versions("1.1.2", "22ac9fb43608c7ddccb983096f5dadb036e5d3122d9194cdb42fee67d754c552") - add_versions("1.1.3", "c667690eeecf37f660d8a61bca1076e845154bc535c44ec0d2404c04c66ae228") - add_versions("1.1.4", "b51b9951d11fb73ed22360a96a3f6c691c15202c3b14c79dcdd498da80b6502d") - add_versions("1.1.5", "2d943d2ccc33c6c662918efc51782dac414354a1458441f16041a98eec164bda") - add_versions("1.1.6", "d90224c0b26deeab730b02857a20c6c7dee014ecd7a76aaa7a469c35049fe3a9") - add_versions("1.1.8", "6bda4c07bd966a88740ee07e3df23863a93d7b5365e0eea7f13cde9eda961b86") add_versions("1.2.0", "1547ab78f62725c380f50972f7a49ffd3671ded17a3cb34305da5c953c6ba8e7") + add_versions("1.1.8", "6bda4c07bd966a88740ee07e3df23863a93d7b5365e0eea7f13cde9eda961b86") + add_versions("1.1.6", "d90224c0b26deeab730b02857a20c6c7dee014ecd7a76aaa7a469c35049fe3a9") + add_versions("1.1.5", "2d943d2ccc33c6c662918efc51782dac414354a1458441f16041a98eec164bda") + add_versions("1.1.4", "b51b9951d11fb73ed22360a96a3f6c691c15202c3b14c79dcdd498da80b6502d") + add_versions("1.1.3", "c667690eeecf37f660d8a61bca1076e845154bc535c44ec0d2404c04c66ae228") + add_versions("1.1.2", "22ac9fb43608c7ddccb983096f5dadb036e5d3122d9194cdb42fee67d754c552") + add_versions("1.1.1", "3c87cad50bc2de6d17596c796c81521ff80b00d66674faa52f147544c4951270") + add_versions("1.1.0", "d18b6124c51e99d8e7e2cc1f1b3e8a8c649c2872b7a1e9987417c9166c9f427f") add_deps("cmake")