summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-03 23:16:27 +0800
committerruki <[email protected]>2019-01-03 13:38:47 +0800
commita5d9cb41fef552951bec41ba5f8c4261953f6bd5 (patch)
treea780471e3ccf96d096cdb5366addcf3fbd51d0de
parenta86d666ba3095bf9da443e782333b66c3aced59d (diff)
update some check info
-rw-r--r--xmake/actions/build/trybuild.lua2
-rw-r--r--xmake/actions/update/main.lua4
-rw-r--r--xmake/core/sandbox/modules/import/lib/detect/find_package.lua4
-rw-r--r--xmake/core/sandbox/modules/import/lib/detect/find_programver.lua4
-rw-r--r--xmake/modules/detect/sdks/find_dotnet.lua6
-rw-r--r--xmake/modules/detect/sdks/find_mingw.lua4
-rw-r--r--xmake/modules/detect/sdks/find_ndk.lua8
-rw-r--r--xmake/modules/detect/sdks/find_qt.lua6
-rw-r--r--xmake/modules/detect/sdks/find_vcpkgdir.lua4
-rw-r--r--xmake/modules/detect/sdks/find_wdk.lua6
-rw-r--r--xmake/modules/detect/sdks/find_xcode.lua6
-rw-r--r--xmake/modules/private/platform/check_toolchain.lua4
12 files changed, 29 insertions, 29 deletions
diff --git a/xmake/actions/build/trybuild.lua b/xmake/actions/build/trybuild.lua
index a70161c49..f872470d7 100644
--- a/xmake/actions/build/trybuild.lua
+++ b/xmake/actions/build/trybuild.lua
@@ -82,7 +82,7 @@ end
function main(targetname)
-- trace
- cprint("${yellow}xmake.lua not found, try building ..")
+ cprint("${color.warning}xmake.lua not found, try building ..")
-- enter toolchains environment
environment.enter("toolchains")
diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
index d39d8fc41..ae5d78b0f 100644
--- a/xmake/actions/update/main.lua
+++ b/xmake/actions/update/main.lua
@@ -308,10 +308,10 @@ function main()
}
}
if ok then
- cprint("\r${yellow} => ${clear}download %s .. ${green}ok ", url)
+ cprint("\r${yellow} => ${clear}download %s .. ${color.success}${text.success} ", url)
break
else
- cprint("\r${yellow} => ${clear}download %s .. ${red}failed ", url)
+ cprint("\r${yellow} => ${clear}download %s .. ${color.failure}${text.failure} ", url)
end
if not ok and idx == #mainurls then
raise("download failed!")
diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_package.lua b/xmake/core/sandbox/modules/import/lib/detect/find_package.lua
index b9b7e67ef..b6f1fa838 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_package.lua
+++ b/xmake/core/sandbox/modules/import/lib/detect/find_package.lua
@@ -498,9 +498,9 @@ function sandbox_lib_detect_find_package.main(name, opt)
-- trace
if opt.verbose or option.get("verbose") then
if result then
- utils.cprint("checking for the %s ... ${green}%s", name, result.version and result.version or "ok")
+ utils.cprint("checking for the %s ... ${color.success}%s", name, result.version and result.version or "${text.success}")
else
- utils.cprint("checking for the %s ... ${red}no", name)
+ utils.cprint("checking for the %s ... ${color.nothing}${text.nothing}", name)
end
end
diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua b/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
index cb403069a..24a207691 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
+++ b/xmake/core/sandbox/modules/import/lib/detect/find_programver.lua
@@ -78,7 +78,7 @@ function sandbox_lib_detect_find_programver.main(program, opt)
if type(command) == "function" then
ok, outdata = sandbox.load(command)
if not ok and outdata and option.get("diagnosis") then
- utils.cprint("${yellow}checkinfo: ${clear dim}" .. outdata)
+ utils.cprint("${color.warning}checkinfo: ${clear dim}" .. outdata)
end
else
ok, outdata = os.iorunv(program, {command or "--version"})
@@ -90,7 +90,7 @@ function sandbox_lib_detect_find_programver.main(program, opt)
if type(parse) == "function" then
ok, result = sandbox.load(parse, outdata)
if not ok and result and option.get("diagnosis") then
- utils.cprint("${yellow}checkinfo: ${clear dim}" .. result)
+ utils.cprint("${color.warning}checkinfo: ${clear dim}" .. result)
result = nil
end
elseif parse == nil or type(parse) == "string" then
diff --git a/xmake/modules/detect/sdks/find_dotnet.lua b/xmake/modules/detect/sdks/find_dotnet.lua
index a81e86d7f..266bbff69 100644
--- a/xmake/modules/detect/sdks/find_dotnet.lua
+++ b/xmake/modules/detect/sdks/find_dotnet.lua
@@ -117,14 +117,14 @@ function main(sdkdir, opt)
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the .Net SDK directory ... ${green}%s", dotnet.sdkdir)
- cprint("checking for the .Net SDK version ... ${green}%s", dotnet.sdkver)
+ cprint("checking for the .Net SDK directory ... ${color.success}%s", dotnet.sdkdir)
+ cprint("checking for the .Net SDK version ... ${color.success}%s", dotnet.sdkver)
end
else
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the .Net SDK directory ... ${red}no")
+ cprint("checking for the .Net SDK directory ... ${color.nothing}${text.nothing}")
end
end
diff --git a/xmake/modules/detect/sdks/find_mingw.lua b/xmake/modules/detect/sdks/find_mingw.lua
index 72188a6a7..0fcc2630a 100644
--- a/xmake/modules/detect/sdks/find_mingw.lua
+++ b/xmake/modules/detect/sdks/find_mingw.lua
@@ -107,13 +107,13 @@ function main(sdkdir, opt)
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the mingw directory ... ${green}%s", mingw.sdkdir)
+ cprint("checking for the mingw directory ... ${color.success}%s", mingw.sdkdir)
end
else
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the mingw directory ... ${red}no")
+ cprint("checking for the mingw directory ... ${color.nothing}${text.nothing}")
end
end
diff --git a/xmake/modules/detect/sdks/find_ndk.lua b/xmake/modules/detect/sdks/find_ndk.lua
index 72cde5ded..371ab82a3 100644
--- a/xmake/modules/detect/sdks/find_ndk.lua
+++ b/xmake/modules/detect/sdks/find_ndk.lua
@@ -162,15 +162,15 @@ function main(sdkdir, opt)
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the NDK directory ... ${green}%s", ndk.sdkdir)
- cprint("checking for the SDK version of NDK ... ${green}%s", ndk.sdkver)
- cprint("checking for the toolchains version of NDK ... ${green}%s", ndk.toolchains_ver)
+ cprint("checking for the NDK directory ... ${color.success}%s", ndk.sdkdir)
+ cprint("checking for the SDK version of NDK ... ${color.success}%s", ndk.sdkver)
+ cprint("checking for the toolchains version of NDK ... ${color.success}%s", ndk.toolchains_ver)
end
else
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the NDK directory ... ${red}no")
+ cprint("checking for the NDK directory ... ${color.nothing}${text.nothing}")
end
end
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua
index c89bb810a..2276529df 100644
--- a/xmake/modules/detect/sdks/find_qt.lua
+++ b/xmake/modules/detect/sdks/find_qt.lua
@@ -163,14 +163,14 @@ function main(sdkdir, opt)
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the Qt SDK directory ... ${green}%s", qt.sdkdir)
- cprint("checking for the Qt SDK version ... ${green}%s", qt.sdkver)
+ cprint("checking for the Qt SDK directory ... ${color.success}%s", qt.sdkdir)
+ cprint("checking for the Qt SDK version ... ${color.success}%s", qt.sdkver)
end
else
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the Qt SDK directory ... ${red}no")
+ cprint("checking for the Qt SDK directory ... ${color.nothing}${text.nothing}")
end
end
diff --git a/xmake/modules/detect/sdks/find_vcpkgdir.lua b/xmake/modules/detect/sdks/find_vcpkgdir.lua
index 98aaf55e3..c87754eb6 100644
--- a/xmake/modules/detect/sdks/find_vcpkgdir.lua
+++ b/xmake/modules/detect/sdks/find_vcpkgdir.lua
@@ -91,13 +91,13 @@ function main(sdkdir, opt)
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the vcpkg directory ... ${green}%s", vcpkg)
+ cprint("checking for the vcpkg directory ... ${color.success}%s", vcpkg)
end
else
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the vcpkg directory ... ${red}no")
+ cprint("checking for the vcpkg directory ... ${color.nothing}${text.nothing}")
end
end
diff --git a/xmake/modules/detect/sdks/find_wdk.lua b/xmake/modules/detect/sdks/find_wdk.lua
index 58a362cfa..f8aab64d4 100644
--- a/xmake/modules/detect/sdks/find_wdk.lua
+++ b/xmake/modules/detect/sdks/find_wdk.lua
@@ -180,14 +180,14 @@ function main(sdkdir, opt)
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the WDK directory ... ${green}%s", wdk.sdkdir)
- cprint("checking for the WDK version ... ${green}%s", wdk.sdkver)
+ cprint("checking for the WDK directory ... ${color.success}%s", wdk.sdkdir)
+ cprint("checking for the WDK version ... ${color.success}%s", wdk.sdkver)
end
else
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the WDK directory ... ${red}no")
+ cprint("checking for the WDK directory ... ${color.nothing}${text.nothing}")
end
end
diff --git a/xmake/modules/detect/sdks/find_xcode.lua b/xmake/modules/detect/sdks/find_xcode.lua
index 3eb00bf7e..79b3db49f 100644
--- a/xmake/modules/detect/sdks/find_xcode.lua
+++ b/xmake/modules/detect/sdks/find_xcode.lua
@@ -126,14 +126,14 @@ function main(sdkdir, opt)
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the Xcode directory ... ${green}%s", xcode.sdkdir)
- cprint("checking for the SDK version of Xcode ... ${green}%s", xcode.sdkver)
+ cprint("checking for the Xcode directory ... ${color.success}%s", xcode.sdkdir)
+ cprint("checking for the SDK version of Xcode ... ${color.success}%s", xcode.sdkver)
end
else
-- trace
if opt.verbose or option.get("verbose") then
- cprint("checking for the Xcode directory ... ${red}no")
+ cprint("checking for the Xcode directory ... ${color.nothing}${text.nothing}")
end
end
diff --git a/xmake/modules/private/platform/check_toolchain.lua b/xmake/modules/private/platform/check_toolchain.lua
index 3f38b36d4..e7ccd051c 100644
--- a/xmake/modules/private/platform/check_toolchain.lua
+++ b/xmake/modules/private/platform/check_toolchain.lua
@@ -59,9 +59,9 @@ function _check_tool(config, toolkind, description, name, cross, check)
-- trace
if option.get("verbose") then
if program then
- cprint("checking for %s (%s) ... ${green}%s", description, toolkind, path.filename(program))
+ cprint("${dim}checking for %s (%s) ... ${color.success}%s", description, toolkind, path.filename(program))
else
- cprint("checking for %s (%s: ${red}%s${clear}) ... ${red}no", description, toolkind, name)
+ cprint("${dim}checking for %s (%s: ${bright}%s${clear}) ... ${color.nothing}${text.nothing}", description, toolkind, name)
end
end
end