remove across_targets_in_parallel policy

8 files changed, 10 insertions, 22 deletions

diff --git a/tests/projects/other/build_deps/xmake.lua b/tests/projects/other/build_deps/xmake.lua
index 5729b5c8f..b2324e3dd 100644
--- a/tests/projects/other/build_deps/xmake.lua
+++ b/tests/projects/other/build_deps/xmake.lua
@@ -4,7 +4,7 @@ target("dep1")
     set_kind("static")
     add_deps("dep3")
     add_files("src/dep1.c")
-    set_policy("build.across_targets_in_parallel", false)
+    set_policy("build.fence", true)
     after_load(function (target)
         os.rm(target:targetfile())
         os.rm(target:dep("dep3"):targetfile())
@@ -21,7 +21,7 @@ target("dep2")
     set_kind("static")
     add_deps("dep3")
     add_files("src/dep2.c")
-    set_policy("build.across_targets_in_parallel", false)
+    set_policy("build.fence", true)
     after_load(function (target)
         os.rm(target:targetfile())
         os.rm(target:dep("dep3"):targetfile())
@@ -38,7 +38,7 @@ target("dep3")
     set_kind("static")
     add_files("src/dep3.c")
     add_deps("dep4", "dep5")
-    set_policy("build.across_targets_in_parallel", false)
+    set_policy("build.fence", true)
     after_load(function (target)
         os.rm(target:targetfile())
         os.rm(target:dep("dep4"):targetfile())
diff --git a/tests/projects/other/merge_archive/xmake.lua b/tests/projects/other/merge_archive/xmake.lua
index 11092dec9..7cf74471d 100644
--- a/tests/projects/other/merge_archive/xmake.lua
+++ b/tests/projects/other/merge_archive/xmake.lua
@@ -3,18 +3,19 @@ add_rules("mode.debug", "mode.release")
 target("add")
     set_kind("static")
     add_files("src/add.c")
+    set_policy("build.fence", true)
     set_targetdir("$(buildir)/merge_archive")
 
 target("sub")
     set_kind("static")
     add_files("src/sub.c")
+    set_policy("build.fence", true)
     set_targetdir("$(buildir)/merge_archive")
 
 target("mul")
     set_kind("static")
     add_deps("add", "sub")
     add_files("src/mul.c")
-    set_policy("build.across_targets_in_parallel", false)
     if is_plat("windows") then
         add_files("$(buildir)/merge_archive/*.lib")
     else
diff --git a/tests/projects/other/merge_object/xmake.lua b/tests/projects/other/merge_object/xmake.lua
index b8799a0b8..bbd7c1f98 100644
--- a/tests/projects/other/merge_object/xmake.lua
+++ b/tests/projects/other/merge_object/xmake.lua
@@ -1,9 +1,9 @@
 add_rules("mode.debug", "mode.release")
-set_policy("build.across_targets_in_parallel", false)
 
 target("merge_object")
     set_kind("static")
     add_files("src/interface.c")
+    set_policy("build.fence", true)
     after_build_file(function (target, sourcefile)
         os.cp(target:objectfile(sourcefile), "$(buildir)/merge_object/")
     end)
diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
index d0c0e0387..a27633182 100644
--- a/xmake/rules/c++/modules/xmake.lua
+++ b/xmake/rules/c++/modules/xmake.lua
@@ -37,7 +37,7 @@ rule("c++.build.modules")
             -- even if some sub-targets do not contain C++ modules.
             --
             -- maybe we will have a more fine-grained configuration strategy to disable it in the future.
-            target:set("policy", "build.across_targets_in_parallel", false)
+            target:set("policy", "build.fence", true)
 
             -- disable ccache for this target
             --
diff --git a/xmake/rules/fortran/xmake.lua b/xmake/rules/fortran/xmake.lua
index 4ab11906d..d10993a91 100644
--- a/xmake/rules/fortran/xmake.lua
+++ b/xmake/rules/fortran/xmake.lua
@@ -35,7 +35,7 @@ rule("fortran.build")
     add_deps("fortran.build.modules")
     on_load(function (target)
         -- we disable to build across targets in parallel, because the source files may depend on other target modules
-        target:set("policy", "build.across_targets_in_parallel", false)
+        target:set("policy", "build.fence", true)
     end)
     on_build_files(function (target, sourcebatch, opt)
         import("private.action.build.object").build(target, sourcebatch, opt)
diff --git a/xmake/rules/go/xmake.lua b/xmake/rules/go/xmake.lua
index 58890e260..fd4cdfb4a 100644
--- a/xmake/rules/go/xmake.lua
+++ b/xmake/rules/go/xmake.lua
@@ -23,7 +23,7 @@ rule("go.build")
     add_deps("go.env")
     on_load(function (target)
         -- we disable to build across targets in parallel, because the source files may depend on other target modules
-        target:set("policy", "build.across_targets_in_parallel", false)
+        target:set("policy", "build.fence", true)
         -- xxx.a
         if target:is_static() then
             target:set("prefixname", "")
diff --git a/xmake/rules/vala/xmake.lua b/xmake/rules/vala/xmake.lua
index caebab9d8..e2262a9ec 100644
--- a/xmake/rules/vala/xmake.lua
+++ b/xmake/rules/vala/xmake.lua
@@ -26,7 +26,7 @@ rule("vala.build")
     set_sourcekinds("cc")
     on_load(function (target)
         -- we disable to build across targets in parallel, because the source files may depend on other target modules
-        target:set("policy", "build.across_targets_in_parallel", false)
+        target:set("policy", "build.fence", true)
 
         -- get vapi file
         local vapifile = target:data("vala.vapifile")
diff --git a/xmake/rules/xcode/application/xmake.lua b/xmake/rules/xcode/application/xmake.lua
index b4969b3df..7d5edc668 100644
--- a/xmake/rules/xcode/application/xmake.lua
+++ b/xmake/rules/xcode/application/xmake.lua
@@ -27,19 +27,6 @@ rule("xcode.application")
     -- we must set kind before target.on_load(), may we will use target in on_load()
     on_load("load")
 
-    -- depend xcode.framework? we need to disable `build.across_targets_in_parallel` policy
-    after_load(function (target)
-        local across_targets_in_parallel
-        for _, dep in ipairs(target:orderdeps()) do
-            if dep:rule("xcode.framework") then
-                across_targets_in_parallel = false
-            end
-        end
-        if across_targets_in_parallel ~= nil then
-            target:set("policy", "build.across_targets_in_parallel", across_targets_in_parallel)
-        end
-    end)
-
     -- build *.app
     after_build("build")