add colors for verbose info

4 files changed, 29 insertions, 20 deletions

diff --git a/xmake/core/project/option.lua b/xmake/core/project/option.lua
index a7bc756de..880926f93 100644
--- a/xmake/core/project/option.lua
+++ b/xmake/core/project/option.lua
@@ -54,7 +54,7 @@ function option:_check_link(sourcefile, objectfile, targetfile)
     -- attempt to run this command
     local ok, errors = instance:link(objectfile, targetfile, self)
     if not ok and option_.get("verbose") then
-        print(errors)
+        utils.cprint("${red}" .. (errors or ""))
     end
 
     -- ok?
@@ -96,7 +96,7 @@ function option:_check_include(include, srcpath, objpath)
     -- attempt to run this command
     local ok, errors = instance:compile(srcpath, objpath, nil, self)
     if not ok and option_.get("verbose") then
-        print(errors)
+        utils.cprint("${red}" .. (errors or ""))
     end
 
     -- ok?
@@ -150,7 +150,7 @@ function option:_check_function(checkcode, srcpath, objpath)
     -- execute the compile command
     local ok, errors = instance:compile(srcpath, objpath, nil, self)
     if not ok and option_.get("verbose") then
-        print(errors)
+        utils.cprint("${red}" .. (errors or ""))
     end
 
     -- ok?
@@ -204,7 +204,7 @@ function option:_check_typedef(typedef, srcpath, objpath)
     -- execute the compile command
     local ok, errors = instance:compile(srcpath, objpath, nil, self)
     if not ok and option_.get("verbose") then
-        print(errors)
+        utils.cprint("${red}" .. (errors or ""))
     end
 
     -- ok?
@@ -236,7 +236,7 @@ function option:_check_links(cfile, objectfile, targetfile)
     if ok then ok = self:_check_link(cfile, objectfile, targetfile) end
 
     -- trace
-    utils.print("checking for the links %s ... %s", links_str, utils.ifelse(ok, "ok", "no"))
+    utils.cprint("checking for the links %s ... %s", links_str, utils.ifelse(ok, "${green}ok", "${red}no"))
 
     -- cache the result
     option._CHECKED_LINKS[links_str] = ok
@@ -259,7 +259,7 @@ function option:_check_cincludes(cfile, objectfile)
         local ok = self:_check_include(cinclude, cfile, objectfile)
 
         -- trace
-        utils.print("checking for the c include %s ... %s", cinclude, utils.ifelse(ok, "ok", "no"))
+        utils.cprint("checking for the c include %s ... %s", cinclude, utils.ifelse(ok, "${green}ok", "${red}no"))
 
         -- cache the result
         option._CHECKED_CINCLUDES[cinclude] = ok
@@ -286,7 +286,7 @@ function option:_check_cxxincludes(cxxfile, objectfile)
         local ok = self:_check_include(cxxinclude, cxxfile, objectfile)
 
         -- trace
-        utils.print("checking for the c++ include %s ... %s", cxxinclude, utils.ifelse(ok, "ok", "no"))
+        utils.cprint("checking for the c++ include %s ... %s", cxxinclude, utils.ifelse(ok, "${green}ok", "${red}no"))
 
         -- cache the result
         option._CHECKED_CXXINCLUDES[cxxinclude] = ok
@@ -316,7 +316,7 @@ function option:_check_cfuncs(cfile, objectfile, targetfile)
         if ok and self:get("links") then ok = self:_check_link(cfile, objectfile, targetfile) end
 
         -- trace
-        utils.print("checking for the c function %s ... %s", checkname, utils.ifelse(ok, "ok", "no"))
+        utils.cprint("checking for the c function %s ... %s", checkname, utils.ifelse(ok, "${green}ok", "${red}no"))
 
         -- failed
         if not ok then return false end
@@ -343,7 +343,7 @@ function option:_check_cxxfuncs(cxxfile, objectfile, targetfile)
         if ok and self:get("links") then ok = self:_check_link(cxxfile, objectfile, targetfile) end
 
         -- trace
-        utils.print("checking for the c++ function %s ... %s", checkname, utils.ifelse(ok, "ok", "no"))
+        utils.cprint("checking for the c++ function %s ... %s", checkname, utils.ifelse(ok, "${green}ok", "${red}no"))
 
         -- failed
         if not ok then return false end
