Merge pull request #5594 from xmake-io/fetch

Improve fetch package

5 files changed, 63 insertions, 32 deletions

diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index 5920dacd4..00ae72768 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -1846,6 +1846,8 @@ function _instance:_fetch_library(opt)
                     components_base.sysincludedirs = nil
                 end
             end
+            local package_utils = sandbox_module.import("private.utils.package", {anonymous = true})
+            package_utils.fetchinfo_set_concat(fetchinfo)
         end
         if fetchinfo and option.get("verbose") then
             local reponame = self:repo() and self:repo():name() or ""
diff --git a/xmake/core/platform/platform.lua b/xmake/core/platform/platform.lua
index 1b2ba19e3..913d44691 100644
--- a/xmake/core/platform/platform.lua
+++ b/xmake/core/platform/platform.lua
@@ -287,7 +287,8 @@ function _instance:formats()
     local formats = self._FORMATS
     if not formats then
         for _, toolchain_inst in ipairs(self:toolchains()) do
-            formats = toolchain_inst:get("formats")
+            -- @note we can only get formats from set_formats in toolchain description.
+            formats = toolchain_inst:get("formats", {load = false})
             if formats then
                 break
             end
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index b61852d42..ce6b834a6 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -136,7 +136,8 @@ function _instance:add(name, ...)
 end
 
 -- get the toolchain configuration
-function _instance:get(name)
+function _instance:get(name, opt)
+    opt = opt or {}
 
     -- attempt to get the static configure value
     local value = self:info():get(name)
@@ -145,10 +146,10 @@ function _instance:get(name)
     end
 
     -- lazy loading toolchain
-    self:_load()
-
-    -- get other platform info
-    return self:info():get(name)
+    if opt.load ~= false then
+        self:_load()
+        return self:info():get(name)
+    end
 end
 
 -- get toolchain kind
diff --git a/xmake/modules/lib/detect/find_package.lua b/xmake/modules/lib/detect/find_package.lua
index ac1f78ae1..366a25e88 100644
--- a/xmake/modules/lib/detect/find_package.lua
+++ b/xmake/modules/lib/detect/find_package.lua
@@ -23,30 +23,7 @@ import("core.base.option")
 import("core.project.config")
 import("core.cache.detectcache")
 import("package.manager.find_package")
-
--- 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
+import("private.utils.package", {alias = "package_utils"})
 
 -- find package using the package manager
 --
@@ -144,8 +121,8 @@ function main(name, opt)
     end
 
     -- register concat
-    if result and type(result) == "table" then
-        debug.setmetatable(result, {__concat = _concat_packages})
+    if result then
+        package_utils.fetchinfo_set_concat(result)
     end
     return result and result or nil
 end
diff --git a/xmake/modules/private/utils/package.lua b/xmake/modules/private/utils/package.lua
new file mode 100644
index 000000000..7a2ad1365
--- /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, TODO components
+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