improve swift rules

3 files changed, 76 insertions, 23 deletions

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")