remove old msvc modules preview

5 files changed, 18 insertions, 80 deletions

diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.cpp b/tests/projects/c++/modules/stdmodules/src/my_module.cpp
index 3d4711ceb..b87808a6e 100644
--- a/tests/projects/c++/modules/stdmodules/src/my_module.cpp
+++ b/tests/projects/c++/modules/stdmodules/src/my_module.cpp
@@ -1,9 +1,5 @@
 module my_module;
 
-#ifdef MSVC_MODULES
-import std.core;
-#else
 import std;
-#endif
 
 auto my_sum(size_t a, size_t b) -> size_t { return a + b; }
diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.mpp b/tests/projects/c++/modules/stdmodules/src/my_module.mpp
index 38a8a90af..bbebb2766 100644
--- a/tests/projects/c++/modules/stdmodules/src/my_module.mpp
+++ b/tests/projects/c++/modules/stdmodules/src/my_module.mpp
@@ -1,9 +1,5 @@
 export module my_module;
 
-#ifdef MSVC_MODULES
-import std.core;
-#else
 import std;
-#endif
 
 export auto my_sum(size_t a, size_t b) -> size_t;
diff --git a/tests/projects/c++/modules/stdmodules/test/test.cpp b/tests/projects/c++/modules/stdmodules/test/test.cpp
index 3deeff07e..7c6f7b4df 100644
--- a/tests/projects/c++/modules/stdmodules/test/test.cpp
+++ b/tests/projects/c++/modules/stdmodules/test/test.cpp
@@ -1,8 +1,4 @@
-#ifdef MSVC_MODULES
-import std.core;
-#else
 import std;
-#endif
 
 import my_module;
 
diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua
index 92fa4b8f1..85e738d14 100644
--- a/tests/projects/c++/modules/stdmodules/xmake.lua
+++ b/tests/projects/c++/modules/stdmodules/xmake.lua
@@ -2,40 +2,13 @@ add_rules("mode.debug", "mode.release")
 
 add_cxxflags("clang::-stdlib=libc++")
 
-option("stdifcsupport")
-    set_default(false)
-    set_showmenu(true)
-option("stdimportsupport")
-    set_default(false)
-    set_showmenu(true)
-option_end()
+set_languages("c++latest")
 
-if has_config("stdimportsupport") then
-    target("mod")
-        set_languages("c++latest")
-        set_kind("static")
-        add_files("src/*.cpp", "src/*.mpp")
+target("mod")
+    set_kind("static")
+    add_files("src/*.cpp", "src/*.mpp")
 
-    target("test")
-        set_kind("binary")
-        set_languages("c++latest")
-        add_files("test/*.cpp")
-        add_deps("mod")
-end
-
-if has_config("stdifcsupport") then
-    target("mod-msvcifc")
-        set_kind("static")
-        set_languages("c++latest", "clatest")
-        add_files("src/*.cpp", "src/*.mpp")
-        set_values("c++.msvc.enable_std_ifc", true)
-        add_defines("MSVC_MODULES")
-
-    target("test-msvcifc")
-        set_kind("binary")
-        set_languages("c++latest", "clatest")
-        add_files("test/*.cpp")
-        add_deps("mod-msvcifc")
-        set_values("c++.msvc.enable_std_ifc", true)
-        add_defines("MSVC_MODULES")
-end
+target("test")
+    set_kind("binary")
+    add_files("test/*.cpp")
+    add_deps("mod")
diff --git a/tests/projects/c++/modules/test_msvc.lua b/tests/projects/c++/modules/test_msvc.lua
index 6295a3ed7..a436b5814 100644
--- a/tests/projects/c++/modules/test_msvc.lua
+++ b/tests/projects/c++/modules/test_msvc.lua
@@ -2,34 +2,6 @@ import("lib.detect.find_tool")
 import("core.base.semver")
 import("core.tool.toolchain")
 
-function stdifcdir_support()
-    if is_subhost("windows") then
-        local stdifcdir
-        local msvc = toolchain.load("msvc")
-        if msvc and msvc:check() then
-            local vcvars = msvc:config("vcvars")
-            if vcvars and vcvars.VCInstallDir and vcvars.VCToolsVersion then
-                stdifcdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "ifc")
-            end
-        end
-        return os.isdir(stdifcdir or "")
-    end
-end
-
-function stdimport_support()
-    if is_subhost("windows") then
-        local stdmodulesdir
-        local msvc = toolchain.load("msvc")
-        if msvc and msvc:check() then
-            local vcvars = msvc:config("vcvars")
-            if vcvars and vcvars.VCInstallDir and vcvars.VCToolsVersion then
-                stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules")
-            end
-        end
-        return os.isdir(stdmodulesdir or "")
-    end
-end
-
 function _build()
     local ci = (os.getenv("CI") or os.getenv("GITHUB_ACTIONS") or ""):lower()
     if ci == "true" then
@@ -41,11 +13,16 @@ end
 
 function main(t)
     if is_subhost("windows") then
-        local stdifcdir_flag = stdifcdir_support() and "--stdifcsupport=y"
-        local stdimport_flag = stdimport_support() and "--stdimportsupport=y"
-        if stdifcdir_flag or stdimport then
-            os.execv("xmake", table.join({"f", "-c"}, stdifcdir_flag or {}, stdimport_flag or {}))
-            _build()
+        local msvc = toolchain.load("msvc")
+        if msvc and msvc:check() then
+            local vcvars = msvc:config("vcvars")
+            if vcvars and vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") then
+                local stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules")
+                if os.isdir(stdmodulesdir) then
+                    os.exec("xmake f -c")
+                    _build()
+                end
+            end
         end
     end
 end