diff options
| -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 | ||||
| -rw-r--r-- | xmake/themes/plain/xmake.lua | 2 |
14 files changed, 32 insertions, 32 deletions
diff --git a/xmake/actions/build/kinds/binary.lua b/xmake/actions/build/kinds/binary.lua index 68dec33e1..280be43dc 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("${build.progress}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${color.build.progress}[%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("${build.progress}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${color.build.progress}[%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 de18cc028..52db0292e 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("${build.progress}[%3d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${color.build.progress}[%3d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) else - cprint("${build.progress}[%3d%%]: ${magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${color.build.progress}[%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("${build.progress}[%3d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${color.build.progress}[%3d%%]: ${dim magenta}inserting.$(mode) %s", progress, sourcefile) else - cprint("${build.progress}[%3d%%]: ${magenta}inserting.$(mode) %s", progress, sourcefile) + cprint("${color.build.progress}[%3d%%]: ${magenta}inserting.$(mode) %s", progress, sourcefile) end -- trace verbose info @@ -120,9 +120,9 @@ function _do_build_file(target, sourcefile, opt) -- trace progress info if verbose then - cprint("${build.progress}[%3d%%]:${dim} %scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) + cprint("${color.build.progress}[%3d%%]:${dim} %scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) else - cprint("${build.progress}[%3d%%]:${clear} %scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) + cprint("${color.build.progress}[%3d%%]:${clear} %scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) end -- trace verbose info @@ -219,9 +219,9 @@ function _build_files_for_single(target, sourcebatch, jobs) -- trace progress info if verbose then - cprint("${build.progress}[%3d%%]:${clear} ${dim}%scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) + cprint("${color.build.progress}[%3d%%]:${clear} ${dim}%scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) else - cprint("${build.progress}[%3d%%]:${clear} %scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) + cprint("${color.build.progress}[%3d%%]:${clear} %scompiling.$(mode) %s", progress, _g.ccache and "ccache " or "", sourcefile) end end diff --git a/xmake/actions/build/kinds/shared.lua b/xmake/actions/build/kinds/shared.lua index 52f6e02ae..ec9d0dcc3 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("${build.progress}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${color.build.progress}[%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("${build.progress}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${color.build.progress}[%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 7a9bac54e..24c6e4237 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("${build.progress}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${color.build.progress}[%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("${build.progress}[%3d%%]:${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount) + cprintf("${color.build.progress}[%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 48a3f0f84..094937902 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}[%3d%%]:${dim} compiling.qt.moc %s", opt.progress, headerfile_moc) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.qt.moc %s", opt.progress, headerfile_moc) else - cprint("${green}[%3d%%]:${clear} compiling.qt.moc %s", opt.progress, headerfile_moc) + cprint("${color.build.progress}[%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 01466898a..e9971257c 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}[%3d%%]:${dim} compiling.qt.qrc %s", opt.progress, sourcefile_qrc) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.qt.qrc %s", opt.progress, sourcefile_qrc) else - cprint("${green}[%3d%%]:${clear} compiling.qt.qrc %s", opt.progress, sourcefile_qrc) + cprint("${color.build.progress}[%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 c9308f0e3..454e7810b 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}[%3d%%]:${dim} compiling.qt.ui %s", opt.progress, sourcefile_ui) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.qt.ui %s", opt.progress, sourcefile_ui) else - cprint("${green}[%3d%%]:${clear} compiling.qt.ui %s", opt.progress, sourcefile_ui) + cprint("${color.build.progress}[%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 46ab5edc1..b905bc69f 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}[%3d%%]:${dim} compiling.wdk.inf %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.wdk.inf %s", opt.progress, sourcefile) else - cprint("${green}[%3d%%]:${clear} compiling.wdk.inf %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%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 5f3878074..e8bdeb8b5 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}[%3d%%]:${dim} compiling.wdk.man %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.wdk.man %s", opt.progress, sourcefile) else - cprint("${green}[%3d%%]:${clear} compiling.wdk.man %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%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 3018db926..438bd83f9 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}[%3d%%]:${dim} compiling.wdk.mc %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.wdk.mc %s", opt.progress, sourcefile) else - cprint("${green}[%3d%%]:${clear} compiling.wdk.mc %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%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 ea0cf7938..ca31e6eab 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}[%3d%%]:${dim} compiling.wdk.mof %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.wdk.mof %s", opt.progress, sourcefile) else - cprint("${green}[%3d%%]:${clear} compiling.wdk.mof %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%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 6daa68732..ea9241664 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}[%3d%%]:${clear} ", opt.progress) + cprintf("${color.build.progress}[%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 6a93c88c8..094807dee 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}[%3d%%]:${dim} compiling.wdk.tracewpp %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%3d%%]:${dim} compiling.wdk.tracewpp %s", opt.progress, sourcefile) else - cprint("${green}[%3d%%]:${clear} compiling.wdk.tracewpp %s", opt.progress, sourcefile) + cprint("${color.build.progress}[%3d%%]:${clear} compiling.wdk.tracewpp %s", opt.progress, sourcefile) end -- ensure the output directory diff --git a/xmake/themes/plain/xmake.lua b/xmake/themes/plain/xmake.lua index 457559bd0..230927720 100644 --- a/xmake/themes/plain/xmake.lua +++ b/xmake/themes/plain/xmake.lua @@ -38,4 +38,4 @@ theme("plain") set_color("verbose.warning", "") -- the color of the building progress - set_color("build.progress", "") + set_color("color.build.progress", "") |
