Merge pull request #5376 from Arthapz/fix-module-objectfiles-handling

Improve module objectfiles handling and moduleonly package

5 files changed, 110 insertions, 0 deletions

diff --git a/tests/projects/c++/modules/duplicate_name_detection/src/bar.mpp b/tests/projects/c++/modules/duplicate_name_detection/src/bar.mpp
new file mode 100644
index 000000000..a51969b8f
--- /dev/null
+++ b/tests/projects/c++/modules/duplicate_name_detection/src/bar.mpp
@@ -0,0 +1,5 @@
+export module foo;
+
+export int value() {
+    return 1;
+}
diff --git a/tests/projects/c++/modules/duplicate_name_detection/src/foo.mpp b/tests/projects/c++/modules/duplicate_name_detection/src/foo.mpp
new file mode 100644
index 000000000..d97e5f085
--- /dev/null
+++ b/tests/projects/c++/modules/duplicate_name_detection/src/foo.mpp
@@ -0,0 +1,5 @@
+export module foo;
+
+export int value() {
+    return 0;
+}
diff --git a/tests/projects/c++/modules/duplicate_name_detection/src/main.cpp b/tests/projects/c++/modules/duplicate_name_detection/src/main.cpp
new file mode 100644
index 000000000..50ddf1fdd
--- /dev/null
+++ b/tests/projects/c++/modules/duplicate_name_detection/src/main.cpp
@@ -0,0 +1,5 @@
+import foo;
+
+int main() {
+    return value();
+}
diff --git a/tests/projects/c++/modules/duplicate_name_detection/test.lua b/tests/projects/c++/modules/duplicate_name_detection/test.lua
new file mode 100644
index 000000000..53033dd7f
--- /dev/null
+++ b/tests/projects/c++/modules/duplicate_name_detection/test.lua
@@ -0,0 +1,75 @@
+import("lib.detect.find_tool")
+import("core.base.semver")
+import("utils.ci.is_running", {alias = "ci_is_running"})
+
+function _build()
+    try {
+        function() 
+            if ci_is_running() then
+                os.run("xmake -rvD")
+            else
+                os.run("xmake -r")
+            end
+        end,
+        catch {
+            function (errors)
+                errors = tostring(errors)
+                if not errors:find("duplicate module name detected", 1, true) then
+                    raise("Modules duplicate name detection does not work\n%s", errors)
+                end
+            end
+        }
+    }
+end
+
+function can_build()
+    if is_subhost("windows") then
+        return true
+    elseif is_subhost("msys") then
+        return true
+    elseif is_host("linux") then
+        local gcc = find_tool("gcc", {version = true})
+        if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then
+            return true
+        end
+        local clang = find_tool("clang", {version = true})
+        if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then
+            return true
+        end
+    end
+end
+
+function main(t)
+    if is_subhost("windows") then
+        local clang = find_tool("clang", {version = true})
+        if clang and clang.version and semver.compare(clang.version, "17.0") >= 0 then
+            os.exec("xmake f --toolchain=clang -c --yes")
+            _build()
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
+            _build()
+        end
+
+        os.exec("xmake clean -a")
+        os.exec("xmake f -c --yes")
+        _build()
+    elseif is_subhost("msys") then
+        os.exec("xmake f -c -p mingw --yes")
+        _build()
+    elseif is_host("linux") then
+        local gcc = find_tool("gcc", {version = true})
+if gcc and gcc.version and semver.compare(gcc.version, "11.0") >= 0 then
+            os.exec("xmake f -c --yes")
+            _build()
+        end
+        local clang = find_tool("clang", {version = true})
+        if clang and clang.version and semver.compare(clang.version, "14.0") >= 0 then
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang -c --yes")
+            _build()
+            os.exec("xmake clean -a")
+            os.exec("xmake f --toolchain=clang --runtimes=c++_shared -c --yes")
+            _build()
+        end
+    end
+end
diff --git a/tests/projects/c++/modules/duplicate_name_detection/xmake.lua b/tests/projects/c++/modules/duplicate_name_detection/xmake.lua
new file mode 100644
index 000000000..f4539695c
--- /dev/null
+++ b/tests/projects/c++/modules/duplicate_name_detection/xmake.lua
@@ -0,0 +1,20 @@
+add_rules("mode.release", "mode.debug")
+set_languages("c++20")
+
+target("foo")
+    set_kind("moduleonly")
+    add_files("src/foo.mpp")
+
+target("bar")
+    set_kind("moduleonly")
+    add_files("src/bar.mpp")
+
+target("duplicate_name_detection_1")
+    set_kind("binary")
+    add_deps("foo", "bar")
+    add_files("src/main.cpp")
+
+target("duplicate_name_detection_2")
+    set_kind("binary")
+    add_deps("bar", "foo")
+    add_files("src/main.cpp")