summaryrefslogtreecommitdiff
path: root/xmake
diff options
context:
space:
mode:
authorruki <[email protected]>2023-02-24 00:38:44 +0800
committerruki <[email protected]>2023-02-24 00:38:44 +0800
commitaa7a5c718a95ccf01f5f439c11a2e8b116d0c19f (patch)
tree7e597e39731a543db70fd371610fd69fe006b766 /xmake
parente944c049ca7a8b380ac0754a053026d476020901 (diff)
improve to show searchnames
Diffstat (limited to 'xmake')
-rw-r--r--xmake/core/package/package.lua2
-rw-r--r--xmake/modules/private/action/require/impl/install_packages.lua2
-rw-r--r--xmake/modules/private/action/require/info.lua14
3 files changed, 14 insertions, 4 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua
index a189905f6..28a130405 100644
--- a/xmake/core/package/package.lua
+++ b/xmake/core/package/package.lua
@@ -346,7 +346,7 @@ function _instance:is_precompiled()
end
-- fallback to source code build
-function _instance:fackback_build()
+function _instance:fallback_build()
if self:is_precompiled() then
local artifacts_backup = self._ARTIFACTS_BACKUP
if artifacts_backup then
diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua
index 3e608f671..ab5b937ab 100644
--- a/xmake/modules/private/action/require/impl/install_packages.lua
+++ b/xmake/modules/private/action/require/impl/install_packages.lua
@@ -479,7 +479,7 @@ function _install_packages(packages_install, packages_download, installdeps)
if not action_install(instance) then
assert(instance:is_precompiled(), "package(%s) should be precompiled", instance:name())
-- we need disable built and re-download and re-install it
- instance:fackback_build()
+ instance:fallback_build()
action_download(instance)
action_install(instance)
end
diff --git a/xmake/modules/private/action/require/info.lua b/xmake/modules/private/action/require/info.lua
index 42c3ad9c5..7eaf89722 100644
--- a/xmake/modules/private/action/require/info.lua
+++ b/xmake/modules/private/action/require/info.lua
@@ -111,6 +111,13 @@ function main(requires_raw)
-- show urls
local urls = instance:urls()
+ if instance:is_precompiled() then
+ instance:fallback_build()
+ local urls_raw = instance:urls()
+ if urls_raw then
+ urls = table.join(urls, urls_raw)
+ end
+ end
if urls and #urls > 0 then
cprint(" -> ${color.dump.string_quote}urls${clear}:")
for _, url in ipairs(urls) do
@@ -152,7 +159,7 @@ function main(requires_raw)
-- show search directories and search names
cprint(" -> ${color.dump.string_quote}searchdirs${clear}: %s", table.concat(table.wrap(core_package.searchdirs()), path.envsep()))
local searchnames = hashset.new()
- for _, url in ipairs(instance:urls()) do
+ for _, url in ipairs(urls) do
url = filter.handle(url, instance)
if git.checkurl(url) then
searchnames:insert(instance:name() .. archive.extension(url))
@@ -171,7 +178,10 @@ function main(requires_raw)
end
end
end
- cprint(" -> ${color.dump.string_quote}searchnames${clear}: %s", table.concat(searchnames:to_array(), ", "))
+ cprint(" -> ${color.dump.string_quote}searchnames${clear}:")
+ for _, searchname in searchnames:keys() do
+ cprint(" -> %s", searchname)
+ end
-- show fetch info
cprint(" -> ${color.dump.string_quote}fetchinfo${clear}: %s", _info(instance))