summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2019-01-03 23:14:21 +0800
committerruki <[email protected]>2019-01-03 13:26:08 +0800
commita86d666ba3095bf9da443e782333b66c3aced59d (patch)
tree331d37cfb3d1bc55e5bf434f00f5fa2789336a83
parent7da17d16ef3bf08d1b683f95fcec1c6d48ecdee4 (diff)
fix some warning info
-rw-r--r--xmake/actions/config/scangen.lua2
-rw-r--r--xmake/modules/core/tools/cparser.lua2
-rw-r--r--xmake/modules/core/tools/llvm_rc.lua2
-rw-r--r--xmake/modules/core/tools/nvcc.lua2
-rw-r--r--xmake/modules/core/tools/rc.lua2
-rw-r--r--xmake/modules/core/tools/tcc.lua2
-rw-r--r--xmake/modules/core/tools/windres.lua2
7 files changed, 7 insertions, 7 deletions
diff --git a/xmake/actions/config/scangen.lua b/xmake/actions/config/scangen.lua
index 4aee54cd2..d1f765e85 100644
--- a/xmake/actions/config/scangen.lua
+++ b/xmake/actions/config/scangen.lua
@@ -32,7 +32,7 @@ import("core.language.language")
function main()
-- trace
- cprint("${yellow}xmake.lua not found, scanning files ..")
+ cprint("${color.warning}xmake.lua not found, scanning files ..")
-- scan source files for the current directory
local targetkinds = {}
diff --git a/xmake/modules/core/tools/cparser.lua b/xmake/modules/core/tools/cparser.lua
index ac1f6bb11..a239073d3 100644
--- a/xmake/modules/core/tools/cparser.lua
+++ b/xmake/modules/core/tools/cparser.lua
@@ -231,7 +231,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags)
-- print some warnings
if warnings and #warnings > 0 and (option.get("verbose") or option.get("warning")) then
- cprint("${yellow}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+ cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
end
end
}
diff --git a/xmake/modules/core/tools/llvm_rc.lua b/xmake/modules/core/tools/llvm_rc.lua
index f3ca93b26..86c9270de 100644
--- a/xmake/modules/core/tools/llvm_rc.lua
+++ b/xmake/modules/core/tools/llvm_rc.lua
@@ -83,7 +83,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags)
-- print some warnings
if warnings and #warnings > 0 and option.get("verbose") then
- cprint("${yellow}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+ cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
end
end
}
diff --git a/xmake/modules/core/tools/nvcc.lua b/xmake/modules/core/tools/nvcc.lua
index 6349a65f3..219619d6d 100644
--- a/xmake/modules/core/tools/nvcc.lua
+++ b/xmake/modules/core/tools/nvcc.lua
@@ -258,7 +258,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags)
-- print some warnings
if warnings and #warnings > 0 and (option.get("verbose") or option.get("warning")) then
- cprint("${yellow}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+ cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
end
end
}
diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua
index 96c7f657a..9552355ff 100644
--- a/xmake/modules/core/tools/rc.lua
+++ b/xmake/modules/core/tools/rc.lua
@@ -83,7 +83,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags)
-- print some warnings
if warnings and #warnings > 0 and option.get("verbose") then
- cprint("${yellow}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+ cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
end
end
}
diff --git a/xmake/modules/core/tools/tcc.lua b/xmake/modules/core/tools/tcc.lua
index a9cb1bc8b..fb0c0a2dd 100644
--- a/xmake/modules/core/tools/tcc.lua
+++ b/xmake/modules/core/tools/tcc.lua
@@ -231,7 +231,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags)
-- print some warnings
if warnings and #warnings > 0 and (option.get("verbose") or option.get("warning")) then
- cprint("${yellow}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+ cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
end
end
}
diff --git a/xmake/modules/core/tools/windres.lua b/xmake/modules/core/tools/windres.lua
index fb0c7cda6..313c82bd6 100644
--- a/xmake/modules/core/tools/windres.lua
+++ b/xmake/modules/core/tools/windres.lua
@@ -83,7 +83,7 @@ function _compile1(self, sourcefile, objectfile, dependinfo, flags)
-- print some warnings
if warnings and #warnings > 0 and option.get("verbose") then
- cprint("${yellow}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
+ cprint("${color.warning}%s", table.concat(table.slice(warnings:split('\n'), 1, 8), '\n'))
end
end
}