@@ -363,7 +363,7 @@ function option:_check_ctypes(cfile, objectfile, targetfile)
         local ok = self:_check_typedef(ctype, cfile, objectfile)
 
         -- trace
-        utils.print("checking for the c type %s ... %s", ctype, utils.ifelse(ok, "ok", "no"))
+        utils.cprint("checking for the c type %s ... %s", ctype, utils.ifelse(ok, "${green}ok", "${red}no"))
 
         -- failed
         if not ok then return false end
@@ -383,7 +383,7 @@ function option:_check_cxxtypes(cxxfile, objectfile, targetfile)
         local ok = self:_check_typedef(cxxtype, cxxfile, objectfile)
 
         -- trace
-        utils.print("checking for the c++ type %s ... %s", cxxtype, utils.ifelse(ok, "ok", "no"))
+        utils.cprint("checking for the c++ type %s ... %s", cxxtype, utils.ifelse(ok, "${green}ok", "${red}no"))
 
         -- failed
         if not ok then return false end
diff --git a/xmake/core/tool/archiver.lua b/xmake/core/tool/archiver.lua
index 3b0873ffe..2b539ca33 100644
--- a/xmake/core/tool/archiver.lua
+++ b/xmake/core/tool/archiver.lua
@@ -29,6 +29,7 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local table     = require("base/table")
 local string    = require("base/string")
+local option    = require("base/option")
 local config    = require("project/config")
 local sandbox   = require("sandbox/sandbox")
 local platform  = require("platform/platform")
@@ -273,9 +274,11 @@ function archiver:check(flags)
     local ok, errors = sandbox.load(ltool.check, flags)
 
     -- trace
-    utils.verbose("checking for the flags %s ... %s", flags, utils.ifelse(ok, "ok", "no"))
-    if not ok then
-        utils.verbose(errors)
+    if option.get("verbose") then
+        utils.cprint("checking for the flags %s ... %s", flags, utils.ifelse(ok, "${green}ok", "${red}no"))
+        if not ok then
+            utils.cprint("${red}" .. errors or "")
+        end
     end
 
     -- save the checked result
diff --git a/xmake/core/tool/compiler.lua b/xmake/core/tool/compiler.lua
index 2de971c73..1f983b60a 100644
--- a/xmake/core/tool/compiler.lua
+++ b/xmake/core/tool/compiler.lua
@@ -29,6 +29,7 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local table     = require("base/table")
 local string    = require("base/string")
+local option    = require("base/option")
 local tool      = require("tool/tool")
 local config    = require("project/config")
 local sandbox   = require("sandbox/sandbox")
@@ -466,9 +467,11 @@ function compiler:check(flags)
     local ok, errors = sandbox.load(ctool.check, flags)
 
     -- trace
-    utils.verbose("checking for the flags %s ... %s", flags, utils.ifelse(ok, "ok", "no"))
-    if not ok then
-        utils.verbose(errors)
+    if option.get("verbose") then
+        utils.cprint("checking for the flags %s ... %s", flags, utils.ifelse(ok, "${green}ok", "${red}no"))
+        if not ok then
+            utils.cprint("${red}" .. errors or "")
+        end
     end
 
     -- save the checked result
diff --git a/xmake/core/tool/linker.lua b/xmake/core/tool/linker.lua
index cca0d8275..5d01bd3cd 100644
--- a/xmake/core/tool/linker.lua
+++ b/xmake/core/tool/linker.lua
@@ -29,6 +29,7 @@ local path      = require("base/path")
 local utils     = require("base/utils")
 local table     = require("base/table")
 local string    = require("base/string")
+local option    = require("base/option")
 local config    = require("project/config")
 local sandbox   = require("sandbox/sandbox")
 local platform  = require("platform/platform")
@@ -391,9 +392,11 @@ function linker:check(flags)
     local ok, errors = sandbox.load(ltool.check, flags)
 
     -- trace
-    utils.verbose("checking for the flags %s ... %s", flags, utils.ifelse(ok, "ok", "no"))
-    if not ok then
-        utils.verbose(errors)
+    if option.get("verbose") then
+        utils.cprint("checking for the flags %s ... %s", flags, utils.ifelse(ok, "${green}ok", "${red}no"))
+        if not ok then
+            utils.cprint("${red}" .. errors or "")
+        end
     end
 
     -- save the checked result