From 596a83774dd9940446ff37436cfad2ab9841919f Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 10 Sep 2024 23:25:08 +0800 Subject: improve fetchinfo --- xmake/modules/private/utils/package.lua | 50 +++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 xmake/modules/private/utils/package.lua (limited to 'xmake/modules/private/utils/package.lua') diff --git a/xmake/modules/private/utils/package.lua b/xmake/modules/private/utils/package.lua new file mode 100644 index 000000000..72def050a --- /dev/null +++ b/xmake/modules/private/utils/package.lua @@ -0,0 +1,50 @@ +--!A cross-platform build utility based on Lua +-- +-- Licensed under the Apache License, Version 2.0 (the "License"); +-- you may not use this file except in compliance with the License. +-- You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, software +-- distributed under the License is distributed on an "AS IS" BASIS, +-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +-- See the License for the specific language governing permissions and +-- limitations under the License. +-- +-- Copyright (C) 2015-present, TBOOX Open Source Group. +-- +-- @author ruki +-- @file package.lua +-- + +-- concat packages +function _concat_packages(a, b) + local result = table.copy(a) + for k, v in pairs(b) do + local o = result[k] + if o ~= nil then + v = table.join(o, v) + end + result[k] = v + end + for k, v in pairs(result) do + if k == "links" or k == "syslinks" or k == "frameworks" or k == "ldflags" or k == "shflags" then + if type(v) == "table" and #v > 1 then + -- we need to ensure link orders when removing repeat values + v = table.reverse_unique(v) + end + else + v = table.unique(v) + end + result[k] = v + end + return result +end + +-- set concat for find_package/fetch info +function fetchinfo_set_concat(fetchinfo) + if fetchinfo and type(fetchinfo) == "table" then + debug.setmetatable(fetchinfo, {__concat = _concat_packages}) + end +end -- cgit v1.3.1 From 51bee34b88b58aff9e5600c99fc979fa694037f3 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 10 Sep 2024 23:27:21 +0800 Subject: add todo --- xmake/modules/private/utils/package.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmake/modules/private/utils/package.lua') diff --git a/xmake/modules/private/utils/package.lua b/xmake/modules/private/utils/package.lua index 72def050a..7a2ad1365 100644 --- a/xmake/modules/private/utils/package.lua +++ b/xmake/modules/private/utils/package.lua @@ -18,7 +18,7 @@ -- @file package.lua -- --- concat packages +-- concat packages, TODO components function _concat_packages(a, b) local result = table.copy(a) for k, v in pairs(b) do -- cgit v1.3.1