diff options
| author | ruki <[email protected]> | 2016-07-14 09:18:37 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2016-07-14 09:18:37 +0800 |
| commit | 6c2d3f0ea4d0ccdb10199bc9462b0dc44ddc8a9a (patch) | |
| tree | 268de1524680eafc5846ecd731eda7b454b05197 /xmake/actions | |
| parent | e20c540cbde1694c683bbc3b8c19158bbde57985 (diff) | |
add colors for verbose info
Diffstat (limited to 'xmake/actions')
| -rwxr-xr-x | xmake/actions/build/kinds/binary.lua | 12 | ||||
| -rwxr-xr-x | xmake/actions/build/kinds/object.lua | 14 | ||||
| -rwxr-xr-x | xmake/actions/build/kinds/shared.lua | 14 | ||||
| -rwxr-xr-x | xmake/actions/build/kinds/static.lua | 14 |
4 files changed, 43 insertions, 11 deletions
diff --git a/xmake/actions/build/kinds/binary.lua b/xmake/actions/build/kinds/binary.lua index 0b3c777ef..c3aafcb55 100755 --- a/xmake/actions/build/kinds/binary.lua +++ b/xmake/actions/build/kinds/binary.lua @@ -47,8 +47,16 @@ function build(target, g) -- the target file local targetfile = target:targetfile() - -- trace - print("[%02d%%]: linking.$(mode) %s", (g.targetindex + 1) * 100 / g.targetcount, path.filename(targetfile)) + -- is verbose? + local verbose = option.get("verbose") + + -- trace percent into + cprintf("${yellow}[%02d%%]:${clear} ", (g.targetindex + 1) * 100 / g.targetcount) + if verbose then + cprint("${dim}linking.$(mode) %s", path.filename(targetfile)) + else + print("linking.$(mode) %s", path.filename(targetfile)) + end -- trace verbose info if option.get("verbose") then diff --git a/xmake/actions/build/kinds/object.lua b/xmake/actions/build/kinds/object.lua index c1d8b08dc..f22aafbe0 100755 --- a/xmake/actions/build/kinds/object.lua +++ b/xmake/actions/build/kinds/object.lua @@ -132,11 +132,19 @@ function _build(target, g, index) return end - -- trace - print("[%02d%%]: %scompiling.$(mode) %s", percent, ifelse(config.get("ccache"), "ccache ", ""), sourcefile) + -- is verbose? + local verbose = option.get("verbose") + + -- trace percent info + cprintf("${yellow}[%02d%%]:${clear} ", percent) + if verbose then + cprint("${dim}%scompiling.$(mode) %s", ifelse(config.get("ccache"), "ccache ", ""), sourcefile) + else + print("%scompiling.$(mode) %s", ifelse(config.get("ccache"), "ccache ", ""), sourcefile) + end -- trace verbose info - if option.get("verbose") then + if verbose then print(compiler.compcmd(sourcefile, objectfile, target)) end diff --git a/xmake/actions/build/kinds/shared.lua b/xmake/actions/build/kinds/shared.lua index 878507050..a16848b09 100755 --- a/xmake/actions/build/kinds/shared.lua +++ b/xmake/actions/build/kinds/shared.lua @@ -60,11 +60,19 @@ function build(target, g) -- the target file local targetfile = target:targetfile() - -- trace - print("[%02d%%]: linking.$(mode) %s", (g.targetindex + 1) * 100 / g.targetcount, path.filename(targetfile)) + -- is verbose? + local verbose = option.get("verbose") + + -- trace percent info + cprintf("${yellow}[%02d%%]:${clear} ", (g.targetindex + 1) * 100 / g.targetcount) + if verbose then + cprint("${dim}linking.$(mode) %s", path.filename(targetfile)) + else + print("linking.$(mode) %s", path.filename(targetfile)) + end -- trace verbose info - if option.get("verbose") then + if verbose then print(linker.linkcmd(objectfiles, targetfile, target)) end diff --git a/xmake/actions/build/kinds/static.lua b/xmake/actions/build/kinds/static.lua index 709c0c936..d7503ffcb 100755 --- a/xmake/actions/build/kinds/static.lua +++ b/xmake/actions/build/kinds/static.lua @@ -60,11 +60,19 @@ function build(target, g) -- the target file local targetfile = target:targetfile() - -- trace - print("[%02d%%]: archiving.$(mode) %s", (g.targetindex + 1) * 100 / g.targetcount, path.filename(targetfile)) + -- is verbose? + local verbose = option.get("verbose") + + -- trace percent info + cprintf("${yellow}[%02d%%]:${clear} ", (g.targetindex + 1) * 100 / g.targetcount) + if verbose then + cprint("${dim}archiving.$(mode) %s", path.filename(targetfile)) + else + print("archiving.$(mode) %s", path.filename(targetfile)) + end -- trace verbose info - if option.get("verbose") then + if verbose then print(archiver.archivecmd(objectfiles, targetfile, target)) end |
