summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Ivy III <[email protected]>2020-02-22 19:00:05 -0600
committerRoy Ivy III <[email protected]>2020-02-22 19:00:05 -0600
commitf1a390e71d8c96ab005b01115e04ad109ea44d77 (patch)
tree370dfaca480d06749f68dc9ff2fc40ee88252a71
parent4a7f397b9036a3c31cad090732d758794555e40c (diff)
change ~ use 'success' theme more widely
-rw-r--r--xmake/actions/build/main.lua2
-rw-r--r--xmake/actions/config/scangen.lua2
-rw-r--r--xmake/actions/create/main.lua2
-rw-r--r--xmake/actions/install/main.lua6
-rw-r--r--xmake/actions/uninstall/main.lua6
-rw-r--r--xmake/actions/update/main.lua2
-rw-r--r--xmake/modules/private/action/trybuild/autotools.lua4
-rw-r--r--xmake/modules/private/action/trybuild/bazel.lua4
-rw-r--r--xmake/modules/private/action/trybuild/cmake.lua4
-rw-r--r--xmake/modules/private/action/trybuild/make.lua4
-rw-r--r--xmake/modules/private/action/trybuild/meson.lua4
-rw-r--r--xmake/modules/private/action/trybuild/msbuild.lua6
-rw-r--r--xmake/modules/private/action/trybuild/ndkbuild.lua4
-rw-r--r--xmake/modules/private/action/trybuild/ninja.lua4
-rw-r--r--xmake/modules/private/action/trybuild/scons.lua4
-rw-r--r--xmake/modules/private/action/trybuild/xcodebuild.lua6
-rw-r--r--xmake/plugins/doxygen/main.lua2
-rw-r--r--xmake/plugins/macro/main.lua12
-rw-r--r--xmake/plugins/plugin/main.lua2
-rwxr-xr-xxmake/plugins/project/main.lua2
-rw-r--r--xmake/plugins/repo/main.lua4
21 files changed, 33 insertions, 53 deletions
diff --git a/xmake/actions/build/main.lua b/xmake/actions/build/main.lua
index 86bacecbf..1d93ea7e0 100644
--- a/xmake/actions/build/main.lua
+++ b/xmake/actions/build/main.lua
@@ -137,6 +137,6 @@ function main()
-- trace
if option.get("rebuild") then
- cprint("${bright}build ok!${clear}")
+ cprint("${color.success}build ok!${clear}")
end
end
diff --git a/xmake/actions/config/scangen.lua b/xmake/actions/config/scangen.lua
index 29a2943cf..6590ffa37 100644
--- a/xmake/actions/config/scangen.lua
+++ b/xmake/actions/config/scangen.lua
@@ -156,5 +156,5 @@ function main()
end
-- trace
- cprint("${bright}xmake.lua generated, scan ok!${clear}")
+ cprint("${color.success}xmake.lua generated, scan ok!${clear}")
end
diff --git a/xmake/actions/create/main.lua b/xmake/actions/create/main.lua
index 162ee2b88..c70697e07 100644
--- a/xmake/actions/create/main.lua
+++ b/xmake/actions/create/main.lua
@@ -143,5 +143,5 @@ function main()
_create_project(option.get("language"), option.get("template"), targetname)
-- trace
- cprint("${bright}create ok!")
+ cprint("${color.success}create ok!${clear}")
end
diff --git a/xmake/actions/install/main.lua b/xmake/actions/install/main.lua
index f278b4b3c..dd72145ce 100644
--- a/xmake/actions/install/main.lua
+++ b/xmake/actions/install/main.lua
@@ -82,7 +82,7 @@ function main()
install(targetname or ifelse(option.get("all"), "__all", "__def"))
-- trace
- cprint("${bright}install ok!${clear}")
+ cprint("${color.success}install ok!${clear}")
end,
catch
@@ -100,7 +100,7 @@ function main()
install(targetname or ifelse(option.get("all"), "__all", "__def"))
-- trace
- cprint("${bright}install ok!${clear}")
+ cprint("${color.success}install ok!${clear}")
-- ok
return true
@@ -126,7 +126,7 @@ function main()
sudo.runl(path.join(os.scriptdir(), "install_admin.lua"), {targetname or ifelse(option.get("all"), "__all", "__def"), option.get("installdir"), option.get("prefix")})
-- trace
- cprint("${bright}install ok!${clear}")
+ cprint("${color.success}install ok!${clear}")
ok = true
end
end
diff --git a/xmake/actions/uninstall/main.lua b/xmake/actions/uninstall/main.lua
index dec19924f..15aaea074 100644
--- a/xmake/actions/uninstall/main.lua
+++ b/xmake/actions/uninstall/main.lua
@@ -44,7 +44,7 @@ function main()
uninstall(targetname)
-- trace
- cprint("${bright}uninstall ok!${clear}")
+ cprint("${color.success}uninstall ok!${clear}")
end,
catch
@@ -62,7 +62,7 @@ function main()
uninstall(targetname)
-- trace
- cprint("${bright}uninstall ok!${clear}")
+ cprint("${color.success}uninstall ok!${clear}")
-- ok
return true
@@ -88,7 +88,7 @@ function main()
sudo.runl(path.join(os.scriptdir(), "uninstall_admin.lua"), {targetname or "__all", option.get("installdir"), option.get("prefix")})
-- trace
- cprint("${bright}uninstall ok!${clear}")
+ cprint("${color.success}uninstall ok!${clear}")
ok = true
end
end
diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
index 13cb9592d..4eb947a8b 100644
--- a/xmake/actions/update/main.lua
+++ b/xmake/actions/update/main.lua
@@ -289,7 +289,7 @@ function main()
_uninstall()
-- trace
- cprint("${bright}uninstall ok!")
+ cprint("${color.success}uninstall ok!${clear}")
return
end
diff --git a/xmake/modules/private/action/trybuild/autotools.lua b/xmake/modules/private/action/trybuild/autotools.lua
index cb60d9d99..f95ca4c5b 100644
--- a/xmake/modules/private/action/trybuild/autotools.lua
+++ b/xmake/modules/private/action/trybuild/autotools.lua
@@ -199,7 +199,5 @@ function build()
os.vexec("make -j" .. option.get("jobs"))
os.vexec("make install")
cprint("output to ${bright}%s", artifacts_dir)
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/bazel.lua b/xmake/modules/private/action/trybuild/bazel.lua
index 946be30ac..a77657902 100644
--- a/xmake/modules/private/action/trybuild/bazel.lua
+++ b/xmake/modules/private/action/trybuild/bazel.lua
@@ -44,7 +44,5 @@ function build()
-- do build
local bazel = assert(find_tool("bazel"), "bazel not found!")
os.vexecv(bazel.program, {"build"})
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/cmake.lua b/xmake/modules/private/action/trybuild/cmake.lua
index 46d2fbcf6..f97ffa273 100644
--- a/xmake/modules/private/action/trybuild/cmake.lua
+++ b/xmake/modules/private/action/trybuild/cmake.lua
@@ -122,7 +122,5 @@ function build()
os.vexecv("make", {"install"})
end
cprint("output to ${bright}%s", artifacts_dir)
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/make.lua b/xmake/modules/private/action/trybuild/make.lua
index 35a02c7f2..949ab4224 100644
--- a/xmake/modules/private/action/trybuild/make.lua
+++ b/xmake/modules/private/action/trybuild/make.lua
@@ -50,7 +50,5 @@ function build()
table.insert(argv, "-j" .. option.get("jobs"))
os.vexecv("make", argv)
end
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/meson.lua b/xmake/modules/private/action/trybuild/meson.lua
index dc2f30238..33fd0a7d5 100644
--- a/xmake/modules/private/action/trybuild/meson.lua
+++ b/xmake/modules/private/action/trybuild/meson.lua
@@ -114,7 +114,5 @@ function build()
os.vexecv(ninja.program, ninja_argv)
os.vexecv(ninja.program, table.join("install", ninja_argv))
cprint("output to ${bright}%s", artifacts_dir)
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/msbuild.lua b/xmake/modules/private/action/trybuild/msbuild.lua
index a896dce8a..948b89f41 100644
--- a/xmake/modules/private/action/trybuild/msbuild.lua
+++ b/xmake/modules/private/action/trybuild/msbuild.lua
@@ -37,13 +37,11 @@ end
-- do build
function build()
-
+
-- only support the current subsystem host platform now!
assert(is_subhost(config.plat()), "msbuild: %s not supported!", config.plat())
-- do build
os.vexec("msbuild \"%s\" -nologo -t:Build -p:Configuration=Release -p:Platform=%s", configfile, is_arch("x64") and "x64" or "Win32")
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/ndkbuild.lua b/xmake/modules/private/action/trybuild/ndkbuild.lua
index 729d73325..214508912 100644
--- a/xmake/modules/private/action/trybuild/ndkbuild.lua
+++ b/xmake/modules/private/action/trybuild/ndkbuild.lua
@@ -65,7 +65,5 @@ function build()
ndkbuild = ndkbuild .. ".cmd"
end
os.vexecv(ndkbuild, argv, {envs = {NDK_ROOT = ndk}})
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/ninja.lua b/xmake/modules/private/action/trybuild/ninja.lua
index 0dfd7c8c1..894b6af23 100644
--- a/xmake/modules/private/action/trybuild/ninja.lua
+++ b/xmake/modules/private/action/trybuild/ninja.lua
@@ -51,7 +51,5 @@ function build()
table.insert(ninja_argv, "-j")
table.insert(ninja_argv, option.get("jobs"))
os.vexecv(ninja.program, ninja_argv)
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/scons.lua b/xmake/modules/private/action/trybuild/scons.lua
index c39de07c3..926f0b38a 100644
--- a/xmake/modules/private/action/trybuild/scons.lua
+++ b/xmake/modules/private/action/trybuild/scons.lua
@@ -43,7 +43,5 @@ function build()
-- do build
local scons = assert(find_tool("scons"), "scons not found!")
os.vexec(scons.program)
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/modules/private/action/trybuild/xcodebuild.lua b/xmake/modules/private/action/trybuild/xcodebuild.lua
index 00d915a68..f6b76fb1c 100644
--- a/xmake/modules/private/action/trybuild/xcodebuild.lua
+++ b/xmake/modules/private/action/trybuild/xcodebuild.lua
@@ -37,13 +37,11 @@ end
-- do build
function build()
-
+
-- only support the current subsystem host platform now!
assert(is_subhost(config.plat()), "xcodebuild: %s not supported!", config.plat())
-- do build
os.exec("xcodebuild build CODE_SIGN_IDENTITY=\"\" CODE_SIGNING_REQUIRED=NO")
- cprint("${bright}build ok!")
+ cprint("${color.success}build ok!${clear}")
end
-
-
diff --git a/xmake/plugins/doxygen/main.lua b/xmake/plugins/doxygen/main.lua
index 07eeee5a0..69dc969ad 100644
--- a/xmake/plugins/doxygen/main.lua
+++ b/xmake/plugins/doxygen/main.lua
@@ -108,5 +108,5 @@ function main()
-- trace
cprint("${bright green}result: ${default green}%s/html/index.html", outputdir)
- cprint("${bright}doxygen ok!")
+ cprint("${color.success}doxygen ok!${clear}")
end
diff --git a/xmake/plugins/macro/main.lua b/xmake/plugins/macro/main.lua
index c55b4f680..8e286da6e 100644
--- a/xmake/plugins/macro/main.lua
+++ b/xmake/plugins/macro/main.lua
@@ -142,7 +142,7 @@ function _delete(macroname)
end
-- trace
- cprint("${bright}delete macro(%s) ok!", macroname)
+ cprint("${color.success}delete macro(%s) ok!${clear}", macroname)
end
-- import macro
@@ -163,7 +163,7 @@ function _import(macrofile, macroname)
os.cp(macrofile, _wfile(macroname))
-- trace
- cprint("${bright}import macro(%s) ok!", macroname)
+ cprint("${color.success}import macro(%s) ok!${clear}", macroname)
end
else
@@ -171,7 +171,7 @@ function _import(macrofile, macroname)
os.cp(macrofile, _wfile(macroname))
-- trace
- cprint("${bright}import macro(%s) ok!", macroname)
+ cprint("${color.success}import macro(%s) ok!${clear}", macroname)
end
end
@@ -193,7 +193,7 @@ function _export(macrofile, macroname)
os.cp(macrofile, outputdir)
-- trace
- cprint("${bright}export macro(%s) ok!", path.basename(macrofile))
+ cprint("${color.success}export macro(%s) ok!${clear}", path.basename(macrofile))
end
end
else
@@ -201,7 +201,7 @@ function _export(macrofile, macroname)
os.cp(_rfile(macroname), macrofile)
-- trace
- cprint("${bright}export macro(%s) ok!", macroname)
+ cprint("${color.success}export macro(%s) ok!${clear}", macroname)
end
end
@@ -283,7 +283,7 @@ function _end(macroname)
_show(macroname)
-- trace
- cprint("${bright}define macro(%s) ok!", macroname)
+ cprint("${color.success}define macro(%s) ok!${clear}", macroname)
end
-- run macro
diff --git a/xmake/plugins/plugin/main.lua b/xmake/plugins/plugin/main.lua
index 4e028a628..7e488ef1d 100644
--- a/xmake/plugins/plugin/main.lua
+++ b/xmake/plugins/plugin/main.lua
@@ -78,7 +78,7 @@ function _clear()
end
-- trace
- cprint("${bright}clear all installed plugins ok!")
+ cprint("${color.success}clear all installed plugins ok!${clear}")
end
-- main
diff --git a/xmake/plugins/project/main.lua b/xmake/plugins/project/main.lua
index b24a3b47f..af8d7a2cb 100755
--- a/xmake/plugins/project/main.lua
+++ b/xmake/plugins/project/main.lua
@@ -87,5 +87,5 @@ function main()
environment.leave("toolchains")
-- trace
- cprint("${bright}create ok!")
+ cprint("${color.success}create ok!${clear}")
end
diff --git a/xmake/plugins/repo/main.lua b/xmake/plugins/repo/main.lua
index 41f015451..5295728d1 100644
--- a/xmake/plugins/repo/main.lua
+++ b/xmake/plugins/repo/main.lua
@@ -49,7 +49,7 @@ function _add(name, url, branch, is_global)
end
-- trace
- cprint("${bright}add %s repository(%s): %s%s ok!", ifelse(is_global, "global", "local"), name, url, branch and (" " .. branch) or "")
+ cprint("${color.success}add %s repository(%s): %s%s ok!${clear}", ifelse(is_global, "global", "local"), name, url, branch and (" " .. branch) or "")
-- leave environment
environment.leave()
@@ -156,7 +156,7 @@ function _clear(is_global)
end
-- trace
- cprint("${bright}clear %s repositories: ok!", ifelse(is_global, "global", "local"))
+ cprint("${color.success}clear %s repositories: ok!${clear}", ifelse(is_global, "global", "local"))
end
-- list all repositories