add submodule clean

4 files changed, 159 insertions, 0 deletions

diff --git a/xmake/modules/devel/git/submodule/clean.lua b/xmake/modules/devel/git/submodule/clean.lua
new file mode 100644
index 000000000..e21e2c6f1
--- /dev/null
+++ b/xmake/modules/devel/git/submodule/clean.lua
@@ -0,0 +1,66 @@
+--!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        clean.lua
+--
+
+-- imports
+import("core.base.option")
+import("lib.detect.find_tool")
+
+-- clean files
+--
+-- @param opt   the argument options
+--
+-- @code
+--
+-- import("devel.git")
+--
+-- git.clean()
+-- git.clean({repodir = "/tmp/xmake", force = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+
+    -- find git
+    local git = assert(find_tool("git"), "git not found!")
+
+    -- init argv
+    local argv = {"submodule", "foreach", "--recursive", "git", "clean", "-d"}
+
+    -- verbose?
+    if not option.get("verbose") then
+        table.insert(argv, "-q")
+    end
+
+    -- force?
+    if opt.force then
+        table.insert(argv, "-f")
+    end
+
+    -- remove all files and does not use the standard ignore rules
+    if opt.all then
+        table.insert(argv, "-x")
+    end
+
+    -- clean it
+    os.vrunv(git.program, argv, {curdir = opt.repodir})
+end
diff --git a/xmake/modules/devel/git/submodule/reset.lua b/xmake/modules/devel/git/submodule/reset.lua
new file mode 100644
index 000000000..f9dd01753
--- /dev/null
+++ b/xmake/modules/devel/git/submodule/reset.lua
@@ -0,0 +1,76 @@
+--!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        reset.lua
+--
+
+-- imports
+import("core.base.option")
+import("lib.detect.find_tool")
+
+-- reset files
+--
+-- @param opt   the argument options
+--
+-- @code
+--
+-- import("devel.git")
+--
+-- git.reset()
+-- git.reset({repodir = "/tmp/xmake", force = true})
+--
+-- @endcode
+--
+function main(opt)
+
+    -- init options
+    opt = opt or {}
+
+    -- find git
+    local git = assert(find_tool("git"), "git not found!")
+
+    -- init argv
+    local argv = {"submodule", "foreach", "--recursive", "git", "reset"}
+
+    -- verbose?
+    if not option.get("verbose") then
+        table.insert(argv, "-q")
+    end
+
+    -- hard?
+    if opt.hard then
+        table.insert(argv, "--hard")
+    end
+
+    -- soft?
+    if opt.soft then
+        table.insert(argv, "--soft")
+    end
+
+    -- keep?
+    if opt.keep then
+        table.insert(argv, "--keep")
+    end
+
+    -- reset to the given commit
+    if opt.commit then
+        table.insert(argv, opt.commit)
+    end
+
+    -- reset it
+    os.vrunv(git.program, argv, {curdir = opt.repodir})
+end
diff --git a/xmake/modules/private/action/require/impl/actions/download.lua b/xmake/modules/private/action/require/impl/actions/download.lua
index 2275c96f7..d5889ea9c 100644
--- a/xmake/modules/private/action/require/impl/actions/download.lua
+++ b/xmake/modules/private/action/require/impl/actions/download.lua
@@ -45,6 +45,11 @@ function _checkout(package, url, sourcedir, url_alias)
         git.clean({repodir = packagedir, force = true, all = true})
         -- reset the previous modified files
         git.reset({repodir = packagedir, hard = true})
+        -- clean and reset submodules
+        if os.isfile(path.join(packagedir, ".gitmodules")) then
+            git.submodule.clean({repodir = packagedir, force = true, all = true})
+            git.submodule.reset({repodir = packagedir, hard = true})
+        end
         tty.erase_line_to_start().cr()
         return
     end
@@ -54,6 +59,10 @@ function _checkout(package, url, sourcedir, url_alias)
     if localdir and os.isdir(localdir) then
         git.clean({repodir = localdir, force = true, all = true})
         git.reset({repodir = localdir, hard = true})
+        if os.isfile(path.join(localdir, ".gitmodules")) then
+            git.submodule.clean({repodir = localdir, force = true, all = true})
+            git.submodule.reset({repodir = localdir, hard = true})
+        end
         os.cp(localdir, packagedir)
         tty.erase_line_to_start().cr()
         return
diff --git a/xmake/modules/private/action/require/impl/actions/download_resources.lua b/xmake/modules/private/action/require/impl/actions/download_resources.lua
index c6af29151..771a733e4 100644
--- a/xmake/modules/private/action/require/impl/actions/download_resources.lua
+++ b/xmake/modules/private/action/require/impl/actions/download_resources.lua
@@ -44,6 +44,10 @@ function _checkout(package, resource_name, resource_url, resource_revision)
         git.clean({repodir = resourcedir, force = true, all = true})
         -- reset the previous modified files
         git.reset({repodir = resourcedir, hard = true})
+        if os.isfile(path.join(resourcedir, ".gitmodules")) then
+            git.submodule.clean({repodir = resourcedir, force = true, all = true})
+            git.submodule.reset({repodir = resourcedir, hard = true})
+        end
         return
     end
 
@@ -52,6 +56,10 @@ function _checkout(package, resource_name, resource_url, resource_revision)
     if localdir and os.isdir(localdir) then
         git.clean({repodir = localdir, force = true, all = true})
         git.reset({repodir = localdir, hard = true})
+        if os.isfile(path.join(localdir, ".gitmodules")) then
+            git.submodule.clean({repodir = localdir, force = true, all = true})
+            git.submodule.reset({repodir = localdir, hard = true})
+        end
         os.cp(localdir, resourcedir)
         return
     end