summaryrefslogtreecommitdiff
path: root/xmake/scripts
diff options
context:
space:
mode:
authorruki <[email protected]>2015-12-15 22:40:25 +0800
committerruki <[email protected]>2015-12-15 22:40:25 +0800
commit686e71f6395ea37d2c496e189cc18380841083b2 (patch)
tree2dfef3e61471fb201610d75a9217264b714cbc8d /xmake/scripts
parentda041a08d3e2faf3bdb88e9699af4a54f7a50f99 (diff)
add more verbose info
Diffstat (limited to 'xmake/scripts')
-rw-r--r--xmake/scripts/base/compiler.lua6
-rw-r--r--xmake/scripts/base/linker.lua2
-rw-r--r--xmake/scripts/base/project.lua14
3 files changed, 11 insertions, 11 deletions
diff --git a/xmake/scripts/base/compiler.lua b/xmake/scripts/base/compiler.lua
index 22e7d8e53..530c70a29 100644
--- a/xmake/scripts/base/compiler.lua
+++ b/xmake/scripts/base/compiler.lua
@@ -464,7 +464,7 @@ function compiler.check_include(opt, include, srcpath, objpath)
if not module then return end
-- execute the compile command
- return module:main(compiler._make_for_option(module, opt, srcpath, objpath, xmake._NULDEV))
+ return module:main(compiler._make_for_option(module, opt, srcpath, objpath, utils.ifelse(xmake._OPTIONS.verbose, nil, xmake._NULDEV)))
end
-- check function for the project option
@@ -508,7 +508,7 @@ function compiler.check_function(opt, interface, srcpath, objpath)
srcfile:close()
-- execute the compile command
- return module:main(compiler._make_for_option(module, opt, srcpath, objpath, xmake._NULDEV))
+ return module:main(compiler._make_for_option(module, opt, srcpath, objpath, utils.ifelse(xmake._OPTIONS.verbose, nil, xmake._NULDEV)))
end
-- check typedef for the project option
@@ -552,7 +552,7 @@ function compiler.check_typedef(opt, typedef, srcpath, objpath)
srcfile:close()
-- execute the compile command
- return module:main(compiler._make_for_option(module, opt, srcpath, objpath, xmake._NULDEV))
+ return module:main(compiler._make_for_option(module, opt, srcpath, objpath, utils.ifelse(xmake._OPTIONS.verbose, nil, xmake._NULDEV)))
end
-- return module: compiler
diff --git a/xmake/scripts/base/linker.lua b/xmake/scripts/base/linker.lua
index 4d7d92248..0c4fdb54f 100644
--- a/xmake/scripts/base/linker.lua
+++ b/xmake/scripts/base/linker.lua
@@ -373,7 +373,7 @@ function linker.check_links(opt, links, sourcefile, objectfile, targetfile)
linker._addflags_from_linker(module, flags, "ldflags")
-- execute the link command
- return module:main(module:command_link(objectfile, targetfile, table.concat(flags, " "):trim(), xmake._NULDEV))
+ return module:main(module:command_link(objectfile, targetfile, table.concat(flags, " "):trim(), utils.ifelse(xmake._OPTIONS.verbose, nil, xmake._NULDEV)))
end
-- return module: linker
diff --git a/xmake/scripts/base/project.lua b/xmake/scripts/base/project.lua
index c9d7bd9b3..d7f81776a 100644
--- a/xmake/scripts/base/project.lua
+++ b/xmake/scripts/base/project.lua
@@ -674,7 +674,7 @@ function project._make_option_for_checking_links(opt, links, cfile, objectfile,
if ok then ok = linker.check_links(opt, links, cfile, objectfile, targetfile) end
-- trace
- utils.verbose("checking for the links %s ... %s", links_str, utils.ifelse(ok, "ok", "no"))
+ utils.printf("checking for the links %s ... %s", links_str, utils.ifelse(ok, "ok", "no"))
-- cache the result
project._CHECKED_LINKS[links_str] = ok
@@ -697,7 +697,7 @@ function project._make_option_for_checking_cincludes(opt, cincludes, cfile, obje
local ok = compiler.check_include(opt, cinclude, cfile, objectfile)
-- trace
- utils.verbose("checking for the c include %s ... %s", cinclude, utils.ifelse(ok, "ok", "no"))
+ utils.printf("checking for the c include %s ... %s", cinclude, utils.ifelse(ok, "ok", "no"))
-- cache the result
project._CHECKED_CINCLUDES[cinclude] = ok
@@ -724,7 +724,7 @@ function project._make_option_for_checking_cxxincludes(opt, cxxincludes, cxxfile
local ok = compiler.check_include(opt, cxxinclude, cxxfile, objectfile)
-- trace
- utils.verbose("checking for the c++ include %s ... %s", cxxinclude, utils.ifelse(ok, "ok", "no"))
+ utils.printf("checking for the c++ include %s ... %s", cxxinclude, utils.ifelse(ok, "ok", "no"))
-- cache the result
project._CHECKED_CXXINCLUDES[cxxinclude] = ok
@@ -750,7 +750,7 @@ function project._make_option_for_checking_cfuncs(opt, cfuncs, cfile, objectfile
if ok and opt.links then ok = linker.check_links(opt, opt.links, cfile, objectfile, targetfile) end
-- trace
- utils.verbose("checking for the c function %s ... %s", cfunc, utils.ifelse(ok, "ok", "no"))
+ utils.printf("checking for the c function %s ... %s", cfunc, utils.ifelse(ok, "ok", "no"))
-- failed
if not ok then return false end
@@ -773,7 +773,7 @@ function project._make_option_for_checking_cxxfuncs(opt, cxxfuncs, cxxfile, obje
if ok and opt.links then ok = linker.check_links(opt, opt.links, cxxfile, objectfile, targetfile) end
-- trace
- utils.verbose("checking for the c++ function %s ... %s", cxxfunc, utils.ifelse(ok, "ok", "no"))
+ utils.printf("checking for the c++ function %s ... %s", cxxfunc, utils.ifelse(ok, "ok", "no"))
-- failed
if not ok then return false end
@@ -793,7 +793,7 @@ function project._make_option_for_checking_ctypes(opt, ctypes, cfile, objectfile
local ok = compiler.check_typedef(opt, ctype, cfile, objectfile)
-- trace
- utils.verbose("checking for the c type %s ... %s", ctype, utils.ifelse(ok, "ok", "no"))
+ utils.printf("checking for the c type %s ... %s", ctype, utils.ifelse(ok, "ok", "no"))
-- failed
if not ok then return false end
@@ -813,7 +813,7 @@ function project._make_option_for_checking_cxxtypes(opt, cxxtypes, cxxfile, obje
local ok = compiler.check_typedef(opt, cxxtype, cxxfile, objectfile)
-- trace
- utils.verbose("checking for the c++ type %s ... %s", cxxtype, utils.ifelse(ok, "ok", "no"))
+ utils.printf("checking for the c++ type %s ... %s", cxxtype, utils.ifelse(ok, "ok", "no"))
-- failed
if not ok then return false end