Refactor modules support

tests/projects/c++/modules/aliased_headerunit/src/foo/hello.mpp

@@ -0,0 +1,12 @@
+module;
+#include <cstdio>
+
+export module hello;
+
+import "../header.hpp";
+
+export namespace hello {
+    void say(const char *arg) {
+        printf("%s: %s\n", FOO, arg);
+    }
+}

tests/projects/c++/modules/aliased_headerunit/src/header.hpp

@@ -0,0 +1,5 @@
+#pragma once
+
+namespace hello {
+    inline constexpr auto FOO = "Hello";
+}

tests/projects/c++/modules/aliased_headerunit/src/main.cpp

@@ -0,0 +1,7 @@
+import hello;
+import "header.hpp";
+
+int main() {
+    hello::say(hello::FOO);
+    return 0;
+}

tests/projects/c++/modules/aliased_headerunit/test.lua

@@ -0,0 +1 @@
+inherit(".test_headerunits")

tests/projects/c++/modules/aliased_headerunit/xmake.lua

@@ -0,0 +1,8 @@
+add_rules("mode.release", "mode.debug")
+set_languages("c++20")
+
+-- header.hpp should be built only one time
+target("aliased_headerunit")
+    set_kind("binary")
+    add_headerfiles("src/*.hpp")
+    add_files("src/*.cpp", "src/foo/*.mpp")

tests/projects/c++/modules/circular_dependency/src/hello.mpp

@@ -0,0 +1,13 @@
+export module hello;
+
+import hello3;
+
+export namespace hello {
+    class say {
+    public:
+        say(int data);
+        void hello();
+    private:
+        int data_;
+    };
+}

tests/projects/c++/modules/circular_dependency/src/hello2.mpp

@@ -0,0 +1,3 @@
+export module hello2;
+
+import hello;

tests/projects/c++/modules/circular_dependency/src/hello3.mpp

@@ -0,0 +1,3 @@
+export module hello3;
+
+import hello2;

tests/projects/c++/modules/circular_dependency/src/main.cpp

@@ -0,0 +1,7 @@
+import hello;
+
+int main() {
+    hello::say s(sizeof(hello::say));
+    s.hello();
+    return 0;
+}

tests/projects/c++/modules/circular_dependency/test.lua

@@ -0,0 +1,7 @@
+import(".test_base", {alias = "test_build"})
+
+function main(t)
+    if test_build.can_build() then
+        t:will_raise(test_build, "circular modules dependency detected")
+    end
+end

tests/projects/c++/modules/circular_dependency/xmake.lua

@@ -0,0 +1,8 @@
+add_rules("mode.release", "mode.debug")
+set_languages("c++20")
+
+target("circular_dependency")
+    set_kind("binary")
+    add_files("src/*.cpp", "src/*.mpp")
+
+

tests/projects/c++/modules/cpp_with_moduledeps/xmake.lua

@@ -3,7 +3,8 @@ set_languages("c++20")
 
 target("mod")
   set_kind("static")
-  add_files("src/mod.mpp", "src/mod.cpp")
+  add_files("src/mod.mpp", {public = true})
+  add_files("src/mod.cpp")
 
 target("cpp_with_moduledeps")
   set_kind("binary")

tests/projects/c++/modules/inline_and_template/src/main.cpp

@@ -1,12 +1,12 @@
+#include <iostream>
+
 import hello;
 import say;
 import foo;
 
-#include <iostream>
-
 int main() {
     hello::say_hello();
     say{}.hello<sizeof(say)>();
     std::cout << foo<int>{}.hello() << std::endl;
     return 0;
-}
+}

tests/projects/c++/modules/internal_partition/src/hello_internal.mpp

@@ -7,5 +7,5 @@ module hello:part_internal;
 namespace hello {
     void say_internal(const char *str) {
         printf("%s\n", str);
-    } 
-}
+    }
+}

tests/projects/c++/modules/link_order/xmake.lua

@@ -2,13 +2,11 @@ add_rules("mode.release", "mode.debug")
 set_languages("c++20")
 
 target("foo")
-    add_rules("c++")
-    set_kind("static")
+    set_kind("moduleonly")
     add_files("src/foo.mpp")
 
 target("bar")
-    add_rules("c++")
-    set_kind("static")
+    set_kind("moduleonly")
     add_files("src/bar.mpp")
 
 target("link_order_1")

tests/projects/c++/modules/staticlib_without_cpp/xmake.lua → tests/projects/c++/modules/moduleonly/xmake.lua

@@ -2,5 +2,5 @@ add_rules("mode.release", "mode.debug")
 set_languages("c++20")
 
 target("mod")
-    set_kind("static")
+    set_kind("moduleonly")
     add_files("src/mod.mpp")

tests/projects/c++/modules/packages/my-repo/packages/b/bar/src/bar.cpp

@@ -1,5 +1,5 @@
-module bar;
+#include <a.hpp>
 
-const char *bar() {
+const char *hello() {
     return "Hello world";
-}
+}

tests/projects/c++/modules/packages/my-repo/packages/b/bar/src/bar.mpp

@@ -1,3 +1,12 @@
+module;
+
+#include <a.hpp>
+
 export module bar;
 
-export const char *bar();
+export namespace bar {
+const char *hello() {
+     return ::hello();
+}
+}
+

tests/projects/c++/modules/packages/my-repo/packages/b/bar/src/include/a.hpp

@@ -0,0 +1,6 @@
+#ifndef A_HPP
+#define A_HPP
+
+[[gnu::visibility("default")]] const char *hello();
+
+#endif

tests/projects/c++/modules/packages/my-repo/packages/b/bar/src/xmake.lua

@@ -3,5 +3,7 @@ set_languages("c++20")
 
 target("bar")
     set_kind("static")
