Merge pull request #7088 from xmake-io/rule

Improve c++/objc rules

3 files changed, 79 insertions, 18 deletions

diff --git a/xmake/rules/objc++/config/basic.lua b/xmake/rules/objc++/config/basic.lua
new file mode 100644
index 000000000..4da2eed43
--- /dev/null
+++ b/xmake/rules/objc++/config/basic.lua
@@ -0,0 +1,36 @@
+--!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, sourcekind)
+    if sourcekind == "mm" or sourcekind == "mxx" then
+        -- deprecated, we only need to use `add_mflags("-fno-objc-arc")` or `add_mxxflags("-fno-objc-arc")` to override it
+        local arc_value = sourcekind == "mm" and target:values("objc.build.arc") or target:values("objc++.build.arc")
+        if arc_value == false then
+            local flag_name = sourcekind == "mm" and "mflags" or "mxxflags"
+            target:add(flag_name, "-fno-objc-arc")
+        end
+
+        -- add frameworks for Apple platforms
+        if target:is_plat("macosx", "iphoneos", "watchos") then
+            target:add("frameworks", "Foundation", "CoreFoundation")
+        end
+    end
+end
+
diff --git a/xmake/rules/objc++/config/main.lua b/xmake/rules/objc++/config/main.lua
new file mode 100644
index 000000000..43d2b0096
--- /dev/null
+++ b/xmake/rules/objc++/config/main.lua
@@ -0,0 +1,37 @@
+--!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.objc++.config.basic", {rootdir = os.programdir(), alias = "config_basic"})
+import("rules.c++.config.optimization", {rootdir = os.programdir(), alias = "config_optimization"})
+import("rules.c++.config.sanitizer", {rootdir = os.programdir(), alias = "config_sanitizer"})
+
+-- main entry
+function main(target, sourcekind)
+    -- handle objc++ basic configs
+    config_basic(target, sourcekind)
+
+    -- handle optimization.lto
+    config_optimization(target, sourcekind)
+
+    -- handle sanitizer
+    config_sanitizer(target, sourcekind)
+end
+
diff --git a/xmake/rules/objc++/xmake.lua b/xmake/rules/objc++/xmake.lua
index fe857deef..23cdc3faa 100644
--- a/xmake/rules/objc++/xmake.lua
+++ b/xmake/rules/objc++/xmake.lua
@@ -21,30 +21,18 @@
 -- define rule: objc.build
 rule("objc.build")
     set_sourcekinds("mm")
-    add_deps("objc.build.pcheader", "c.build.optimization", "objc.build.sanitizer")
-    after_load(function (target)
-        -- deprecated, we only need to use `add_mflags("-fno-objc-arc")` to override it
-        if target:values("objc.build.arc") == false then
-            target:add("mflags", "-fno-objc-arc")
-        end
-        if target:is_plat("macosx", "iphoneos", "watchos") then
-            target:add("frameworks", "Foundation", "CoreFoundation")
-        end
+    add_deps("objc.build.pcheader")
+    on_config(function (target)
+        import("config")(target, "mm")
     end)
     on_build_files("private.action.build.object", {jobgraph = true, batch = true, distcc = true})
 
 -- define rule: objc++.build
 rule("objc++.build")
     set_sourcekinds("mxx")
-    add_deps("objc++.build.pcheader", "c++.build.optimization", "objc++.build.sanitizer")
-    after_load(function (target)
-        -- deprecated, we only need to use `add_mxxflags("-fno-objc-arc")` to override it
-        if target:values("objc++.build.arc") == false then
-            target:add("mxxflags", "-fno-objc-arc")
-        end
-        if target:is_plat("macosx", "iphoneos", "watchos") then
-            target:add("frameworks", "Foundation", "CoreFoundation")
-        end
+    add_deps("objc++.build.pcheader")
+    on_config(function (target)
+        import("config")(target, "mxx")
     end)
     on_build_files("private.action.build.object", {jobgraph = true, batch = true, distcc = true})