(C++ modules) simplify module support directory tree

17 files changed, 16 insertions, 16 deletions

diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
index 3de17be4a..06b7086aa 100644
--- a/xmake/modules/core/tools/gcc.lua
+++ b/xmake/modules/core/tools/gcc.lua
@@ -31,7 +31,7 @@ import("core.language.language")
 import("utils.progress")
 import("private.cache.build_cache")
 import("private.service.distcc_build.client", {alias = "distcc_build_client"})
-import("rules.c++.modules.modules_support.compiler_support", {rootdir = os.programdir()})
+import("rules.c++.modules.compiler_support", {rootdir = os.programdir()})
 
 function init(self)
 
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
index 9d2fc453a..fee24a6c4 100644
--- a/xmake/plugins/project/cmake/cmakelists.lua
+++ b/xmake/plugins/project/cmake/cmakelists.lua
@@ -31,7 +31,7 @@ import("lib.detect.find_tool")
 import("private.utils.batchcmds")
 import("private.utils.target", {alias = "target_utils"})
 import("plugins.project.utils.target_cmds", {rootdir = os.programdir()})
-import("rules.c++.modules.modules_support.compiler_support", {alias = "module_compiler_support", rootdir = os.programdir()})
+import("rules.c++.modules.compiler_support", {alias = "module_compiler_support", rootdir = os.programdir()})
 
 -- get cmake version
 function _get_cmake_version()
diff --git a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
index 9b0846930..188ff37e1 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x_vcxproj.lua
@@ -30,7 +30,7 @@ import("detect.sdks.find_cuda")
 import("vsfile")
 import("vsutils")
 import("private.utils.toolchain", {alias = "toolchain_utils"})
-import("rules.c++.modules.modules_support.compiler_support", {rootdir = os.programdir()})
+import("rules.c++.modules.compiler_support", {rootdir = os.programdir()})
 
 function _make_dirs(dir, vcxprojdir)
     dir = dir:trim()