+    add_headerfiles("include/(**.hpp)")
+    add_includedirs("include")
     add_files("*.cpp")
-    add_files("*.mpp", { install = true })
+    add_files("*.mpp", { public = true })

tests/projects/c++/modules/packages/my-repo/packages/b/bar/xmake.lua

@@ -3,4 +3,4 @@ package("bar")
 
     on_install(function(package)
         import("package.tools.xmake").install(package, {})
-    end)
+    end)

tests/projects/c++/modules/packages/my-repo/packages/b/bar2/src/bar.mpp

@@ -0,0 +1,8 @@
+export module bar2;
+
+export namespace bar {
+    const char *hello2() {
+        return "Hello world";
+    }
+}
+

tests/projects/c++/modules/packages/my-repo/packages/b/bar2/src/xmake.lua

@@ -0,0 +1,6 @@
+add_rules("mode.release", "mode.debug")
+set_languages("c++20")
+
+target("bar2")
+    set_kind("moduleonly")
+    add_files("*.mpp")

tests/projects/c++/modules/packages/my-repo/packages/b/bar2/xmake.lua

@@ -0,0 +1,7 @@
+package("bar2")
+    set_kind("library")
+    set_sourcedir(path.join(os.scriptdir(), "src"))
+
+    on_install(function(package)
+        import("package.tools.xmake").install(package, {})
+    end)

tests/projects/c++/modules/packages/my-repo/packages/f/foo/src/foo.mpp

@@ -1,5 +1,7 @@
 export module foo;
 
 export namespace foo {
+  #ifdef FOO_EXPORT
     void say(const char *);
-}
+  #endif
+}

tests/projects/c++/modules/packages/my-repo/packages/f/foo/src/xmake.lua

@@ -4,4 +4,4 @@ set_languages("c++20")
 target("foo")
     set_kind("static")
     add_files("*.cpp")
-    add_files("*.mpp", { install = true })
+    add_files("*.mpp", {defines = "FOO_EXPORT", public = true})

tests/projects/c++/modules/packages/src/main.cpp

@@ -1,7 +1,9 @@
 import foo;
 import bar;
+import bar2;
 
 int main() {
-    foo::say(bar());
+    foo::say(bar::hello());
+    foo::say(bar::hello2());
     return 0;
 }

tests/projects/c++/modules/packages/xmake.lua

@@ -1,11 +1,11 @@
 add_rules("mode.release", "mode.debug")
-set_languages("c++20")
+set_languages("c++2b")
 
 add_repositories("my-repo my-repo")
-add_requires("foo", "bar")
+add_requires("foo", "bar", "bar2")
 
 target("packages")
     set_kind("binary")
     add_files("src/*.cpp")
-    add_packages("foo", "bar")
+    add_packages("foo", "bar", "bar2")
     set_policy("build.c++.modules", true)

tests/projects/c++/modules/private_module/src/use.cpp

@@ -0,0 +1,8 @@
+module use;
+
+import dep1;
+import dep2;
+
+int lib() {
+    return m() + i();
+}

tests/projects/c++/modules/private_module/src/use.mpp

@@ -1,6 +1,3 @@
-import dep1;
-import dep2;
+export module use;
 
-int lib() {
-    return m() + i();
-}
+export int lib();

tests/projects/c++/modules/private_module/xmake.lua

@@ -5,3 +5,4 @@ target("private_module")
     add_rules("c++")
     set_kind("$(kind)")
     add_files("src/*.mpp")
+    add_files("src/*.cpp")

tests/projects/c++/modules/staticlib/xmake.lua

@@ -3,7 +3,8 @@ set_languages("c++20")
 
 target("mod")
     set_kind("static")
-    add_files("src/mod.mpp", "src/mod.cpp")
+    add_files("src/mod.mpp", {public = true})
+    add_files("src/mod.cpp")
 
 target("hello")
     set_kind("binary")

tests/projects/c++/modules/stdmodules/src/my_module.cpp

@@ -2,4 +2,4 @@ module my_module;
 
 import std;
 
-auto my_sum(size_t a, size_t b) -> size_t { return a + b; }
+auto my_sum(std::size_t a, std::size_t b) -> std::size_t { return a + b; }

tests/projects/c++/modules/stdmodules/src/my_module.mpp

@@ -2,4 +2,4 @@ export module my_module;
 
 import std;
 
-export auto my_sum(size_t a, size_t b) -> size_t;
+export auto my_sum(std::size_t a, std::size_t b) -> std::size_t;

tests/projects/c++/modules/stdmodules/xmake.lua

@@ -3,11 +3,10 @@ set_languages("c++latest")
 
 target("mod")
     set_kind("static")
-    add_files("src/*.cpp", "src/*.mpp")
-    set_policy("build.c++.clang.stdmodules", true)
+    add_files("src/*.cpp")
+    add_files("src/*.mpp", {public = true})
 
 target("stdmodules")
     set_kind("binary")
     add_files("test/*.cpp")
     add_deps("mod")
-    set_policy("build.c++.clang.stdmodules", true)

tests/projects/c++/modules/stdmodules_cpp_only/xmake.lua

@@ -6,5 +6,4 @@ target("stdmodules_cpp_only")
     set_kind("binary")
     add_files("src/*.cpp")
     set_policy("build.c++.modules", true)
-    set_policy("build.c++.clang.stdmodules", true)
 

tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua

@@ -5,10 +5,6 @@ target("mod")
     set_kind("static")
     add_files("src/*.cpp", "src/*.mpp")
 
-    set_policy("build.c++.clang.stdmodules", true)
-
 target("mod2")
     set_kind("static")
     add_files("src/*.cpp", "src/*.mpp")
-
-    set_policy("build.c++.clang.stdmodules", true)