diff options
Diffstat (limited to 'xmake/modules')
8 files changed, 16 insertions, 12 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index ba3592a32..548b00e40 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -452,7 +452,7 @@ function buildenvs(package, opt) local CMAKE_INCLUDE_PATH = {} local CMAKE_PREFIX_PATH = {} for _, dep in ipairs(package:orderdeps()) do - if dep:isSys() then + if dep:is_system() then local fetchinfo = dep:fetch() if fetchinfo then table.join2(CMAKE_LIBRARY_PATH, fetchinfo.linkdirs) diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index e280d0cec..91cee4ba3 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -146,7 +146,7 @@ function main(package) -- install the third-party package directly, e.g. brew::pcre2/libpcre2-8, conan::OpenSSL/1.0.2n@conan/stable local installed_now = false - if package:is3rd() then + if package:is_thirdparty() then local script = package:script("install") if script ~= nil then filter.call(script, package) diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua index 036f2ac2d..d89f83e05 100644 --- a/xmake/modules/private/action/require/impl/install_packages.lua +++ b/xmake/modules/private/action/require/impl/install_packages.lua @@ -105,8 +105,8 @@ function _get_confirm(packages) local packages_group = {} for _, instance in ipairs(packages) do -- achive packages by repository - local reponame = instance:repo() and instance:repo():name() or (instance:isSys() and "system" or "") - if instance:is3rd() then + local reponame = instance:repo() and instance:repo():name() or (instance:is_system() and "system" or "") + if instance:is_thirdparty() then reponame = instance:name():lower():split("::")[1] end packages_repo[reponame] = packages_repo[reponame] or {} diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 3095e10a9..c088bef4c 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -587,6 +587,10 @@ function should_install(package) if package:exists() then return false end + -- we need not install it if this package need only be fetched + if package:is_fetchonly() then + return false + end if package:parents() then -- if all the packages that depend on it already exist, then there is no need to install it for _, parent in pairs(package:parents()) do diff --git a/xmake/modules/private/action/require/impl/register_packages.lua b/xmake/modules/private/action/require/impl/register_packages.lua index 21716bc3f..485da8770 100644 --- a/xmake/modules/private/action/require/impl/register_packages.lua +++ b/xmake/modules/private/action/require/impl/register_packages.lua @@ -68,7 +68,7 @@ end -- register the base info of required package function _register_required_package_base(instance, required_package) - if not instance:isSys() and not instance:is3rd() then + if not instance:is_system() and not instance:is_thirdparty() then required_package:set("__installdir", instance:installdir()) end end diff --git a/xmake/modules/private/action/require/info.lua b/xmake/modules/private/action/require/info.lua index 37d4eb6a3..1c5977134 100644 --- a/xmake/modules/private/action/require/info.lua +++ b/xmake/modules/private/action/require/info.lua @@ -37,9 +37,9 @@ import("private.action.require.impl.utils.get_requires") function _from(instance) local fetchinfo = instance:fetch() if fetchinfo then - if instance:is3rd() then + if instance:is_thirdparty() then return ", ${green}3rd${clear}" - elseif instance:isSys() then + elseif instance:is_system() then return ", ${green}system${clear}" else return "" @@ -48,7 +48,7 @@ function _from(instance) local repo = instance:repo() local reponame = repo and repo:name() or "unknown" return instance:supported() and format(", ${yellow}remote${clear}(in %s)", reponame) or format(", ${yellow}remote${clear}(${red}unsupported${clear} in %s)", reponame) - elseif instance:isSys() then + elseif instance:is_system() then return ", ${red}missing${clear}" else return "" diff --git a/xmake/modules/private/action/require/list.lua b/xmake/modules/private/action/require/list.lua index 2a165111b..95a4158ba 100644 --- a/xmake/modules/private/action/require/list.lua +++ b/xmake/modules/private/action/require/list.lua @@ -29,16 +29,16 @@ import("private.action.require.impl.environment") function _from(instance) local fetchinfo = instance:fetch() if fetchinfo then - if instance:is3rd() then + if instance:is_thirdparty() then return ", ${green}3rd${clear}" - elseif instance:isSys() then + elseif instance:is_system() then return ", ${green}system${clear}" else return "" end elseif #instance:urls() > 0 then return instance:supported() and format(", ${yellow}remote${clear}(in %s)", instance:repo():name()) or format(", ${yellow}remote${clear}(${red}unsupported${clear} in %s)", instance:repo():name()) - elseif instance:isSys() then + elseif instance:is_system() then return ", ${red}missing${clear}" else return "" diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua index cc49534c7..46fe2cbe7 100644 --- a/xmake/modules/private/xrepo/action/env.lua +++ b/xmake/modules/private/xrepo/action/env.lua @@ -166,7 +166,7 @@ end function _package_addenvs(envs, instance) -- only for xmake::package - if instance:isSys() then + if instance:is_system() then return end |