From 0478f29fc3621404ffe311e35831c078f8e219a6 Mon Sep 17 00:00:00 2001 From: OpportunityLiu Date: Fri, 12 Jul 2019 12:28:10 +0800 Subject: use sep pdb file --- xmake/modules/core/tools/cl.lua | 57 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 29 deletions(-) (limited to 'xmake/modules/core/tools/cl.lua') diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua index 7709165d1..f8153f0e0 100644 --- a/xmake/modules/core/tools/cl.lua +++ b/xmake/modules/core/tools/cl.lua @@ -87,33 +87,13 @@ end -- make the symbol flag function nf_symbol(self, level, target) - -- debug? generate *.pdb file - local flags = nil - if level == "debug" then - local symbolfile = nil - if target and target.symbolfile then - symbolfile = target:symbolfile() - end - if symbolfile then - - -- ensure the object directory - local symboldir = path.directory(symbolfile) - if not os.isdir(symboldir) then - os.mkdir(symboldir) - end - - -- check and add symbol output file - flags = "-Zi -Fd" .. target:symbolfile() - if self:has_flags({"-Zi", "-FS", "-Fd" .. os.tmpfile() .. ".pdb"}, "cxflags") then - flags = "-FS " .. flags - end - else - flags = "-Zi" - end - end + -- the maps + local maps = + { + debug = "-Zi" + } - -- none - return flags + return maps[level] end -- make the warning flag @@ -341,8 +321,8 @@ end -- make the complie arguments list for the precompiled header function _compargv1_pch(self, pcheaderfile, pcoutputfile, flags) - -- remove "-Yuxxx.h" and "-Fpxxx.pch" local pchflags = {} + -- remove "-Yuxxx.h" and "-Fpxxx.pch" for _, flag in ipairs(flags) do if not flag:find("-Yu", 1, true) and not flag:find("-Fp", 1, true) then table.insert(pchflags, flag) @@ -363,14 +343,33 @@ end -- make the complie arguments list function _compargv1(self, sourcefile, objectfile, flags) + local compflags = flags + + -- check if we need -Fd flags + local need_pdb = false + local has_pdb = false + for _, flag in ipairs(flags) do + if flag:find("-ZI", 1, true) or flag:find("-Zi", 1, true) then + need_pdb = true + end + if flag:find("-Fd", 1, true) then + has_pdb = true + end + end + + -- add pdb output + if need_pdb and not has_pdb then + compflags = table.join(flags, "-Fd" .. objectfile .. ".pdb") + end + -- precompiled header? local extension = path.extension(sourcefile) if (extension:startswith(".h") or extension == ".inl") then - return _compargv1_pch(self, sourcefile, objectfile, flags) + return _compargv1_pch(self, sourcefile, objectfile, compflags) end -- make complie arguments list - return self:program(), table.join("-c", flags, "-Fo" .. objectfile, sourcefile) + return self:program(), table.join("-c", compflags, "-Fo" .. objectfile, sourcefile) end -- complie the source file -- cgit v1.3.1 From 97a44ac26e00bf98062cfb99ef203f960d8f6408 Mon Sep 17 00:00:00 2001 From: OpportunityLiu Date: Fri, 12 Jul 2019 13:20:53 +0800 Subject: fix --- xmake/modules/core/tools/cl.lua | 52 ++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 22 deletions(-) (limited to 'xmake/modules/core/tools/cl.lua') diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua index f8153f0e0..e0b6e3f57 100644 --- a/xmake/modules/core/tools/cl.lua +++ b/xmake/modules/core/tools/cl.lua @@ -262,7 +262,7 @@ function _include_note(self, line) -- -- TODO zh-tw, zh-hk, jp, ... -- - _g.notes = _g.notes or + _g.notes = _g.notes or { "Note: including file: " , "注意: 包含文件: " @@ -270,7 +270,7 @@ function _include_note(self, line) -- contain notes? for idx, note in ipairs(_g.notes) do - + -- dump line bytes --[[ print(line) @@ -318,6 +318,31 @@ function _include_deps(self, outdata) return results end +-- add if we need -Fd flags +function _patch_pdbflags(objectfile, flags) + + local compflags = flags + + -- check if we need -Fd flags + local need_pdb = false + local has_pdb = false + for _, flag in ipairs(flags) do + if flag:find("-ZI", 1, true) or flag:find("-Zi", 1, true) or flag:find("/ZI", 1, true) or flag:find("/Zi", 1, true) then + need_pdb = true + end + if flag:find("-Fd", 1, true) or flag:find("/Fd", 1, true) then + has_pdb = true + end + end + + -- add pdb output + if need_pdb and not has_pdb then + compflags = table.join(flags, "-Fd" .. objectfile .. ".pdb") + end + + return compflags +end + -- make the complie arguments list for the precompiled header function _compargv1_pch(self, pcheaderfile, pcoutputfile, flags) @@ -343,33 +368,16 @@ end -- make the complie arguments list function _compargv1(self, sourcefile, objectfile, flags) - local compflags = flags - - -- check if we need -Fd flags - local need_pdb = false - local has_pdb = false - for _, flag in ipairs(flags) do - if flag:find("-ZI", 1, true) or flag:find("-Zi", 1, true) then - need_pdb = true - end - if flag:find("-Fd", 1, true) then - has_pdb = true - end - end - - -- add pdb output - if need_pdb and not has_pdb then - compflags = table.join(flags, "-Fd" .. objectfile .. ".pdb") - end + flags = _patch_pdbflags(objectfile, flags) -- precompiled header? local extension = path.extension(sourcefile) if (extension:startswith(".h") or extension == ".inl") then - return _compargv1_pch(self, sourcefile, objectfile, compflags) + return _compargv1_pch(self, sourcefile, objectfile, flags) end -- make complie arguments list - return self:program(), table.join("-c", compflags, "-Fo" .. objectfile, sourcefile) + return self:program(), table.join("-c", flags, "-Fo" .. objectfile, sourcefile) end -- complie the source file -- cgit v1.3.1 From 741274711841086019bdafc3eacab0345eea789f Mon Sep 17 00:00:00 2001 From: OpportunityLiu Date: Fri, 12 Jul 2019 14:05:28 +0800 Subject: use hashset --- xmake/modules/core/tools/cl.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'xmake/modules/core/tools/cl.lua') diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua index e0b6e3f57..abb3b4841 100644 --- a/xmake/modules/core/tools/cl.lua +++ b/xmake/modules/core/tools/cl.lua @@ -20,6 +20,7 @@ -- imports import("core.base.option") +import("core.base.hashset") import("core.project.project") import("core.language.language") @@ -323,11 +324,14 @@ function _patch_pdbflags(objectfile, flags) local compflags = flags + local _pdbflags = _g._pdbflags or hashset.of("-ZI", "-Zi", "/ZI", "/Zi") + _g._pdbflags = _pdbflags + -- check if we need -Fd flags local need_pdb = false local has_pdb = false for _, flag in ipairs(flags) do - if flag:find("-ZI", 1, true) or flag:find("-Zi", 1, true) or flag:find("/ZI", 1, true) or flag:find("/Zi", 1, true) then + if _pdbflags:has(flag) then need_pdb = true end if flag:find("-Fd", 1, true) or flag:find("/Fd", 1, true) then -- cgit v1.3.1 From 14fb0573a09d6bd1bd64ea16890ee7220c7f8244 Mon Sep 17 00:00:00 2001 From: OpportunityLiu Date: Fri, 12 Jul 2019 14:19:13 +0800 Subject: add break --- xmake/modules/core/tools/cl.lua | 3 +++ 1 file changed, 3 insertions(+) (limited to 'xmake/modules/core/tools/cl.lua') diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua index abb3b4841..7d4fda764 100644 --- a/xmake/modules/core/tools/cl.lua +++ b/xmake/modules/core/tools/cl.lua @@ -337,6 +337,9 @@ function _patch_pdbflags(objectfile, flags) if flag:find("-Fd", 1, true) or flag:find("/Fd", 1, true) then has_pdb = true end + if need_pdb and has_pdb then + break + end end -- add pdb output -- cgit v1.3.1