summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-03 22:37:30 +0800
committerruki <[email protected]>2019-01-03 09:45:01 +0800
commit21539005098febb08e7331e14cae59639c9a21fc (patch)
tree96b6eb1301a0cbae2fe532752bdc40b759994b41
parent22a3a1c21f41205fa5ea71a4fd0a0d9caa2b8963 (diff)
improve theme name
-rw-r--r--xmake/actions/build/kinds/binary.lua4
-rw-r--r--xmake/actions/build/kinds/object.lua8
-rw-r--r--xmake/actions/build/kinds/shared.lua4
-rw-r--r--xmake/actions/build/kinds/static.lua4
-rw-r--r--xmake/actions/config/main.lua2
-rw-r--r--xmake/actions/install/main.lua4
-rw-r--r--xmake/actions/require/impl/action/download.lua2
-rw-r--r--xmake/actions/require/impl/action/install.lua4
-rw-r--r--xmake/actions/require/impl/package.lua4
-rw-r--r--xmake/actions/uninstall/main.lua4
-rw-r--r--xmake/actions/update/main.lua4
-rw-r--r--xmake/core/base/colors.lua4
-rw-r--r--xmake/core/base/deprecated.lua4
-rw-r--r--xmake/core/base/utils.lua4
-rw-r--r--xmake/modules/core/tools/gcc.lua2
-rw-r--r--xmake/modules/package/manager/apt/install.lua2
-rw-r--r--xmake/modules/package/manager/pacman/install.lua2
-rw-r--r--xmake/modules/package/manager/yum/install.lua2
-rw-r--r--xmake/modules/private/platform/check_xcode.lua2
-rw-r--r--xmake/platforms/android/config.lua2
-rw-r--r--xmake/platforms/mingw/config.lua2
-rw-r--r--xmake/plugins/project/clang/compile_commands.lua2
-rw-r--r--xmake/rules/qt/moc/xmake.lua2
-rw-r--r--xmake/rules/qt/qrc/xmake.lua2
-rw-r--r--xmake/rules/qt/ui/xmake.lua2
-rw-r--r--xmake/rules/wdk/inf/xmake.lua2
-rw-r--r--xmake/rules/wdk/man/xmake.lua2
-rw-r--r--xmake/rules/wdk/mc/xmake.lua2
-rw-r--r--xmake/rules/wdk/mof/xmake.lua2
-rw-r--r--xmake/rules/wdk/sign/xmake.lua2
-rw-r--r--xmake/rules/wdk/tracewpp/xmake.lua2
-rw-r--r--xmake/themes/dark/xmake.lua14
-rw-r--r--xmake/themes/default/xmake.lua14
-rw-r--r--xmake/themes/emoji/xmake.lua10
-rw-r--r--xmake/themes/plain/xmake.lua10
35 files changed, 73 insertions, 65 deletions
diff --git a/xmake/actions/build/kinds/binary.lua b/xmake/actions/build/kinds/binary.lua
index ed249b376..9a77ed992 100644
--- a/xmake/actions/build/kinds/binary.lua
+++ b/xmake/actions/build/kinds/binary.lua
@@ -80,7 +80,7 @@ function _build_from_objects(target, buildinfo)
-- trace progress into
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount)
if verbose then
- cprint("${color.build.target.verbose}linking.$(mode) %s", path.filename(targetfile))
+ cprint("${color.build.target.dim}linking.$(mode) %s", path.filename(targetfile))
else
cprint("${color.build.target}linking.$(mode) %s", path.filename(targetfile))
end
@@ -114,7 +114,7 @@ function _build_from_sources(target, buildinfo, sourcebatch, sourcekind)
-- trace progress into
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount)
if verbose then
- cprint("${color.build.target.verbose}linking.$(mode) %s", path.filename(targetfile))
+ cprint("${color.build.target.dim}linking.$(mode) %s", path.filename(targetfile))
else
cprint("${color.build.target}linking.$(mode) %s", path.filename(targetfile))
end
diff --git a/xmake/actions/build/kinds/object.lua b/xmake/actions/build/kinds/object.lua
index 60e3567b6..e854be406 100644
--- a/xmake/actions/build/kinds/object.lua
+++ b/xmake/actions/build/kinds/object.lua
@@ -43,7 +43,7 @@ function _build_from_object(target, sourcefile, objectfile, progress)
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", progress)
if verbose then
- cprint("${color.build.object.verbose}inserting.$(mode) %s", sourcefile)
+ cprint("${color.build.object.dim}inserting.$(mode) %s", sourcefile)
else
cprint("${clear}${color.build.object}inserting.$(mode) %s", sourcefile)
end
@@ -69,7 +69,7 @@ function _build_from_static(target, sourcefile, objectfile, progress)
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", progress)
if verbose then
- cprint("${color.build.object.verbose}inserting.$(mode) %s", sourcefile)
+ cprint("${color.build.object.dim}inserting.$(mode) %s", sourcefile)
else
cprint("${color.build.object}inserting.$(mode) %s", sourcefile)
end
@@ -124,7 +124,7 @@ function _do_build_file(target, sourcefile, opt)
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", progress)
if verbose then
- cprint("${color.build.object.verbose}%scompiling.$(mode) %s", _g.ccache and "ccache " or "", sourcefile)
+ cprint("${color.build.object.dim}%scompiling.$(mode) %s", _g.ccache and "ccache " or "", sourcefile)
else
cprint("${color.build.object}%scompiling.$(mode) %s", _g.ccache and "ccache " or "", sourcefile)
end
@@ -224,7 +224,7 @@ function _build_files_for_single(target, sourcebatch, jobs)
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", progress)
if verbose then
- cprint("${color.build.object.verbose}%scompiling.$(mode) %s", _g.ccache and "ccache " or "", sourcefile)
+ cprint("${color.build.object.dim}%scompiling.$(mode) %s", _g.ccache and "ccache " or "", sourcefile)
else
cprint("${color.build.object}%scompiling.$(mode) %s", _g.ccache and "ccache " or "", sourcefile)
end
diff --git a/xmake/actions/build/kinds/shared.lua b/xmake/actions/build/kinds/shared.lua
index 0ff4554c7..74fda72aa 100644
--- a/xmake/actions/build/kinds/shared.lua
+++ b/xmake/actions/build/kinds/shared.lua
@@ -93,7 +93,7 @@ function _build_from_objects(target, buildinfo)
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount)
if verbose then
- cprint("${color.build.target.verbose}linking.$(mode) %s", path.filename(targetfile))
+ cprint("${color.build.target.dim}linking.$(mode) %s", path.filename(targetfile))
else
cprint("${color.build.target}linking.$(mode) %s", path.filename(targetfile))
end
@@ -127,7 +127,7 @@ function _build_from_sources(target, buildinfo, sourcebatch, sourcekind)
-- trace progress into
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount)
if verbose then
- cprint("${color.build.target.verbose}linking.$(mode) %s", path.filename(targetfile))
+ cprint("${color.build.target.dim}linking.$(mode) %s", path.filename(targetfile))
else
cprint("${color.build.target}linking.$(mode) %s", path.filename(targetfile))
end
diff --git a/xmake/actions/build/kinds/static.lua b/xmake/actions/build/kinds/static.lua
index 47217c7fa..79c302218 100644
--- a/xmake/actions/build/kinds/static.lua
+++ b/xmake/actions/build/kinds/static.lua
@@ -89,7 +89,7 @@ function _build_from_objects(target, buildinfo)
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount)
if verbose then
- cprint("${color.build.target.verbose}archiving.$(mode) %s", path.filename(targetfile))
+ cprint("${color.build.target.dim}archiving.$(mode) %s", path.filename(targetfile))
else
cprint("${color.build.target}archiving.$(mode) %s", path.filename(targetfile))
end
@@ -123,7 +123,7 @@ function _build_from_sources(target, buildinfo, sourcebatch, sourcekind)
-- trace progress into
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", (buildinfo.targetindex + 1) * 100 / buildinfo.targetcount)
if verbose then
- cprint("${color.build.target.verbose}archiving.$(mode) %s", path.filename(targetfile))
+ cprint("${color.build.target.dim}archiving.$(mode) %s", path.filename(targetfile))
else
cprint("${color.build.target}archiving.$(mode) %s", path.filename(targetfile))
end
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 6fdf213b1..67f9578d0 100644
--- a/xmake/actions/config/main.lua
+++ b/xmake/actions/config/main.lua
@@ -160,7 +160,7 @@ function main()
if not option.get("quiet") and not option.get("yes") then
-- show tips
- cprint("${color.warning}note: ${clear}xmake.lua not found, try generating it (pass -y to skip confirm)?")
+ cprint("${color.warning.bright}note: ${clear}xmake.lua not found, try generating it (pass -y to skip confirm)?")
cprint("please input: n (y/n)")
-- get answer
diff --git a/xmake/actions/install/main.lua b/xmake/actions/install/main.lua
index b8ff8131b..f9f307175 100644
--- a/xmake/actions/install/main.lua
+++ b/xmake/actions/install/main.lua
@@ -122,7 +122,7 @@ function main()
end
-- show tips
- cprint("${color.error}error: ${clear}installation failed, may permission denied!")
+ cprint("${color.error.bright}error: ${clear}installation failed, may permission denied!")
-- continue to install with administrator permission?
if sudo.has() then
@@ -132,7 +132,7 @@ function main()
if confirm == nil then
-- show tips
- cprint("${color.warning}note: ${clear}try continue to install with administrator permission again?")
+ cprint("${color.warning.bright}note: ${clear}try continue to install with administrator permission again?")
cprint("please input: y (y/n)")
-- get answer
diff --git a/xmake/actions/require/impl/action/download.lua b/xmake/actions/require/impl/action/download.lua
index 67719a4bd..813121dd5 100644
--- a/xmake/actions/require/impl/action/download.lua
+++ b/xmake/actions/require/impl/action/download.lua
@@ -207,7 +207,7 @@ function main(package)
-- verbose?
if option.get("verbose") and errors then
- cprint("${color.error.verbose}error: ${clear}%s", errors)
+ cprint("${color.error.dim}error: ${clear}%s", errors)
end
-- trace
diff --git a/xmake/actions/require/impl/action/install.lua b/xmake/actions/require/impl/action/install.lua
index 986967329..fc1f4d6af 100644
--- a/xmake/actions/require/impl/action/install.lua
+++ b/xmake/actions/require/impl/action/install.lua
@@ -132,11 +132,11 @@ function main(package)
-- verbose?
if option.get("verbose") and errors then
- cprint("${color.error.verbose}error: ${clear}%s", errors)
+ cprint("${color.error.dim}error: ${clear}%s", errors)
end
-- trace
- cprint("${color.error}failed")
+ cprint("${color.error.bright}failed")
-- failed
if not package:requireinfo().optional then
diff --git a/xmake/actions/require/impl/package.lua b/xmake/actions/require/impl/package.lua
index c2b2f0617..3df967547 100644
--- a/xmake/actions/require/impl/package.lua
+++ b/xmake/actions/require/impl/package.lua
@@ -334,7 +334,7 @@ function _get_confirm(packages)
if confirm == nil then
-- show tips
- cprint("${color.warning}note: ${clear}try installing these packages (pass -y to skip confirm)?")
+ cprint("${color.warning.bright}note: ${clear}try installing these packages (pass -y to skip confirm)?")
for _, package in ipairs(packages) do
print(" -> %s %s %s", package:name(), package:version_str() or "", package:debug() and "(debug)" or "")
end
@@ -447,7 +447,7 @@ function install_packages(requires, opt)
-- exists unsupported packages?
if #packages_unsupported > 0 then
-- show tips
- cprint("${color.warning}note: ${clear}the following packages are unsupported for $(plat)/$(arch)!")
+ cprint("${color.warning.bright}note: ${clear}the following packages are unsupported for $(plat)/$(arch)!")
for _, package in ipairs(packages_unsupported) do
print(" -> %s %s", package:name(), package:version_str() or "")
end
diff --git a/xmake/actions/uninstall/main.lua b/xmake/actions/uninstall/main.lua
index bab865dc0..730d7c9bc 100644
--- a/xmake/actions/uninstall/main.lua
+++ b/xmake/actions/uninstall/main.lua
@@ -81,7 +81,7 @@ function main()
end
-- show tips
- cprint("${color.error}error: ${clear}failed to uninstall, may permission denied!")
+ cprint("${color.error.bright}error: ${clear}failed to uninstall, may permission denied!")
-- continue to uninstall with administrator permission?
if sudo.has() then
@@ -91,7 +91,7 @@ function main()
if confirm == nil then
-- show tips
- cprint("${color.warning}note: ${clear}try continue to uninstall with administrator permission again?")
+ cprint("${color.warning.bright}note: ${clear}try continue to uninstall with administrator permission again?")
cprint("please input: y (y/n)")
-- get answer
diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
index 54ad2b8fc..a32798977 100644
--- a/xmake/actions/update/main.lua
+++ b/xmake/actions/update/main.lua
@@ -72,7 +72,7 @@ function _sudo(cmd)
end
-- show tips
- cprint("\r${color.error}error: ${clear}run `%s` failed, may permission denied!", cmd)
+ cprint("\r${color.error.bright}error: ${clear}run `%s` failed, may permission denied!", cmd)
-- continue to install with administrator permission?
if sudo.has() then
@@ -82,7 +82,7 @@ function _sudo(cmd)
if confirm == nil then
-- show tips
- cprint("\r${color.warning}note: ${clear}try continue to run `%s` with administrator permission again?", cmd)
+ cprint("\r${color.warning.bright}note: ${clear}try continue to run `%s` with administrator permission again?", cmd)
cprint("\rplease input: y (y/n)")
-- get answer
diff --git a/xmake/core/base/colors.lua b/xmake/core/base/colors.lua
index cefd10774..ef7f239fa 100644
--- a/xmake/core/base/colors.lua
+++ b/xmake/core/base/colors.lua
@@ -312,7 +312,7 @@ function colors.translate(str)
return ""
end
- -- translate theme color first, e.g ${color.error}
+ -- translate theme color first, e.g ${color.error.bright}
if theme then
local theme_word = theme:get(word)
if theme_word then
@@ -326,7 +326,7 @@ function colors.translate(str)
return ""
end
elseif word:startswith("color.") then
- local default_colors = {["color.error"] = "bright red", ["color.warning"] = "bright yellow"}
+ local default_colors = {["color.error.bright"] = "bright red", ["color.warning.bright"] = "bright yellow"}
local theme_word = default_colors[word]
if theme_word then
word = theme_word
diff --git a/xmake/core/base/deprecated.lua b/xmake/core/base/deprecated.lua
index 1c850ed89..bcc2f3144 100644
--- a/xmake/core/base/deprecated.lua
+++ b/xmake/core/base/deprecated.lua
@@ -61,11 +61,11 @@ function deprecated.dump()
end
-- trace
- utils.cprint("${color.warning}deprecated: ${clear}please uses %s instead of %s", new, old)
+ utils.cprint("${color.warning.bright}deprecated: ${clear}please uses %s instead of %s", new, old)
-- too much?
if index > 6 and not option.get("verbose") then
- utils.cprint("${color.warning}deprecated: ${clear}add -v for getting more ..")
+ utils.cprint("${color.warning.bright}deprecated: ${clear}add -v for getting more ..")
break
end
diff --git a/xmake/core/base/utils.lua b/xmake/core/base/utils.lua
index 27e59c253..786c0bc6c 100644
--- a/xmake/core/base/utils.lua
+++ b/xmake/core/base/utils.lua
@@ -150,7 +150,7 @@ end
-- print the error information
function utils.error(format, ...)
if format ~= nil then
- utils.cprint("${color.error}error: ${clear}" .. string.tryformat(format, ...))
+ utils.cprint("${color.error.bright}error: ${clear}" .. string.tryformat(format, ...))
log:flush()
end
end
@@ -162,7 +162,7 @@ function utils.warning(format, ...)
assert(format)
-- format message
- local msg = "${color.warning}warning: ${default yellow}" .. string.tryformat(format, ...)
+ local msg = "${color.warning.bright}warning: ${color.warning}" .. string.tryformat(format, ...)
-- init warnings
utils._WARNINGS = utils._WARNINGS or {}
diff --git a/xmake/modules/core/tools/gcc.lua b/xmake/modules/core/tools/gcc.lua
index 38210b0e3..c9dd32508 100644
--- a/xmake/modules/core/tools/gcc.lua
+++ b/xmake/modules/core/tools/gcc.lua
@@ -518,7 +518,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags)
local lines = _get_compile_info(errdata)
if #lines > 0 then
local warnings = table.concat(table.slice(lines, 1, ifelse(#lines > 8, 8, #lines)), "\n")
- cprint("${yellow}%s", warnings)
+ cprint("${color.warning}%s", warnings)
end
end
end
diff --git a/xmake/modules/package/manager/apt/install.lua b/xmake/modules/package/manager/apt/install.lua
index bf5c26817..838530581 100644
--- a/xmake/modules/package/manager/apt/install.lua
+++ b/xmake/modules/package/manager/apt/install.lua
@@ -59,7 +59,7 @@ function main(name, opt)
if confirm == nil then
-- show tips
- cprint("${color.warning}note: ${clear}try installing %s with administrator permission?", name)
+ cprint("${color.warning.bright}note: ${clear}try installing %s with administrator permission?", name)
cprint("please input: y (y/n)")
-- get answer
diff --git a/xmake/modules/package/manager/pacman/install.lua b/xmake/modules/package/manager/pacman/install.lua
index 31196e69d..5e5101786 100644
--- a/xmake/modules/package/manager/pacman/install.lua
+++ b/xmake/modules/package/manager/pacman/install.lua
@@ -62,7 +62,7 @@ function main(name, opt)
if confirm == nil then
-- show tips
- cprint("${color.warning}note: ${clear}try installing %s with administrator permission?", name)
+ cprint("${color.warning.bright}note: ${clear}try installing %s with administrator permission?", name)
cprint("please input: y (y/n)")
-- get answer
diff --git a/xmake/modules/package/manager/yum/install.lua b/xmake/modules/package/manager/yum/install.lua
index e5b8ef551..1d900c819 100644
--- a/xmake/modules/package/manager/yum/install.lua
+++ b/xmake/modules/package/manager/yum/install.lua
@@ -62,7 +62,7 @@ function main(name, opt)
if confirm == nil then
-- show tips
- cprint("${color.warning}note: ${clear}try installing %s with administrator permission?", name)
+ cprint("${color.warning.bright}note: ${clear}try installing %s with administrator permission?", name)
cprint("please input: y (y/n)")
-- get answer
diff --git a/xmake/modules/private/platform/check_xcode.lua b/xmake/modules/private/platform/check_xcode.lua
index d56ed4c33..f503c1a13 100644
--- a/xmake/modules/private/platform/check_xcode.lua
+++ b/xmake/modules/private/platform/check_xcode.lua
@@ -39,7 +39,7 @@ function main(config, optional)
elseif not optional then
-- failed
- cprint("${color.error}please run:")
+ cprint("${color.error.bright}please run:")
cprint(" - xmake config --xcode=xxx")
cprint("or - xmake global --xcode=xxx")
raise()
diff --git a/xmake/platforms/android/config.lua b/xmake/platforms/android/config.lua
index a7f5d3c9b..cc6f35ead 100644
--- a/xmake/platforms/android/config.lua
+++ b/xmake/platforms/android/config.lua
@@ -40,7 +40,7 @@ function _check_ndk()
config.set("gcc_toolchain", ndk.gcc_toolchain, {force = true, readonly = true})
else
-- failed
- cprint("${color.error}please run:")
+ cprint("${color.error.bright}please run:")
cprint(" - xmake config --ndk=xxx")
cprint("or - xmake global --ndk=xxx")
raise()
diff --git a/xmake/platforms/mingw/config.lua b/xmake/platforms/mingw/config.lua
index 6ffbe3654..6409f4a5b 100644
--- a/xmake/platforms/mingw/config.lua
+++ b/xmake/platforms/mingw/config.lua
@@ -39,7 +39,7 @@ function _check_mingw()
config.set("bin", mingw.bindir, {readonly = true, force = true})
else
-- failed
- cprint("${color.error}please run:")
+ cprint("${color.error.bright}please run:")
cprint(" - xmake config --ndk=xxx")
cprint("or - xmake global --ndk=xxx")
raise()
diff --git a/xmake/plugins/project/clang/compile_commands.lua b/xmake/plugins/project/clang/compile_commands.lua
index 448382434..62c419dd6 100644
--- a/xmake/plugins/project/clang/compile_commands.lua
+++ b/xmake/plugins/project/clang/compile_commands.lua
@@ -71,7 +71,7 @@ function _make_single_object(jsonfile, target, sourcekind, sourcebatch)
-- not supported now, ignore it directly
for _, sourcefile in ipairs(table.wrap(sourcebatch.sourcefiles)) do
- cprint("${color.warning}warning: ${clear}ignore[%s]: %s", target:name(), sourcefile)
+ cprint("${color.warning.bright}warning: ${clear}ignore[%s]: %s", target:name(), sourcefile)
end
end
diff --git a/xmake/rules/qt/moc/xmake.lua b/xmake/rules/qt/moc/xmake.lua
index 74ce3f24b..cffc8b7a2 100644
--- a/xmake/rules/qt/moc/xmake.lua
+++ b/xmake/rules/qt/moc/xmake.lua
@@ -84,7 +84,7 @@ rule("qt.moc")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.qt.moc %s", headerfile_moc)
+ cprint("${color.build.object.dim}compiling.qt.moc %s", headerfile_moc)
else
cprint("${color.build.object}compiling.qt.moc %s", headerfile_moc)
end
diff --git a/xmake/rules/qt/qrc/xmake.lua b/xmake/rules/qt/qrc/xmake.lua
index c99ca5012..c26a0eae2 100644
--- a/xmake/rules/qt/qrc/xmake.lua
+++ b/xmake/rules/qt/qrc/xmake.lua
@@ -87,7 +87,7 @@ rule("qt.qrc")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.qt.qrc %s", sourcefile_qrc)
+ cprint("${color.build.object.dim}compiling.qt.qrc %s", sourcefile_qrc)
else
cprint("${color.build.object}compiling.qt.qrc %s", sourcefile_qrc)
end
diff --git a/xmake/rules/qt/ui/xmake.lua b/xmake/rules/qt/ui/xmake.lua
index f942512fd..d37abc728 100644
--- a/xmake/rules/qt/ui/xmake.lua
+++ b/xmake/rules/qt/ui/xmake.lua
@@ -74,7 +74,7 @@ rule("qt.ui")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.qt.ui %s", sourcefile_ui)
+ cprint("${color.build.object.dim}compiling.qt.ui %s", sourcefile_ui)
else
cprint("${color.build.object}compiling.qt.ui %s", sourcefile_ui)
end
diff --git a/xmake/rules/wdk/inf/xmake.lua b/xmake/rules/wdk/inf/xmake.lua
index 57af431a9..828020a55 100644
--- a/xmake/rules/wdk/inf/xmake.lua
+++ b/xmake/rules/wdk/inf/xmake.lua
@@ -97,7 +97,7 @@ rule("wdk.inf")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.wdk.inf %s", sourcefile)
+ cprint("${color.build.object.dim}compiling.wdk.inf %s", sourcefile)
else
cprint("${color.build.object}compiling.wdk.inf %s", sourcefile)
end
diff --git a/xmake/rules/wdk/man/xmake.lua b/xmake/rules/wdk/man/xmake.lua
index d1211c73c..4bf90836b 100644
--- a/xmake/rules/wdk/man/xmake.lua
+++ b/xmake/rules/wdk/man/xmake.lua
@@ -127,7 +127,7 @@ rule("wdk.man")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.wdk.man %s", sourcefile)
+ cprint("${color.build.object.dim}compiling.wdk.man %s", sourcefile)
else
cprint("${color.build.object}compiling.wdk.man %s", sourcefile)
end
diff --git a/xmake/rules/wdk/mc/xmake.lua b/xmake/rules/wdk/mc/xmake.lua
index 3e8f689cc..3b0ea2e6b 100644
--- a/xmake/rules/wdk/mc/xmake.lua
+++ b/xmake/rules/wdk/mc/xmake.lua
@@ -107,7 +107,7 @@ rule("wdk.mc")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.wdk.mc %s", sourcefile)
+ cprint("${color.build.object.dim}compiling.wdk.mc %s", sourcefile)
else
cprint("${color.build.object}compiling.wdk.mc %s", sourcefile)
end
diff --git a/xmake/rules/wdk/mof/xmake.lua b/xmake/rules/wdk/mof/xmake.lua
index eb2de30bb..447d0ad43 100644
--- a/xmake/rules/wdk/mof/xmake.lua
+++ b/xmake/rules/wdk/mof/xmake.lua
@@ -117,7 +117,7 @@ rule("wdk.mof")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.wdk.mof %s", sourcefile)
+ cprint("${color.build.object.dim}compiling.wdk.mof %s", sourcefile)
else
cprint("${color.build.object}compiling.wdk.mof %s", sourcefile)
end
diff --git a/xmake/rules/wdk/sign/xmake.lua b/xmake/rules/wdk/sign/xmake.lua
index d0cb4eae4..d5417708a 100644
--- a/xmake/rules/wdk/sign/xmake.lua
+++ b/xmake/rules/wdk/sign/xmake.lua
@@ -118,7 +118,7 @@ rule("wdk.sign")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.target.verbose}signing.%s %s", signmode, path.filename(target:targetfile()))
+ cprint("${color.build.target.dim}signing.%s %s", signmode, path.filename(target:targetfile()))
else
cprint("${color.build.target}signing.%s %s", signmode, path.filename(target:targetfile()))
end
diff --git a/xmake/rules/wdk/tracewpp/xmake.lua b/xmake/rules/wdk/tracewpp/xmake.lua
index 9458ead83..c7ea545ce 100644
--- a/xmake/rules/wdk/tracewpp/xmake.lua
+++ b/xmake/rules/wdk/tracewpp/xmake.lua
@@ -105,7 +105,7 @@ rule("wdk.tracewpp")
-- trace progress info
cprintf("${color.build.progress}" .. theme.get("text.build.progress_format") .. ":${clear} ", opt.progress)
if option.get("verbose") then
- cprint("${color.build.object.verbose}compiling.wdk.tracewpp %s", sourcefile)
+ cprint("${color.build.object.dim}compiling.wdk.tracewpp %s", sourcefile)
else
cprint("${color.build.object}compiling.wdk.tracewpp %s", sourcefile)
end
diff --git a/xmake/themes/dark/xmake.lua b/xmake/themes/dark/xmake.lua
index b9b4b66b6..111ccc211 100644
--- a/xmake/themes/dark/xmake.lua
+++ b/xmake/themes/dark/xmake.lua
@@ -26,12 +26,14 @@
theme("dark")
-- the error info
- set_color("error", "bright red")
- set_color("error.verbose", "dim red")
+ set_color("error", "red")
+ set_color("error.dim", "dim red")
+ set_color("error.bright", "bright red")
-- the warning info
- set_color("warning", "bright cyan")
- set_color("warning.verbose", "dim cyan")
+ set_color("warning", "cyan")
+ set_color("warning.dim", "dim cyan")
+ set_color("warning.bright", "bright cyan")
-- the building progress
set_text("build.progress_format", "[%3d%%]")
@@ -39,9 +41,9 @@ theme("dark")
-- the building object file
set_color("build.object", "")
- set_color("build.object.verbose", "dim green")
+ set_color("build.object.dim", "dim green")
-- the building target file
set_color("build.target", "magenta")
- set_color("build.target.verbose", "dim magenta")
+ set_color("build.target.dim", "dim magenta")
diff --git a/xmake/themes/default/xmake.lua b/xmake/themes/default/xmake.lua
index 556a80342..86e12da85 100644
--- a/xmake/themes/default/xmake.lua
+++ b/xmake/themes/default/xmake.lua
@@ -26,12 +26,14 @@
theme("default")
-- the error info
- set_color("error", "bright red")
- set_color("error.verbose", "dim red")
+ set_color("error", "red")
+ set_color("error.dim", "dim red")
+ set_color("error.bright", "bright red")
-- the warning info
- set_color("warning", "bright yellow")
- set_color("warning.verbose", "dim yellow")
+ set_color("warning", "yellow")
+ set_color("warning.dim", "dim yellow")
+ set_color("warning.bright", "bright yellow")
-- the building progress
set_text("build.progress_format", "[%3d%%]")
@@ -39,10 +41,10 @@ theme("default")
-- the building object file
set_color("build.object", "")
- set_color("build.object.verbose", "dim green")
+ set_color("build.object.dim", "dim green")
-- the building target file
set_color("build.target", "magenta")
- set_color("build.target.verbose", "dim magenta")
+ set_color("build.target.dim", "dim magenta")
diff --git a/xmake/themes/emoji/xmake.lua b/xmake/themes/emoji/xmake.lua
index 15ac7d23e..dd31f12c6 100644
--- a/xmake/themes/emoji/xmake.lua
+++ b/xmake/themes/emoji/xmake.lua
@@ -27,11 +27,13 @@ theme("emoji")
-- the error info
set_color("error", "exclamation")
- set_color("error.verbose", "exclamation")
+ set_color("error.dim", "exclamation")
+ set_color("error.bright", "exclamation")
-- the warning info
set_color("warning", "warning")
- set_color("warning.verbose", "warning")
+ set_color("warning.dim", "warning")
+ set_color("warning.bright", "warning")
-- the building progress
set_text("build.progress_format", "[%3d%%]")
@@ -39,9 +41,9 @@ theme("emoji")
-- the building object file
set_color("build.object", "")
- set_color("build.object.verbose", "dim green")
+ set_color("build.object.dim", "dim green")
-- the building target file
set_color("build.target", "magenta")
- set_color("build.target.verbose", "dim magenta")
+ set_color("build.target.dim", "dim magenta")
diff --git a/xmake/themes/plain/xmake.lua b/xmake/themes/plain/xmake.lua
index 7daf37ecc..7341eee41 100644
--- a/xmake/themes/plain/xmake.lua
+++ b/xmake/themes/plain/xmake.lua
@@ -27,11 +27,13 @@ theme("plain")
-- the error info
set_color("error", "")
- set_color("error.verbose", "")
+ set_color("error.dim", "")
+ set_color("error.bright", "")
-- the warning info
set_color("warning", "")
- set_color("warning.verbose", "")
+ set_color("warning.dim", "")
+ set_color("warning.bright", "")
-- the building progress
set_text("build.progress_format", "[%3d%%]")
@@ -39,8 +41,8 @@ theme("plain")
-- the building object file
set_color("build.object", "")
- set_color("build.object.verbose", "")
+ set_color("build.object.dim", "")
-- the building target file
set_color("build.target", "")
- set_color("build.target.verbose", "")
+ set_color("build.target.dim", "")