diff --git a/xmake/rules/c++/modules/modules_support/builder.lua b/xmake/rules/c++/modules/builder.lua
index a02e1e7d3..a02e1e7d3 100644
--- a/xmake/rules/c++/modules/modules_support/builder.lua
+++ b/xmake/rules/c++/modules/builder.lua
diff --git a/xmake/rules/c++/modules/modules_support/clang/builder.lua b/xmake/rules/c++/modules/clang/builder.lua
index 420d1f0ee..420d1f0ee 100644
--- a/xmake/rules/c++/modules/modules_support/clang/builder.lua
+++ b/xmake/rules/c++/modules/clang/builder.lua
diff --git a/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua b/xmake/rules/c++/modules/clang/compiler_support.lua
index 6eb4f84b1..6eb4f84b1 100644
--- a/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua
+++ b/xmake/rules/c++/modules/clang/compiler_support.lua
diff --git a/xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua b/xmake/rules/c++/modules/clang/dependency_scanner.lua
index 715e8a07d..715e8a07d 100644
--- a/xmake/rules/c++/modules/modules_support/clang/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/clang/dependency_scanner.lua
diff --git a/xmake/rules/c++/modules/modules_support/compiler_support.lua b/xmake/rules/c++/modules/compiler_support.lua
index fea294ad8..fea294ad8 100644
--- a/xmake/rules/c++/modules/modules_support/compiler_support.lua
+++ b/xmake/rules/c++/modules/compiler_support.lua
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/dependency_scanner.lua
index 94b8a4804..94b8a4804 100644
--- a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/dependency_scanner.lua
diff --git a/xmake/rules/c++/modules/modules_support/gcc/builder.lua b/xmake/rules/c++/modules/gcc/builder.lua
index 1f909623f..1f909623f 100644
--- a/xmake/rules/c++/modules/modules_support/gcc/builder.lua
+++ b/xmake/rules/c++/modules/gcc/builder.lua
diff --git a/xmake/rules/c++/modules/modules_support/gcc/compiler_support.lua b/xmake/rules/c++/modules/gcc/compiler_support.lua
index 72de29081..72de29081 100644
--- a/xmake/rules/c++/modules/modules_support/gcc/compiler_support.lua
+++ b/xmake/rules/c++/modules/gcc/compiler_support.lua
diff --git a/xmake/rules/c++/modules/modules_support/gcc/dependency_scanner.lua b/xmake/rules/c++/modules/gcc/dependency_scanner.lua
index e087c6d4e..e087c6d4e 100644
--- a/xmake/rules/c++/modules/modules_support/gcc/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/gcc/dependency_scanner.lua
diff --git a/xmake/rules/c++/modules/modules_support/msvc/builder.lua b/xmake/rules/c++/modules/msvc/builder.lua
index 8f582438b..8f582438b 100644
--- a/xmake/rules/c++/modules/modules_support/msvc/builder.lua
+++ b/xmake/rules/c++/modules/msvc/builder.lua
diff --git a/xmake/rules/c++/modules/modules_support/msvc/compiler_support.lua b/xmake/rules/c++/modules/msvc/compiler_support.lua
index ca9e8053d..ca9e8053d 100644
--- a/xmake/rules/c++/modules/modules_support/msvc/compiler_support.lua
+++ b/xmake/rules/c++/modules/msvc/compiler_support.lua
diff --git a/xmake/rules/c++/modules/modules_support/msvc/dependency_scanner.lua b/xmake/rules/c++/modules/msvc/dependency_scanner.lua
index 044510fab..044510fab 100644
--- a/xmake/rules/c++/modules/modules_support/msvc/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/msvc/dependency_scanner.lua
diff --git a/xmake/rules/c++/modules/modules_support/stl_headers.lua b/xmake/rules/c++/modules/stl_headers.lua
index 4b2d6ed23..4b2d6ed23 100644
--- a/xmake/rules/c++/modules/modules_support/stl_headers.lua
+++ b/xmake/rules/c++/modules/stl_headers.lua
diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
index a27633182..8da14a58b 100644
--- a/xmake/rules/c++/modules/xmake.lua
+++ b/xmake/rules/c++/modules/xmake.lua
@@ -28,7 +28,7 @@ rule("c++.build.modules")
     add_deps("c++.build.modules.install")
 
     on_config(function (target)
-        import("modules_support.compiler_support")
+        import("compiler_support")
 
         -- we disable to build across targets in parallel, because the source files may depend on other target modules
         -- @see https://github.com/xmake-io/xmake/issues/1858
@@ -73,8 +73,8 @@ rule("c++.build.modules.builder")
     -- generate module dependencies
     on_prepare_files(function (target, jobgraph, sourcebatch, opt)
         if target:data("cxx.has_modules") then
-            import("modules_support.builder")
-            import("modules_support.dependency_scanner")
+            import("builder")
+            import("dependency_scanner")
 
             -- patch sourcebatch
             builder.patch_sourcebatch(target, sourcebatch)
@@ -87,9 +87,9 @@ rule("c++.build.modules.builder")
     -- parallel build support to accelerate `xmake build` to build modules
     before_build_files(function(target, jobgraph, sourcebatch, opt)
         if target:data("cxx.has_modules") then
-            import("modules_support.compiler_support")
-            import("modules_support.dependency_scanner")
-            import("modules_support.builder")
+            import("compiler_support")
+            import("dependency_scanner")
+            import("builder")
 
             -- get module dependencies
             local modules = dependency_scanner.get_module_dependencies(target, sourcebatch)
@@ -116,9 +116,9 @@ rule("c++.build.modules.builder")
     -- serial compilation only, usually used to support project generator
     before_buildcmd_files(function(target, batchcmds, sourcebatch, opt)
         if target:data("cxx.has_modules") then
-            import("modules_support.compiler_support")
-            import("modules_support.dependency_scanner")
-            import("modules_support.builder")
+            import("compiler_support")
+            import("dependency_scanner")
+            import("builder")
 
             -- get module dependencies
             local modules = dependency_scanner.get_module_dependencies(target, sourcebatch)
@@ -146,7 +146,7 @@ rule("c++.build.modules.builder")
 
     after_clean(function (target)
         import("core.base.option")
-        import("modules_support.compiler_support")
+        import("compiler_support")
         import("private.action.clean.remove_files")
 
         -- we cannot use target:data("cxx.has_modules"),
@@ -166,8 +166,8 @@ rule("c++.build.modules.install")
     set_extensions(".mpp", ".mxx", ".cppm", ".ixx")
 
     before_install(function (target)
-        import("modules_support.compiler_support")
-        import("modules_support.builder")
+        import("compiler_support")
+        import("builder")
 
         -- we cannot use target:data("cxx.has_modules"),
         -- because on_config will be not called when installing targets
@@ -180,7 +180,7 @@ rule("c++.build.modules.install")
     end)
 
     before_uninstall(function (target)
-        import("modules_support.compiler_support")
+        import("compiler_support")
         if compiler_support.contains_modules(target) then
             compiler_support.add_installfiles_for_modules(target)
         end