fix xmake clean for packages

3 files changed, 66 insertions, 5 deletions

diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 8b4098ca5..4052f5b3f 100644
--- a/xmake/actions/config/main.lua
+++ b/xmake/actions/config/main.lua
@@ -31,7 +31,8 @@ import("scangen")
 import("menuconf", {alias = "menuconf_show"})
 import("configfiles", {alias = "generate_configfiles"})
 import("configheader", {alias = "generate_configheader"})
-import("private.action.require.install", {alias = "install_requires"})
+import("private.action.require.check", {alias = "check_packages"})
+import("private.action.require.install", {alias = "install_packages"})
 
 -- filter option
 function _option_filter(name)
@@ -333,10 +334,14 @@ force to build in current directory via run `xmake -P .`]], os.projectdir())
     -- only config for building project using third-party buildsystem
     if not trybuild then
 
-        -- install and update requires
+        -- install and update packages
         local require_enable = option.boolean(option.get("require"))
-        if (recheck or require_enable) and require_enable ~= false then
-            install_requires()
+        if (recheck or require_enable) then
+            if require_enable ~= false then
+                install_packages()
+            else
+                check_packages()
+            end
         end
 
         -- check target and ensure to load all targets, @note we must load targets after installing required packages,
diff --git a/xmake/modules/private/action/require/check.lua b/xmake/modules/private/action/require/check.lua
new file mode 100644
index 000000000..5d7dc103c
--- /dev/null
+++ b/xmake/modules/private/action/require/check.lua
@@ -0,0 +1,56 @@
+--!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        check.lua
+--
+
+-- imports
+import("core.base.option")
+import("private.async.runjobs")
+import("private.action.require.impl.package")
+import("private.action.require.impl.register_packages")
+import("private.action.require.impl.utils.get_requires")
+
+-- install packages
+function main(requires_raw)
+
+    -- get requires and extra config
+    local requires_extra = nil
+    local requires, requires_extra = get_requires(requires_raw)
+    if not requires or #requires == 0 then
+        return
+    end
+
+    -- install packages
+    local packages = package.load_packages(requires, {requires_extra = requires_extra})
+    if packages then
+
+        -- fetch and register packages (with system) from local first
+        runjobs("fetch_packages", function (index)
+            local instance = packages[index]
+            if instance and (not option.get("force") or (option.get("shallow") and not instance:is_toplevel())) then
+                instance:envs_enter()
+                instance:fetch()
+                instance:envs_leave()
+            end
+        end, {total = #packages})
+
+        -- register all required root packages to local cache
+        register_packages(packages)
+    end
+end
+
diff --git a/xmake/modules/private/action/require/install.lua b/xmake/modules/private/action/require/install.lua
index 3728cf1e7..821991dee 100644
--- a/xmake/modules/private/action/require/install.lua
+++ b/xmake/modules/private/action/require/install.lua
@@ -15,7 +15,7 @@
 -- Copyright (C) 2015-present, TBOOX Open Source Group.
 --
 -- @author      ruki
--- @file        package.lua
+-- @file        install.lua
 --
 
 -- imports