improve symbols.extract

2 files changed, 79 insertions, 100 deletions

diff --git a/xmake/rules/utils/symbols/extract.lua b/xmake/rules/utils/symbols/extract.lua
deleted file mode 100644
index a272eada8..000000000
--- a/xmake/rules/utils/symbols/extract.lua
+++ /dev/null
@@ -1,99 +0,0 @@
---!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-2020, TBOOX Open Source Group.
---
--- @author      ruki
--- @file        xmake.lua
---
-
--- imports
-import("core.base.option")
-import("core.theme.theme")
-import("core.platform.platform")
-
--- need generate symbols?
-function _need_symbols(target)
-    local strip = target:get("strip")
-    local targetkind = target:targetkind()
-    return target:get("symbols") == "debug" and (strip == "all" or strip == "debug") and (targetkind == "binary" or targetkind == "shared")
-end
-
--- the main entry
-function main(target, opt)
-
-    -- need generate symbols?
-    if not _need_symbols(target) then
-        return
-    end
-
-    -- get strip
-    local strip = platform.tool("strip")
-    if not strip then
-        return
-    end
-        
-    -- get dsymutil
-    local dsymutil
-    if is_plat("macosx", "iphoneos", "watchos") then
-        dsymutil = platform.tool("dsymutil")
-        if not dsymutil then
-            return
-        end
-    end
-
-    -- trace progress info
-    local symbolfile = target:symbolfile()
-    local progress_prefix = "${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} "
-    if option.get("verbose") then
-        cprint(progress_prefix .. "${dim color.build.target}generating.$(mode) %s", opt.progress, path.filename(symbolfile))
-    else
-        cprint(progress_prefix .. "${color.build.target}generating.$(mode) %s", opt.progress, path.filename(symbolfile))
-    end
-
-    -- generate symbols file
-    local targetfile = target:targetfile()
-    if dsymutil then
-        local dsymutil_argv = {}
-        local arch = get_config("arch")
-        if arch then
-            table.insert(dsymutil_argv, "-arch")
-            table.insert(dsymutil_argv, arch)
-        end
-        table.insert(dsymutil_argv, targetfile)
-        table.insert(dsymutil_argv, "-o")
-        table.insert(dsymutil_argv, symbolfile)
-        os.vrunv(dsymutil, dsymutil_argv, {dryrun = option.get("dry-run")})
-    else
-        os.vcp(targetfile, target:symbolfile())
-    end
-
-    -- strip it
-    local strip_argv = {}
-    if is_plat("macosx", "iphoneos", "watchos") then
-        -- do not support `-s`, we can only strip debug symbols 
-        local arch = get_config("arch")
-        if arch then
-            table.insert(strip_argv, "-arch")
-            table.insert(strip_argv, arch)
-        end
-        table.insert(strip_argv, "-S")
-    else
-        -- -s/--strip-all for gnu strip
-        table.insert(strip_argv, "-s")
-    end
-    table.insert(strip_argv, targetfile)
-    os.vrunv(strip, strip_argv, {dryrun = option.get("dry-run")})
-end
-
diff --git a/xmake/rules/utils/symbols/xmake.lua b/xmake/rules/utils/symbols/xmake.lua
index fa3ce5528..1e5369a58 100644
--- a/xmake/rules/utils/symbols/xmake.lua
+++ b/xmake/rules/utils/symbols/xmake.lua
@@ -20,5 +20,83 @@
 
 -- define rule: utils.symbols.extract
 rule("utils.symbols.extract")
-    after_link("extract")
+    before_link(function(target)
+        -- need generate symbols?
+        local strip = target:get("strip")
+        local targetkind = target:targetkind()
+        if target:get("symbols") == "debug" and (strip == "all" or strip == "debug") and (targetkind == "binary" or targetkind == "shared") then
+            target:data_set("utils.symbols.extract", true)
+            target:set("strip", "none") -- disable strip in link stage, because we need to run separate strip commands
+        end
+    end)
+    after_link(function (target, opt)
+
+        -- need generate symbols?
+        if not target:data("utils.symbols.extract") then
+            return
+        end
+
+        -- imports
+        import("core.base.option")
+        import("core.theme.theme")
+        import("core.platform.platform")
+
+        -- get strip
+        local strip = platform.tool("strip")
+        if not strip then
+            return
+        end
+            
+        -- get dsymutil
+        local dsymutil
+        if is_plat("macosx", "iphoneos", "watchos") then
+            dsymutil = platform.tool("dsymutil")
+            if not dsymutil then
+                return
+            end
+        end
+
+        -- trace progress info
+        local symbolfile = target:symbolfile()
+        local progress_prefix = "${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} "
+        if option.get("verbose") then
+            cprint(progress_prefix .. "${dim color.build.target}generating.$(mode) %s", opt.progress, path.filename(symbolfile))
+        else
+            cprint(progress_prefix .. "${color.build.target}generating.$(mode) %s", opt.progress, path.filename(symbolfile))
+        end
+
+        -- generate symbols file
+        local targetfile = target:targetfile()
+        if dsymutil then
+            local dsymutil_argv = {}
+            local arch = get_config("arch")
+            if arch then
+                table.insert(dsymutil_argv, "-arch")
+                table.insert(dsymutil_argv, arch)
+            end
+            table.insert(dsymutil_argv, targetfile)
+            table.insert(dsymutil_argv, "-o")
+            table.insert(dsymutil_argv, symbolfile)
+            os.vrunv(dsymutil, dsymutil_argv, {dryrun = option.get("dry-run")})
+        else
+            os.vcp(targetfile, target:symbolfile())
+        end
+
+        -- strip it
+        local strip_argv = {}
+        if is_plat("macosx", "iphoneos", "watchos") then
+            -- do not support `-s`, we can only strip debug symbols 
+            local arch = get_config("arch")
+            if arch then
+                table.insert(strip_argv, "-arch")
+                table.insert(strip_argv, arch)
+            end
+            table.insert(strip_argv, "-S")
+        else
+            -- -s/--strip-all for gnu strip
+            table.insert(strip_argv, "-s")
+        end
+        table.insert(strip_argv, targetfile)
+        os.vrunv(strip, strip_argv, {dryrun = option.get("dry-run")})
+    end)