diff options
| author | Roy Ivy III <[email protected]> | 2018-11-02 12:16:35 -0500 |
|---|---|---|
| committer | Roy Ivy III <[email protected]> | 2018-11-02 12:16:35 -0500 |
| commit | a7543cbdfa7fcbe04178d53add85de04b54933b7 (patch) | |
| tree | 7f41d6ecceda7788f7cbaf63010442679985b1f9 | |
| parent | 06481639fce5515f1708e23367aab5bfa20f0e53 (diff) | |
revise progress formatting to space-leading three digit percentages ('%3d')
| -rw-r--r-- | xmake/actions/build/kinds/binary.lua | 4 | ||||
| -rw-r--r-- | xmake/actions/build/kinds/object.lua | 16 | ||||
| -rw-r--r-- | xmake/actions/build/kinds/shared.lua | 4 | ||||
| -rw-r--r-- | xmake/actions/build/kinds/static.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/qt/moc/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/qt/qrc/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/qt/ui/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/wdk/inf/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/wdk/man/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/wdk/mc/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/wdk/mof/xmake.lua | 4 | ||||
| -rw-r--r-- | xmake/rules/wdk/sign/xmake.lua | 2 | ||||
| -rw-r--r-- | xmake/rules/wdk/tracewpp/xmake.lua | 4 |
13 files changed, 31 insertions, 31 deletions
diff --git a/xmake/actions/build/kinds/binary.lua b/xmake/actions/build/kinds/binary.lua index fe8e4a446..d345607b0 100644 --- a/xmake/actions/build/kinds/binary.lua +++ b/xmake/actions/build/kinds/binary.lua @@ -77,7 +77,7 @@ function _build_from_objects(target, buildinfo) local verbose = option.get("verbose") -- trace progress into - cprintf("${green}[%02d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${green}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) if verbose then cprint("${dim magenta}linking.$(mode) %s", path.filename(targetfile)) else @@ -111,7 +111,7 @@ function _build_from_sources(target, buildinfo, sourcebatch, sourcekind) local verbose = option.get("verbose") -- trace progress into - cprintf("${green}[%02d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${green}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) if verbose then cprint("${dim magenta}linking.$(mode) %s", path.filename(targetfile)) else diff --git a/xmake/actions/build/kinds/object.lua b/xmake/actions/build/kinds/object.lua index 283f1ed90..9e81b6ff9 100644 --- a/xmake/actions/build/kinds/object.lua +++ b/xmake/actions/build/kinds/object.lua @@ -41,9 +41,9 @@ function _build_from_object(target, sourcefile, objectfile, progress) -- trace progress info if verbose then - cprint("${green}[%02d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${green}[%3d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) else - cprint("${green}[%02d%%]: ${magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${green}[%3d%%]: ${magenta}inserting.$(mode) %s", progress, sourcefile) end -- trace verbose info @@ -66,9 +66,9 @@ function _build_from_static(target, sourcefile, objectfile, progress) -- trace progress info if verbose then - cprint("${green}[%02d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${green}[%3d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) else - cprint("${green}[%02d%%]: ${magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${green}[%3d%%]: ${magenta}inserting.$(mode) %s", progress, sourcefile) end -- trace verbose info @@ -123,9 +123,9 @@ function _build_object(target, buildinfo, index, sourcebatch, ccache) -- trace progress info if verbose then - cprint("${green}[%02d%%]:${dim} %scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) + cprint("${green}[%3d%%]:${dim} %scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) else - cprint("${green}[%02d%%]:${clear} %scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) + cprint("${green}[%3d%%]:${clear} %scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) end -- trace verbose info @@ -184,9 +184,9 @@ function _build_single_object(target, buildinfo, sourcekind, sourcebatch, jobs, -- trace progress info if verbose then - cprint("${green}[%02d%%]:${clear} ${dim}%scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) + cprint("${green}[%3d%%]:${clear} ${dim}%scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) else - cprint("${green}[%02d%%]:${clear} %scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) + cprint("${green}[%3d%%]:${clear} %scompiling.$(mode) %s", progress, ifelse(ccache, "ccache ", ""), sourcefile) end end diff --git a/xmake/actions/build/kinds/shared.lua b/xmake/actions/build/kinds/shared.lua index 176373773..dc2b75e9c 100644 --- a/xmake/actions/build/kinds/shared.lua +++ b/xmake/actions/build/kinds/shared.lua @@ -90,7 +90,7 @@ function _build_from_objects(target, buildinfo) local verbose = option.get("verbose") -- trace progress info - cprintf("${green}[%02d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${green}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) if verbose then cprint("${dim magenta}linking.$(mode) %s", path.filename(targetfile)) else @@ -124,7 +124,7 @@ function _build_from_sources(target, buildinfo, sourcebatch, sourcekind) local verbose = option.get("verbose") -- trace progress into - cprintf("${green}[%02d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${green}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) if verbose then cprint("${dim magenta}linking.$(mode) %s", path.filename(targetfile)) else diff --git a/xmake/actions/build/kinds/static.lua b/xmake/actions/build/kinds/static.lua index 8e93ab310..0447b5fa3 100644 --- a/xmake/actions/build/kinds/static.lua +++ b/xmake/actions/build/kinds/static.lua @@ -86,7 +86,7 @@ function _build_from_objects(target, buildinfo) local verbose = option.get("verbose") -- trace progress info - cprintf("${green}[%02d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${green}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) if verbose then cprint("${dim magenta}archiving.$(mode) %s", path.filename(targetfile)) else @@ -120,7 +120,7 @@ function _build_from_sources(target, buildinfo, sourcebatch, sourcekind) local verbose = option.get("verbose") -- trace progress into - cprintf("${green}[%02d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${green}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) if verbose then cprint("${dim magenta}archiving.$(mode) %s", path.filename(targetfile)) else diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua index afb6b1df2..7912772f6 100644 --- a/xmake/rules/qt/moc/xmake.lua +++ b/xmake/rules/qt/moc/xmake.lua @@ -82,9 +82,9 @@ rule("qt.moc") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.qt.moc %s", opt.progress, headerfile_moc) + cprint("${green}[%3d%%]:${dim} compiling.qt.moc %s", opt.progress, headerfile_moc) else - cprint("${green}[%02d%%]:${clear} compiling.qt.moc %s", opt.progress, headerfile_moc) + cprint("${green}[%3d%%]:${clear} compiling.qt.moc %s", opt.progress, headerfile_moc) end -- generate c++ source file for moc diff --git a/xmake/rules/qt/qrc/xmake.lua b/xmake/rules/qt/qrc/xmake.lua index 96ef8f2fd..cf6c741dc 100644 --- a/xmake/rules/qt/qrc/xmake.lua +++ b/xmake/rules/qt/qrc/xmake.lua @@ -85,9 +85,9 @@ rule("qt.qrc") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.qt.qrc %s", opt.progress, sourcefile_qrc) + cprint("${green}[%3d%%]:${dim} compiling.qt.qrc %s", opt.progress, sourcefile_qrc) else - cprint("${green}[%02d%%]:${clear} compiling.qt.qrc %s", opt.progress, sourcefile_qrc) + cprint("${green}[%3d%%]:${clear} compiling.qt.qrc %s", opt.progress, sourcefile_qrc) end -- ensure the source file directory diff --git a/xmake/rules/qt/ui/xmake.lua b/xmake/rules/qt/ui/xmake.lua index a59ff3b9f..ee288e96f 100644 --- a/xmake/rules/qt/ui/xmake.lua +++ b/xmake/rules/qt/ui/xmake.lua @@ -72,9 +72,9 @@ rule("qt.ui") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.qt.ui %s", opt.progress, sourcefile_ui) + cprint("${green}[%3d%%]:${dim} compiling.qt.ui %s", opt.progress, sourcefile_ui) else - cprint("${green}[%02d%%]:${clear} compiling.qt.ui %s", opt.progress, sourcefile_ui) + cprint("${green}[%3d%%]:${clear} compiling.qt.ui %s", opt.progress, sourcefile_ui) end -- ensure ui header file directory diff --git a/xmake/rules/wdk/inf/xmake.lua b/xmake/rules/wdk/inf/xmake.lua index c01033cf0..9300df59c 100644 --- a/xmake/rules/wdk/inf/xmake.lua +++ b/xmake/rules/wdk/inf/xmake.lua @@ -95,9 +95,9 @@ rule("wdk.inf") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.wdk.inf %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${dim} compiling.wdk.inf %s", opt.progress, sourcefile) else - cprint("${green}[%02d%%]:${clear} compiling.wdk.inf %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${clear} compiling.wdk.inf %s", opt.progress, sourcefile) end -- get stampinf diff --git a/xmake/rules/wdk/man/xmake.lua b/xmake/rules/wdk/man/xmake.lua index 61b5ac86e..90615e518 100644 --- a/xmake/rules/wdk/man/xmake.lua +++ b/xmake/rules/wdk/man/xmake.lua @@ -125,9 +125,9 @@ rule("wdk.man") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.wdk.man %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${dim} compiling.wdk.man %s", opt.progress, sourcefile) else - cprint("${green}[%02d%%]:${clear} compiling.wdk.man %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${clear} compiling.wdk.man %s", opt.progress, sourcefile) end -- generate header and resource file diff --git a/xmake/rules/wdk/mc/xmake.lua b/xmake/rules/wdk/mc/xmake.lua index 12543bcfb..d3152749d 100644 --- a/xmake/rules/wdk/mc/xmake.lua +++ b/xmake/rules/wdk/mc/xmake.lua @@ -105,9 +105,9 @@ rule("wdk.mc") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.wdk.mc %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${dim} compiling.wdk.mc %s", opt.progress, sourcefile) else - cprint("${green}[%02d%%]:${clear} compiling.wdk.mc %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${clear} compiling.wdk.mc %s", opt.progress, sourcefile) end -- do message compile diff --git a/xmake/rules/wdk/mof/xmake.lua b/xmake/rules/wdk/mof/xmake.lua index 6ad2c2991..763e842d5 100644 --- a/xmake/rules/wdk/mof/xmake.lua +++ b/xmake/rules/wdk/mof/xmake.lua @@ -115,9 +115,9 @@ rule("wdk.mof") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.wdk.mof %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${dim} compiling.wdk.mof %s", opt.progress, sourcefile) else - cprint("${green}[%02d%%]:${clear} compiling.wdk.mof %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${clear} compiling.wdk.mof %s", opt.progress, sourcefile) end -- ensure the output directory diff --git a/xmake/rules/wdk/sign/xmake.lua b/xmake/rules/wdk/sign/xmake.lua index f7cc22b80..d7287c248 100644 --- a/xmake/rules/wdk/sign/xmake.lua +++ b/xmake/rules/wdk/sign/xmake.lua @@ -115,7 +115,7 @@ rule("wdk.sign") target:data_add("wdk.cleanfiles", {tempfile, dependfile}) -- trace progress info - cprintf("${green}[%02d%%]:${clear} ", opt.progress) + cprintf("${green}[%3d%%]:${clear} ", opt.progress) if option.get("verbose") then cprint("${dim magenta}signing.%s %s", signmode, path.filename(target:targetfile())) else diff --git a/xmake/rules/wdk/tracewpp/xmake.lua b/xmake/rules/wdk/tracewpp/xmake.lua index 9a5587084..dda162f0c 100644 --- a/xmake/rules/wdk/tracewpp/xmake.lua +++ b/xmake/rules/wdk/tracewpp/xmake.lua @@ -103,9 +103,9 @@ rule("wdk.tracewpp") -- trace progress info if option.get("verbose") then - cprint("${green}[%02d%%]:${dim} compiling.wdk.tracewpp %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${dim} compiling.wdk.tracewpp %s", opt.progress, sourcefile) else - cprint("${green}[%02d%%]:${clear} compiling.wdk.tracewpp %s", opt.progress, sourcefile) + cprint("${green}[%3d%%]:${clear} compiling.wdk.tracewpp %s", opt.progress, sourcefile) end -- ensure the output directory |
