add utils.merge.object rule

7 files changed, 82 insertions, 6 deletions

diff --git a/tests/projects/other/merge_object/xmake.lua b/tests/projects/other/merge_object/xmake.lua
index 39e41be3e..d55b610b8 100644
--- a/tests/projects/other/merge_object/xmake.lua
+++ b/tests/projects/other/merge_object/xmake.lua
@@ -10,6 +10,11 @@ target("merge_object")
     -- add files
     add_files("src/interface.c") 
 
+    -- save object file
+    after_build_file(function (target, sourcefile)
+        os.cp(target:objectfile(sourcefile), "$(buildir)/merge_object")
+    end)
+
 -- add target
 target("test")
 
@@ -21,5 +26,9 @@ target("test")
 
     -- add files
     add_files("src/test.c") 
-    add_files("build/.objs/merge_object/src/interface.c.o")
+    if is_plat("windows") then
+        add_files("$(buildir)/merge_object/interface.c.obj")
+    else
+        add_files("$(buildir)/merge_object/interface.c.o")
+    end
 
diff --git a/xmake/rules/asm/xmake.lua b/xmake/rules/asm/xmake.lua
index 8b89231ee..57d399c94 100644
--- a/xmake/rules/asm/xmake.lua
+++ b/xmake/rules/asm/xmake.lua
@@ -27,4 +27,4 @@ rule("asm.build")
 
 -- define rule: asm
 rule("asm")
-    add_deps("asm.build")
+    add_deps("asm.build", "utils.merge.object")
diff --git a/xmake/rules/c++/xmake.lua b/xmake/rules/c++/xmake.lua
index 88b5e80f5..c839f9f4b 100644
--- a/xmake/rules/c++/xmake.lua
+++ b/xmake/rules/c++/xmake.lua
@@ -48,4 +48,4 @@ rule("cpp.build")
 
 -- define rule: cpp
 rule("cpp")
-    add_deps("cpp.build", "c.build")
+    add_deps("cpp.build", "c.build", "utils.merge.object")
diff --git a/xmake/rules/dlang/xmake.lua b/xmake/rules/dlang/xmake.lua
index 37c22523a..6b73b5e2b 100644
--- a/xmake/rules/dlang/xmake.lua
+++ b/xmake/rules/dlang/xmake.lua
@@ -27,4 +27,4 @@ rule("dlang.build")
 
 -- define rule: dlang
 rule("dlang")
-    add_deps("dlang.build")
+    add_deps("dlang.build", "utils.merge.object")
diff --git a/xmake/rules/objc++/xmake.lua b/xmake/rules/objc++/xmake.lua
index 412704bcb..824034705 100644
--- a/xmake/rules/objc++/xmake.lua
+++ b/xmake/rules/objc++/xmake.lua
@@ -36,4 +36,4 @@ rule("objc++.build")
 
 -- define rule: objc
 rule("objc++")
-    add_deps("objc++.build", "objc.build")
+    add_deps("objc++.build", "objc.build", "utils.merge.object")
diff --git a/xmake/rules/swift/xmake.lua b/xmake/rules/swift/xmake.lua
index 59109d19a..9be96096d 100644
--- a/xmake/rules/swift/xmake.lua
+++ b/xmake/rules/swift/xmake.lua
@@ -27,4 +27,4 @@ rule("swift.build")
 
 -- define rule: swift
 rule("swift")
-    add_deps("swift.build")
+    add_deps("swift.build", "utils.merge.object")
diff --git a/xmake/rules/utils/merge_object/xmake.lua b/xmake/rules/utils/merge_object/xmake.lua
new file mode 100644
index 000000000..4978752ac
--- /dev/null
+++ b/xmake/rules/utils/merge_object/xmake.lua
@@ -0,0 +1,67 @@
+--!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 - 2019, TBOOX Open Source Group.
+--
+-- @author      ruki
+-- @file        xmake.lua
+--
+
+-- define rule: utils.merge.object
+rule("utils.merge.object")
+
+    -- set extensions
+    set_extensions(".o", ".obj")
+
+    -- on build file
+    on_build_file(function (target, sourcefile_obj, opt)
+
+        -- imports
+        import("core.base.option")
+        import("core.theme.theme")
+        import("core.project.config")
+        import("core.project.depend")
+
+        -- get object file
+        local objectfile = target:objectfile(sourcefile_obj)
+
+        -- add objectfile
+        table.insert(target:objectfiles(), objectfile)
+
+        -- load dependent info 
+        local dependfile = target:dependfile(objectfile)
+        local dependinfo = option.get("rebuild") and {} or (depend.load(dependfile) or {})
+
+        -- need build this object?
+        if not depend.is_changed(dependinfo, {lastmtime = os.mtime(objectfile)}) then
+            return 
+        end
+
+        -- trace progress info
+        cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
+        if option.get("verbose") then
+            cprint("${dim color.build.object}inserting.$(mode) %s", sourcefile_obj)
+        else
+            cprint("${color.build.object}inserting.$(mode) %s", sourcefile_obj)
+        end
+
+        -- insert this object file
+        os.cp(sourcefile_obj, objectfile)
+
+        -- update files to the dependent file
+        dependinfo.files = {}
+        table.insert(dependinfo.files, sourcefile_obj)
+        depend.save(dependinfo, dependfile)
+    end)
+