remove old msvc modules preview

6 files changed, 39 insertions, 126 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
diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua
index 017047f9f..8a099de17 100644
--- a/xmake/rules/c++/modules/modules_support/msvc.lua
+++ b/xmake/rules/c++/modules/modules_support/msvc.lua
@@ -25,6 +25,7 @@ import("core.project.project")
 import("core.project.depend")
 import("core.project.config")
 import("core.base.hashset")
+import("core.base.semver")
 import("utils.progress")
 import("private.action.build.object", {alias = "objectbuilder"})
 import("common")
@@ -130,49 +131,28 @@ function load(target)
     -- enable std modules if c++23 by defaults
     if target:values("c++.msvc.enable_std_import") == nil then
         local languages = table.join({}, target:get("languages"))
-        local disable_on = { "c++11", "cxx11", "c++14", "cxx14", "c++17", "cxx17", "c++20", "cxx20"}
-        local iscpp23 = table.find_if(languages, function(_, v) for _, flag in pairs(disable_on) do if v:find(flag) then return false end end return true end)
+        local iscpp23 = false
+        for _, language in pairs(languages) do
+            if language:find("c++") or language:find("cxx") then
+                iscpp23 = true
+                for _, version in pairs({"11", "14", "17", "20"}) do
+                    if language:find(version) then
+                        iscpp23 = false
+                        break
+                    end
+                end
+            end
+        end
         local stdmodulesdir
         local msvc = target:toolchain("msvc")
         if msvc then
             local vcvars = msvc:config("vcvars")
-            if vcvars.VCInstallDir and vcvars.VCToolsVersion then
+            if vcvars.VCInstallDir and vcvars.VCToolsVersion and semver.compare(vcvars.VCToolsVersion, "14.35") then
                 stdmodulesdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "modules")
             end
         end
         target:set("values", "c++.msvc.enable_std_import", iscpp23 and os.isdir(stdmodulesdir))
     end
-
-    -- add stdifcdir in case of if the user ask for it
-    local stdifcdirflag = get_stdifcdirflag(target)
-    if stdifcdirflag and target:values("c++.msvc.enable_std_ifc") then
-        local msvc = target:toolchain("msvc")
-        if msvc then
-            local vcvars = msvc:config("vcvars")
-            if vcvars.VCInstallDir and vcvars.VCToolsVersion then
-                local arch
-                if target:is_arch("x64", "x86_64") then
-                    arch = "x64"
-                elseif target:is_arch("x86", "i386") then
-                    arch = "x86"
-                elseif target:is_arch("arm64") then
-                    arch = "arm64"
-                end
-                if arch then
-                    local mode = is_mode("release") and "Release" or "Debug"
-                    local stdifcdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "ifc", arch)
-                    if os.isdir(stdifcdir) then
-                        target:add("cxxflags", {stdifcdirflag, winos.short_path(stdifcdir)}, {force = true, expand = false})
-                        target:add("linkdirs", path.join(stdifcdir, mode))
-                        target:add("links", "std")
-                    end
-                end
-            end
-        end
-
-        -- can't enable c++23 std modules and msvc specifics std modules
-        target:set("values", "c++.msvc.enable_std_import", false)
-    end
 end
 
 -- provide toolchain include dir for stl headerunit when p1689 is not supported
@@ -550,6 +530,13 @@ function build_modules_for_batchcmds(target, batchcmds, objectfiles, modules, op
     local referenceflag = get_referenceflag(target)
     local internalpartitionflag = get_internalpartitionflag(target)
 
+    if target:values("c++.msvc.enable_std_import") then
+        for objectfile, module in pairs(get_stdmodules(target)) do
+            table.insert(objectfiles, objectfile)
+            modules[objectfile] = module
+        end
+    end
+
     -- build modules
     local depmtime = 0
     for _, objectfile in ipairs(objectfiles) do
@@ -738,18 +725,6 @@ function get_exportheaderflag(target)
     return exportheaderflag or nil
 end
 
-function get_stdifcdirflag(target)
-    local stdifcdirflag = _g.stdifcdirflag
-    if stdifcdirflag == nil then
-        local compinst = target:compiler("cxx")
-        if compinst:has_flags("-stdIfcDir", "cxxflags", {flagskey = "cl_std_ifc_dir"}) then
-            stdifcdirflag = "-stdIfcDir"
-        end
-        _g.stdifcdirflag = stdifcdirflag or false
-    end
-    return stdifcdirflag or nil
-end
-
 function get_scandependenciesflag(target)
     local scandependenciesflag = _g.scandependenciesflag
     if scandependenciesflag == nil then