improve log output of find_package

Now find_package will log the package manager of any found package that
did not specify which package manager to search.

3 files changed, 68 insertions, 16 deletions

diff --git a/xmake/modules/lib/detect/find_package.lua b/xmake/modules/lib/detect/find_package.lua
index a52c894f2..eaeb01530 100644
--- a/xmake/modules/lib/detect/find_package.lua
+++ b/xmake/modules/lib/detect/find_package.lua
@@ -23,6 +23,7 @@ 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
 --
@@ -74,7 +75,8 @@ function main(name, opt)
     end
 
     -- find package
-    result = find_package(name, opt)
+    local manager_name, package_name
+    result, manager_name, package_name = find_package(name, opt)
 
     -- cache result
     cacheinfo[name] = result and result or false
@@ -83,7 +85,13 @@ function main(name, opt)
     -- trace
     if opt.verbose or option.get("verbose") then
         if result then
-            cprint("checking for %s ... ${color.success}using %s %s", name, name, result.version and result.version or "")
+            -- 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 "")
         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 eed29f420..db0bd4788 100644
--- a/xmake/modules/package/manager/find_package.lua
+++ b/xmake/modules/package/manager/find_package.lua
@@ -22,6 +22,7 @@
 import("core.base.semver")
 import("core.base.option")
 import("core.project.config")
+import("utils.split_package_name")
 
 -- find package with the builtin rule
 --
@@ -131,7 +132,8 @@ end
 --                     linkdirs = {"/usr/lib"}, includedirs = "/usr/include", links = {"ssl"}, includes = {"ssl.h"}
 --                     packagedirs = {"/tmp/packages"}, system = true}
 --
--- @return      {links = {"ssl", "crypto", "z"}, linkdirs = {"/usr/local/lib"}, includedirs = {"/usr/local/include"}}
+-- @return      {links = {"ssl", "crypto", "z"}, linkdirs = {"/usr/local/lib"}, includedirs = {"/usr/local/include"}},
+--              manager_name, package_name
 --
 -- @code 
 --
@@ -140,6 +142,7 @@ end
 -- local package = find_package("openssl", {plat = "iphoneos"})
 -- local package = find_package("openssl", {linkdirs = {"/usr/lib", "/usr/local/lib"}, includedirs = "/usr/local/include", version = "1.0.1"})
 -- local package = find_package("openssl", {linkdirs = {"/usr/lib", "/usr/local/lib", links = {"ssl", "crypto"}, includes = {"ssl.h"}})
+-- local package, manager_name, package_name = find_package("openssl")
 -- 
 -- @endcode
 --
@@ -151,18 +154,7 @@ function main(name, opt)
     opt.arch = opt.arch or config.get("arch") or os.arch()
     opt.mode = opt.mode or config.mode() or "release"
 
-    -- 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"))
+    local manager_name, package_name, require_version = split_package_name(name)
     opt.version = require_version or opt.version
 
     -- find package
@@ -176,5 +168,5 @@ function main(name, opt)
     end
 
     -- ok?
-    return result
+    return result, manager_name, package_name
 end
diff --git a/xmake/modules/utils/split_package_name.lua b/xmake/modules/utils/split_package_name.lua
new file mode 100644
index 000000000..8ea1b28fd
--- /dev/null
+++ b/xmake/modules/utils/split_package_name.lua
@@ -0,0 +1,52 @@
+--!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