get package name from manager/find_package, remove "found" from log msg

3 files changed, 27 insertions, 68 deletions

diff --git a/xmake/modules/lib/detect/find_package.lua b/xmake/modules/lib/detect/find_package.lua
index eaeb01530..a0f44cb74 100644
--- a/xmake/modules/lib/detect/find_package.lua
+++ b/xmake/modules/lib/detect/find_package.lua
@@ -23,7 +23,6 @@ import("core.base.option")
 import("core.project.config")
 import("lib.detect.cache")
 import("package.manager.find_package")
-import("utils.split_package_name")
 
 -- find package using the package manager
 --
@@ -75,8 +74,8 @@ function main(name, opt)
     end
 
     -- find package
-    local manager_name, package_name
-    result, manager_name, package_name = find_package(name, opt)
+    local found_manager_name, package_name, orig_manager_name
+    result, found_manager_name, package_name, orig_manager_name = find_package(name, opt)
 
     -- cache result
     cacheinfo[name] = result and result or false
@@ -85,13 +84,13 @@ function main(name, opt)
     -- trace
     if opt.verbose or option.get("verbose") then
         if result then
+
             -- only display manager of found package if the package we searched for
             -- did not specify a package manager
-            local original_manager_name, _, _ = split_package_name(name)
-            local display_name = original_manager_name and package_name
-                or (manager_name .. "::" .. package_name)
-
-            cprint("checking for %s ... ${color.success}found %s %s", name, display_name, result.version and result.version or "")
+            found_manager_name = found_manager_name or ""
+            local display_manager = orig_manager_name == found_manager_name and "" or found_manager_name .. "::"
+            local display_name = display_manager .. package_name
+            cprint("checking for %s ... ${color.success}%s %s", name, display_name, result.version and result.version or "")
         else
             cprint("checking for %s ... ${color.nothing}${text.nothing}", name)
         end
diff --git a/xmake/modules/package/manager/find_package.lua b/xmake/modules/package/manager/find_package.lua
index db0bd4788..6a3336cc9 100644
--- a/xmake/modules/package/manager/find_package.lua
+++ b/xmake/modules/package/manager/find_package.lua
@@ -22,7 +22,6 @@
 import("core.base.semver")
 import("core.base.option")
 import("core.project.config")
-import("utils.split_package_name")
 
 -- find package with the builtin rule
 --
@@ -65,15 +64,16 @@ function _find_package_with_builtin_rule(package_name, opt)
     end
 
     -- find package from the given package manager
-    local result = nil
+    local result, manager_name = nil, nil
     for _, manager_name in ipairs(managers) do
         dprint("finding %s from %s ..", package_name, manager_name)
         result = import("package.manager." .. manager_name .. ".find_package", {anonymous = true})(package_name, opt)
         if result then
             break
         end
+        manager_name = nil
     end
-    return result
+    return result, manager_name
 end
 
 -- find package 
@@ -107,7 +107,7 @@ function _find_package(manager_name, package_name, opt)
 
         -- find package with the builtin rule
         if not result and not builtin then
-            result = _find_package_with_builtin_rule(package_name, opt)
+            result, manager_name = _find_package_with_builtin_rule(package_name, opt)
         end
     end
 
@@ -120,7 +120,7 @@ function _find_package(manager_name, package_name, opt)
     end
 
     -- ok?
-    return result
+    return result, manager_name
 end
 
 -- find package using the package manager
@@ -154,11 +154,23 @@ function main(name, opt)
     opt.arch = opt.arch or config.get("arch") or os.arch()
     opt.mode = opt.mode or config.mode() or "release"
 
-    local manager_name, package_name, require_version = split_package_name(name)
+    -- get package manager name
+    local manager_name, package_name = unpack(name:split("::", {plain = true, strict = true}))
+    if package_name == nil then
+        package_name = manager_name
+        manager_name = nil
+    else
+        manager_name = manager_name:lower():trim()
+    end
+
+    -- get package name and require version
+    local require_version = nil
+    package_name, require_version = unpack(package_name:trim():split("%s"))
     opt.version = require_version or opt.version
 
     -- find package
-    result = _find_package(manager_name, package_name, opt)
+    local found_manager_name
+    result, found_manager_name = _find_package(manager_name, package_name, opt)
 
     -- match version?
     if opt.version and opt.version:find('.', 1, true) and result then
@@ -168,5 +180,5 @@ function main(name, opt)
     end
 
     -- ok?
-    return result, manager_name, package_name
+    return result, found_manager_name, package_name, manager_name
 end
diff --git a/xmake/modules/utils/split_package_name.lua b/xmake/modules/utils/split_package_name.lua
deleted file mode 100644
index 8ea1b28fd..000000000
--- a/xmake/modules/utils/split_package_name.lua
+++ /dev/null
@@ -1,52 +0,0 @@
---!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-2020, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        find_package.lua
---
-
--- split full package name into manager, package and version strings
---
--- @param name  the package name
---              e.g. zlib 1.12.x (try all), xmake::zlib 1.12.x, brew::zlib, brew::pcre/libpcre16, vcpkg::zlib, conan::OpenSSL/1.0.2n@conan/stable
---
--- @return      manager, package, version
---              e.g. "xmake", "zlib", "1.12.x"
---
--- @code
---
--- local manager, package, version = split_package_name("xmake::zlib 1.12.x")
---
--- @endcode
---
-
-function main(name)
-
-    -- get package manager name
-    local manager_name, package_name = unpack(name:split("::", {plain = true, strict = true}))
-    if package_name == nil then
-        package_name = manager_name
-        manager_name = nil
-    else
-        manager_name = manager_name:lower():trim()
-    end
-
-    -- get package name and require version
-    local require_version = nil
-    package_name, require_version = unpack(package_name:trim():split("%s"))
-
-    return manager_name, package_name, require_version
-end
\ No newline at end of file