add warning and escape verboses

3 files changed, 24 insertions, 4 deletions

diff --git a/xmake/scripts/base/compiler.lua b/xmake/scripts/base/compiler.lua
index af18758a5..2f0ef38b5 100644
--- a/xmake/scripts/base/compiler.lua
+++ b/xmake/scripts/base/compiler.lua
@@ -45,8 +45,9 @@ function compiler._mapflag(module, flag)
 
     -- find and replace it using pattern
     for k, v in pairs(module.mapflags) do
-        if flag:find(k) then
-            return flag:gsub(k, v)
+        local flag_mapped, count = flag:gsub(k, v)
+        if flag_mapped and count ~= 0 then
+            return utils.ifelse(#flag_mapped ~= 0, flag_mapped, nil) 
         end
     end
 
@@ -82,6 +83,21 @@ function compiler._mapflags(module, flags)
     return flags_mapped
 end
 
+-- get the compiler warning flags from name
+function compiler._flag_warning(module, name)
+
+    -- init the flags table
+    local flags = 
+    {
+        none        = "-w"
+    ,   all         = "-Wall"
+    ,   error       = {"-Wall", "-Werror"}
+    }
+
+    -- get it
+    return compiler._mapflags(module, flags[name])
+end
+
 -- get the compiler optimize flags from name
 function compiler._flag_optimize(module, name)
 
@@ -184,6 +200,9 @@ function compiler.make(module, target, srcfile, objfile)
         table.join2(flags, compiler._mapflags(module, target[flag_name]))
     end
 
+    -- append the warning flags from the current project
+    table.join2(flags, compiler._flag_warning(module, target.warning))
+
     -- append the optimize flags from the current project
     table.join2(flags, compiler._flag_optimize(module, target.optimize))
 
diff --git a/xmake/scripts/base/makefile.lua b/xmake/scripts/base/makefile.lua
index b0658bfed..9287c1bae 100644
--- a/xmake/scripts/base/makefile.lua
+++ b/xmake/scripts/base/makefile.lua
@@ -74,7 +74,7 @@ function makefile._make_object(file, target, srcfile, objfile)
 
     -- make body
     file:write(string.format("\t@echo %scompiling%s %s\n", utils.ifelse(ccache, "ccache ", ""), mode, srcfile))
-    file:write(string.format("\t@xmake l $(VERBOSE) verbose \"%s\"\n", cmd:gsub("%s", "%%20"):gsub("=", "%%3d"):gsub("\"", "%%22")))
+    file:write(string.format("\t@xmake l $(VERBOSE) verbose \"%s\"\n", cmd:gsub("[%s=\"]", function (w) return string.format("%%%x", w:byte()) end)))
     file:write(string.format("\t@xmake l mkdir %s\n", path.directory(objfile)))
     file:write(string.format("\t@%s > %s 2>&1\n", cmd, makefile._LOGFILE))
 
@@ -156,7 +156,7 @@ function makefile._make_target(file, name, target)
     -- make body
     local cmd = linker.make(l, target, objfiles, targetfile)
     file:write(string.format("\t@echo linking%s %s\n", mode, path.filename(targetfile)))
-    file:write(string.format("\t@xmake l $(VERBOSE) verbose \"%s\"\n", cmd:gsub("%s", "%%20"):gsub("=", "%%3d"):gsub("\"", "%%22")))
+    file:write(string.format("\t@xmake l $(VERBOSE) verbose \"%s\"\n", cmd:gsub("[%s=\"]", function (w) return string.format("%%%x", w:byte()) end)))
     file:write(string.format("\t@xmake l mkdir %s\n", path.directory(targetfile)))
     file:write(string.format("\t@%s > %s 2>&1\n", cmd, makefile._LOGFILE))
 
diff --git a/xmake/scripts/base/project.lua b/xmake/scripts/base/project.lua
index 03fe0c375..c42d30908 100644
--- a/xmake/scripts/base/project.lua
+++ b/xmake/scripts/base/project.lua
@@ -189,6 +189,7 @@ function project.loadxproj(file)
                         ,   "ldflags" 
                         ,   "shflags" 
                         ,   "defines"
+                        ,   "warning"
                         ,   "optimize"} 
 
     -- init filter