Merge pull request #7146 from xmake-io/runtimes

Fix runtimes

7 files changed, 136 insertions, 60 deletions

diff --git a/xmake/rules/c++/config/main.lua b/xmake/rules/c++/config/main.lua
index 68bf5a064..6dbc160e7 100644
--- a/xmake/rules/c++/config/main.lua
+++ b/xmake/rules/c++/config/main.lua
@@ -23,6 +23,7 @@ import("rules.c++.config.basic", {rootdir = os.programdir(), alias = "config_bas
 import("rules.c++.config.dynamic_debugging", {rootdir = os.programdir(), alias = "config_dynamic_debugging"})
 import("rules.c++.config.optimization", {rootdir = os.programdir(), alias = "config_optimization"})
 import("rules.c++.config.sanitizer", {rootdir = os.programdir(), alias = "config_sanitizer"})
+import("rules.c++.config.runtime", {rootdir = os.programdir(), alias = "config_runtime"})
 
 -- main entry
 function main(target, sourcekind)
@@ -36,6 +37,9 @@ function main(target, sourcekind)
     -- config optimization configs
     config_optimization(target, sourcekind)
 
+    -- config runtime configs
+    config_runtime(target)
+
     -- config sanitizer configs
     config_sanitizer(target, sourcekind)
 end
diff --git a/xmake/rules/c++/config/runtime.lua b/xmake/rules/c++/config/runtime.lua
new file mode 100644
index 000000000..9161e92eb
--- /dev/null
+++ b/xmake/rules/c++/config/runtime.lua
@@ -0,0 +1,54 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, Xmake Open Source Community.
+--
+-- @author      ruki
+-- @file        runtime.lua
+--
+
+import("core.project.config")
+
+function main(target)
+    local runtimes = config.get("runtimes")
+    if not runtimes and target:is_plat("windows") then
+        runtimes = config.get("vs_runtime")
+        if runtimes then
+            wprint("--vs_runtime=%s is deprecated, please use --runtimes=%s", runtimes, runtimes)
+        end
+    end
+    if not runtimes and target:is_plat("android") then
+        runtimes = config.get("ndk_cxxstl")
+        if runtimes then
+            wprint("--ndk_cxxstl=%s is deprecated, please use --runtimes=%s", runtimes, runtimes)
+        end
+    end
+    if runtimes and not target:get("runtimes") then
+        if type(runtimes) == "string" then
+            runtimes = runtimes:split(",", {plain = true})
+        end
+        target:set("runtimes", runtimes)
+    end
+
+    -- enable vs runtime as MD by default
+    if target:is_plat("windows") and not target:get("runtimes") then
+        local vs_runtime_default = target:policy("build.c++.msvc.runtime")
+        if vs_runtime_default and target:has_tool("cxx", "cl", "clang", "clangxx", "clang_cl") then
+            if is_mode("debug") then
+                vs_runtime_default = vs_runtime_default .. "d"
+            end
+            target:set("runtimes", vs_runtime_default)
+        end
+    end
+end
diff --git a/xmake/rules/c++/xmake.lua b/xmake/rules/c++/xmake.lua
index dbb24451d..6c16e666a 100644
--- a/xmake/rules/c++/xmake.lua
+++ b/xmake/rules/c++/xmake.lua
@@ -39,9 +39,6 @@ rule("c")
     -- add build rules
     add_deps("c.build")
 
-    -- set compiler runtime, e.g. vs runtime
-    add_deps("utils.compiler.runtime")
-
     -- inherit links and linkdirs of all dependent targets by default
     add_deps("utils.inherit.links")
 
@@ -64,9 +61,6 @@ rule("c++")
     -- add build rules
     add_deps("c++.build")
 
-    -- set compiler runtime, e.g. vs runtime
-    add_deps("utils.compiler.runtime")
-
     -- inherit links and linkdirs of all dependent targets by default
     add_deps("utils.inherit.links")
 
diff --git a/xmake/rules/swift/config/basic.lua b/xmake/rules/swift/config/basic.lua
new file mode 100644
index 000000000..263542c89
--- /dev/null
+++ b/xmake/rules/swift/config/basic.lua
@@ -0,0 +1,42 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, Xmake Open Source Community.
+--
+-- @author      ruki
+-- @file        basic.lua
+--
+
+function main(target)
+    local mode = (type(target:values("swift.interop")) == "string") and target:values("swift.interop") or "objc"
+    if mode == "cxx" then
+        target:add("scflags", "-cxx-interoperability-mode=default")
+    end
+
+    if target:is_library() or target:values("swift.interop.cxxmain") then
+        target:add("scflags", "-parse-as-library")
+    end
+    local modulename = target:values("swift.modulename") or target:name()
+    target:add("scflags", "-module-name", modulename, {force = true})
+    -- we use swift-frontend to support multiple modules
+    -- @see https://github.com/xmake-io/xmake/issues/3916
+    if target:has_tool("sc", "swift_frontend") then
+        local sourcebatch = target:sourcebatches()["swift.build"]
+        if sourcebatch then
+            for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
+                target:add("scflags", sourcefile, {force = true})
+            end
+        end
+    end
+end
diff --git a/xmake/rules/swift/config/main.lua b/xmake/rules/swift/config/main.lua
new file mode 100644
index 000000000..a7ab26ab3
--- /dev/null
+++ b/xmake/rules/swift/config/main.lua
@@ -0,0 +1,33 @@
+--!A cross-platform build utility based on Lua
+--
+-- Licensed under the Apache License, Version 2.0 (the "License");
+-- you may not use this file except in compliance with the License.
+-- You may obtain a copy of the License at
+--
+--     http://www.apache.org/licenses/LICENSE-2.0
+--
+-- Unless required by applicable law or agreed to in writing, software
+-- distributed under the License is distributed on an "AS IS" BASIS,
+-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+-- See the License for the specific language governing permissions and
+-- limitations under the License.
+--
+-- Copyright (C) 2015-present, Xmake Open Source Community.
+--
+-- @author      ruki
+-- @file        main.lua
+--
+
+-- imports
+import("rules.swift.config.basic", {rootdir = os.programdir(), alias = "config_basic"})
+import("rules.c++.config.runtime", {rootdir = os.programdir(), alias = "config_runtime"})
+
+-- main entry
+function main(target)
+
+    -- config basic configs
+    config_basic(target)
+
+    -- config runtime configs
+    config_runtime(target)
+end
diff --git a/xmake/rules/swift/xmake.lua b/xmake/rules/swift/xmake.lua
index 46b225db9..63ad1384e 100644
--- a/xmake/rules/swift/xmake.lua
+++ b/xmake/rules/swift/xmake.lua
@@ -177,26 +177,7 @@ rule("swift.build")
     set_sourcekinds("sc")
     on_build_files("private.action.build.object", {jobgraph = true, batch = true})
     on_config(function (target)
-        local mode = (type(target:values("swift.interop")) == "string") and target:values("swift.interop") or "objc"
-        if mode == "cxx" then
-            target:add("scflags", "-cxx-interoperability-mode=default")
-        end
-
-        if target:is_library() or target:values("swift.interop.cxxmain") then
-            target:add("scflags", "-parse-as-library")
-        end
-        local modulename = target:values("swift.modulename") or target:name()
-        target:add("scflags", "-module-name", modulename, {force = true})
-        -- we use swift-frontend to support multiple modules
-        -- @see https://github.com/xmake-io/xmake/issues/3916
-        if target:has_tool("sc", "swift_frontend") then
-            local sourcebatch = target:sourcebatches()["swift.build"]
-            if sourcebatch then
-                for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
-                    target:add("scflags", sourcefile, {force = true})
-                end
-            end
-        end
+        import("config")(target)
     end)
 
 -- define rule: swift
@@ -207,9 +188,6 @@ rule("swift")
     -- add build rules
     add_deps("swift.build")
 
-    -- set compiler runtime, e.g. vs runtime
-    add_deps("utils.compiler.runtime")
-
     -- inherit links and linkdirs of all dependent targets by default
     add_deps("utils.inherit.links")
 
diff --git a/xmake/rules/utils/compiler_runtime/xmake.lua b/xmake/rules/utils/compiler_runtime/xmake.lua
index 756bd55f8..a80e6c875 100644
--- a/xmake/rules/utils/compiler_runtime/xmake.lua
+++ b/xmake/rules/utils/compiler_runtime/xmake.lua
@@ -21,35 +21,6 @@
 -- define rule: utils.compiler.runtime
 rule("utils.compiler.runtime")
     on_config(function (target)
-        local runtimes = get_config("runtimes")
-        if not runtimes and target:is_plat("windows") then
-            runtimes = get_config("vs_runtime")
-            if runtimes then
-                wprint("--vs_runtime=%s is deprecated, please use --runtimes=%s", runtimes, runtimes)
-            end
-        end
-        if not runtimes and target:is_plat("android") then
-            runtimes = get_config("ndk_cxxstl")
-            if runtimes then
-                wprint("--ndk_cxxstl=%s is deprecated, please use --runtimes=%s", runtimes, runtimes)
-            end
-        end
-        if runtimes and not target:get("runtimes") then
-            if type(runtimes) == "string" then
-                runtimes = runtimes:split(",", {plain = true})
-            end
-            target:set("runtimes", runtimes)
-        end
-
-        -- enable vs runtime as MD by default
-        if target:is_plat("windows") and not target:get("runtimes") then
-            local vs_runtime_default = target:policy("build.c++.msvc.runtime")
-            if vs_runtime_default and target:has_tool("cxx", "cl", "clang", "clangxx", "clang_cl") then
-                if is_mode("debug") then
-                    vs_runtime_default = vs_runtime_default .. "d"
-                end
-                target:set("runtimes", vs_runtime_default)
-            end
-        end
+        import("rules.c++.config.runtime", {rootdir = os.programdir(), alias = "config_runtime"})
+        config_runtime(target)
     end)
-