modify interfaces for xmake.lua

28 files changed, 274 insertions, 131 deletions

diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua
index db1d95d2e..f5d454dc2 100644
--- a/xmake/core/base/interpreter.lua
+++ b/xmake/core/base/interpreter.lua
@@ -78,7 +78,7 @@ function interpreter._api_register_xxx_scope(self, action, apifunc, ...)
 
     -- check
     assert(self and self._PUBLIC and self._PRIVATE)
-    assert(action and apifunc)
+    assert(apifunc)
 
     -- done
     for _, apiname in ipairs({...}) do
@@ -86,8 +86,14 @@ function interpreter._api_register_xxx_scope(self, action, apifunc, ...)
         -- check
         assert(apiname)
 
+        -- the full name
+        local fullname = apiname
+        if action ~= nil then
+            fullname = action .. "_" .. apiname
+        end
+
         -- register scope api
-        self:api_register(action .. "_" .. apiname, function (self, ...) 
+        self:api_register(fullname, function (self, ...) 
        
             -- check
             assert(self and self._PRIVATE and apiname)
@@ -533,9 +539,9 @@ function interpreter.api_register_builtin(self, name, func)
     self._PUBLIC[name] = func
 end
 
--- register api for def_scope()
+-- register api for scope()
 --
--- interp:api_register_def_scope("scope_kind1", "scope_kind2")
+-- interp:api_register_scope("scope_kind1", "scope_kind2")
 --
 -- api:
 --   set_$(scope_kind1)("scope_name1")
@@ -573,7 +579,7 @@ end
 --      }
 -- }
 --
-function interpreter.api_register_def_scope(self, ...)
+function interpreter.api_register_scope(self, ...)
 
     -- check
     assert(self)
@@ -597,7 +603,7 @@ function interpreter.api_register_def_scope(self, ...)
     end
 
     -- register implementation
-    self:_api_register_xxx_scope("def", implementation, ...)
+    self:_api_register_xxx_scope(nil, implementation, ...)
 end
 
 -- TODO: deprecated
@@ -616,7 +622,7 @@ function interpreter.api_register_set_scope(self, ...)
 
         -- warning
         if not scope_name:startswith("__") then
-            utils.warning("please uses def_%s(\"%s\"), \"set_%s\" has been deprecated!", scope_kind, scope_name, scope_kind)
+            utils.warning("please uses %s(\"%s\"), \"set_%s\" has been deprecated!", scope_kind, scope_name, scope_kind)
         end
 
         -- check 
@@ -657,7 +663,7 @@ function interpreter.api_register_add_scope(self, ...)
 
         -- warning
         if not scope_name:startswith("__") then
-            utils.warning("please uses def_%s(\"%s\"), \"add_%s\" has been deprecated!", scope_kind, scope_name, scope_kind)
+            utils.warning("please uses %s(\"%s\"), \"add_%s\" has been deprecated!", scope_kind, scope_name, scope_kind)
         end
 
         -- check 
diff --git a/xmake/core/base/package.lua b/xmake/core/base/package.lua
index 5290ea47f..143546299 100644
--- a/xmake/core/base/package.lua
+++ b/xmake/core/base/package.lua
@@ -97,7 +97,7 @@ function package._done_library(target)
         -- the xmake.lua template content
         local template = [[ 
 -- add [targetname] package
-def_option("[targetname]")
+option("[targetname]")
 
     -- show menu
     set_option_showmenu(true)
diff --git a/xmake/core/base/project.lua b/xmake/core/base/project.lua
index 3aeefd244..d50afe4cc 100644
--- a/xmake/core/base/project.lua
+++ b/xmake/core/base/project.lua
@@ -38,7 +38,7 @@ local platform      = require("base/platform")
 local interpreter   = require("base/interpreter")
 
 -- the current os is belong to the given os?
-function project._api_os(interp, ...)
+function project._api_is_os(interp, ...)
 
     -- get the current os
     local os = platform.os()
@@ -53,7 +53,7 @@ function project._api_os(interp, ...)
 end
 
 -- the current mode is belong to the given modes?
-function project._api_modes(interp, ...)
+function project._api_is_mode(interp, ...)
 
     -- get the current mode
     local mode = config.get("mode")
@@ -68,7 +68,7 @@ function project._api_modes(interp, ...)
 end
 
 -- the current platform is belong to the given platforms?
-function project._api_plats(interp, ...)
+function project._api_is_plat(interp, ...)
 
     -- get the current platform
     local plat = config.get("plat")
@@ -83,7 +83,7 @@ function project._api_plats(interp, ...)
 end
 
 -- the current platform is belong to the given architectures?
-function project._api_archs(interp, ...)
+function project._api_is_arch(interp, ...)
 
     -- get the current architecture
     local arch = config.get("arch")
@@ -98,7 +98,7 @@ function project._api_archs(interp, ...)
 end
 
 -- the current kind is belong to the given kinds?
-function project._api_kinds(interp, ...)
+function project._api_is_kind(interp, ...)
 
     -- get the current kind
     local kind = config.get("kind")
@@ -113,7 +113,7 @@ function project._api_kinds(interp, ...)
 end
 
 -- enable options?
-function project._api_options(interp, ...)
+function project._api_is_option(interp, ...)
 
     -- some options are enabled?
     for _, o in ipairs(table.join(...)) do
@@ -123,6 +123,144 @@ function project._api_options(interp, ...)
     end
 end
 
+-- TODO: deprecated
+-- the current os is belong to the given os?
+function project._api_os(interp, ...)
+
+    -- make values
+    local values = ""
+    for _, v in ipairs(table.join(...)) do
+        if v and type(v) == "string" then
+            if #values == 0 then
+                values = v
+            else
+                values = values .. ", " .. v
+            end
+        end
+    end
+
+    -- warning
+    utils.warning("please uses is_os(\"%s\"), \"os()\" has been deprecated!", values)
+
+    -- done
+    return project._api_is_os(interp, ...)
+end
+
+-- TODO: deprecated
+-- the current mode is belong to the given modes?
+function project._api_modes(interp, ...)
+
+    -- make values
+    local values = ""
+    for _, v in ipairs(table.join(...)) do
+        if v and type(v) == "string" then
+            if #values == 0 then
+                values = v
+            else
+                values = values .. ", " .. v
+            end
+        end
+    end
+
+    -- warning
+    utils.warning("please uses is_mode(\"%s\"), \"modes()\" has been deprecated!", values)
+
+    -- done
+    return project._api_is_mode(interp, ...)
+end
+
+-- TODO: deprecated
+-- the current platform is belong to the given platforms?
+function project._api_plats(interp, ...)
+
+    -- make values
+    local values = ""
+    for _, v in ipairs(table.join(...)) do
+        if v and type(v) == "string" then
+            if #values == 0 then
+                values = v
+            else
+                values = values .. ", " .. v
+            end
+        end
+    end
+
+    -- warning
+    utils.warning("please uses is_plat(\"%s\"), \"plats()\" has been deprecated!", values)
+
+    -- done
+    return project._api_is_plat(interp, ...)
+end
+
+-- TODO: deprecated
+-- the current platform is belong to the given architectures?
+function project._api_archs(interp, ...)
+
+    -- make values
+    local values = ""
+    for _, v in ipairs(table.join(...)) do
+        if v and type(v) == "string" then
+            if #values == 0 then
+                values = v
+            else
+                values = values .. ", " .. v
+            end
+        end
+    end
+
+    -- warning
+    utils.warning("please uses is_arch(\"%s\"), \"archs()\" has been deprecated!", values)
+
+    -- done
+    return project._api_is_arch(interp, ...)
+end
+
+-- TODO: deprecated
+-- the current kind is belong to the given kinds?
+function project._api_kinds(interp, ...)
+
+    -- make values
+    local values = ""
+    for _, v in ipairs(table.join(...)) do
+        if v and type(v) == "string" then
+            if #values == 0 then
+                values = v
+            else
+                values = values .. ", " .. v
+            end
+        end
+    end
+
+    -- warning
+    utils.warning("please uses is_kind(\"%s\"), \"kinds()\" has been deprecated!", values)
+
+    -- done
+    return project._api_is_kind(interp, ...)
+end
+
+-- TODO: deprecated
+-- enable options?
+function project._api_options(interp, ...)
+
+    -- make values
+    local values = ""
+    for _, v in ipairs(table.join(...)) do
+        if v and type(v) == "string" then
+            if #values == 0 then
+                values = v
+            else
+                values = values .. ", " .. v
+            end
+        end
+    end
+
+    -- warning
+    utils.warning("please uses is_option(\"%s\"), \"options()\" has been deprecated!", values)
+
+    -- done
+    return project._api_is_option(interp, ...)
+end
+
 -- add c function
 function project._api_add_cfunc(interp, module, alias, links, includes, cfunc)
 
@@ -149,7 +287,7 @@ function project._api_add_cfunc(interp, module, alias, links, includes, cfunc)
     local scope = interp:scope_save()
 
     -- make option
-    interp:api_call("def_option", name)
+    interp:api_call("option", name)
     interp:api_call("set_option_category", "cfuncs")
     interp:api_call("add_option_cfuncs", cfunc)
     if links then interp:api_call("add_option_links", links) end
@@ -195,7 +333,7 @@ function project._api_add_cfuncs(interp, module, links, includes, ...)
         local scope = interp:scope_save()
 
         -- make option
-        interp:api_call("def_option", name)
+        interp:api_call("option", name)
         interp:api_call("set_option_category", "cfuncs")
         interp:api_call("add_option_cfuncs", cfunc)
         if links then interp:api_call("add_option_links", links) end
@@ -236,7 +374,7 @@ function project._api_add_cxxfunc(interp, module, alias, links, includes, cxxfun
     local scope = interp:scope_save()
 
     -- make option
-    interp:api_call("def_option", name)
+    interp:api_call("option", name)
     interp:api_call("set_option_category", "cxxfuncs")
     interp:api_call("add_option_cxxfuncs", cxxfunc)
     if links then interp:api_call("add_option_links", links) end
@@ -282,7 +420,7 @@ function project._api_add_cxxfuncs(interp, module, links, includes, ...)
         local scope = interp:scope_save()
 
         -- make option
-        interp:api_call("def_option", name)
+        interp:api_call("option", name)
         interp:api_call("set_option_category", "cxxfuncs")
         interp:api_call("add_option_cxxfuncs", cxxfunc)
         if links then interp:api_call("add_option_links", links) end
@@ -331,8 +469,8 @@ function project._interpreter()
     interp:api_register_set_scope("target", "option")
     interp:api_register_add_scope("target", "option")
     
-    -- register api: def_target() and def_option()
-    interp:api_register_def_scope("target", "option")
+    -- register api: target() and option()
+    interp:api_register_scope("target", "option")
 
     -- register api: set_script() for target
     interp:api_register_set_script("target", nil,           "runscript"
@@ -416,24 +554,23 @@ function project._interpreter()
                                                         ,   "includedirs")
 
 
-    -- register api: os()
+    -- TODO: deprecated
+    -- register api: os(), kinds(), modes(), plats(), archs(), options()
     interp:api_register("os", project._api_os)
-
-    -- register api: kinds()
     interp:api_register("kinds", project._api_kinds)
-
-    -- register api: modes()
     interp:api_register("modes", project._api_modes)
-
-    -- register api: plats()
     interp:api_register("plats", project._api_plats)
-
-    -- register api: archs()
     interp:api_register("archs", project._api_archs)
-
-    -- register api: options()
     interp:api_register("options", project._api_options)
 
+    -- register api: is_os(), is_kind(), is_mode(), is_plat(), is_arch(), is_option()
+    interp:api_register("is_os", project._api_is_os)
+    interp:api_register("is_kind", project._api_is_kind)
+    interp:api_register("is_mode", project._api_is_mode)
+    interp:api_register("is_plat", project._api_is_plat)
+    interp:api_register("is_arch", project._api_is_arch)
+    interp:api_register("is_option", project._api_is_option)
+
     -- register api: add_cfunc()
     interp:api_register("add_cfunc", project._api_add_cfunc)
 
diff --git a/xmake/templates/c++/console/project/xmake.lua b/xmake/templates/c++/console/project/xmake.lua
index 3491b4fd7..bc427742c 100644
--- a/xmake/templates/c++/console/project/xmake.lua
+++ b/xmake/templates/c++/console/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -22,7 +22,7 @@ if modes("release") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c++/console_tbox/project/src/xmake.lua b/xmake/templates/c++/console_tbox/project/src/xmake.lua
index eb49c4706..0a6bf6034 100644
--- a/xmake/templates/c++/console_tbox/project/src/xmake.lua
+++ b/xmake/templates/c++/console_tbox/project/src/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c++/console_tbox/project/xmake.lua b/xmake/templates/c++/console_tbox/project/xmake.lua
index 9a7c001e5..aab73814f 100644
--- a/xmake/templates/c++/console_tbox/project/xmake.lua
+++ b/xmake/templates/c++/console_tbox/project/xmake.lua
@@ -12,7 +12,7 @@ add_cxflags("-Wno-error=deprecated-declarations")
 add_mxflags("-Wno-error=deprecated-declarations")
 
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -24,18 +24,18 @@ if modes("debug") then
     add_defines("__tb_debug__")
 
     -- attempt to enable some checkers for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
         add_cxflags("-fsanitize=address", "-ftrapv")
         add_mxflags("-fsanitize=address", "-ftrapv")
         add_ldflags("-fsanitize=address")
     end
 end
 
--- the release or profile modes
-if modes("release", "profile") then
+-- the release or profile is_mode
+if is_mode("release", "profile") then
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
         
         -- set the symbols visibility: hidden
         set_symbols("hidden")
@@ -56,7 +56,7 @@ if modes("release", "profile") then
     end
 
     -- for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
  
         -- enable fastest optimization
         set_optimize("fastest")
@@ -72,7 +72,7 @@ if modes("release", "profile") then
 end
 
 -- for embed
-if not archs("i386", "x86_64") then
+if not is_arch("i386", "x86_64") then
 
     -- add defines for small
     add_defines("__tb_small__")
@@ -85,13 +85,13 @@ end
 if plats("windows") then 
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
 
         -- link libcmt.lib
         add_cxflags("-MT") 
 
     -- the debug mode
-    elseif modes("debug") then
+    elseif is_mode("debug") then
 
         -- enable some checkers
         add_cxflags("-Gs", "-RTC1") 
diff --git a/xmake/templates/c++/shared_library/project/xmake.lua b/xmake/templates/c++/shared_library/project/xmake.lua
index a8f13b901..ee3579a6c 100644
--- a/xmake/templates/c++/shared_library/project/xmake.lua
+++ b/xmake/templates/c++/shared_library/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -22,7 +22,7 @@ if modes("release") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("shared")
@@ -31,7 +31,7 @@ def_target("[targetname]")
     add_files("src/interface.cpp") 
 
 -- add target
-def_target("test")
+target("test")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c++/shared_library_tbox/project/src/_demo/xmake.lua
index d2b9ae2e9..354b01a3c 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c++/shared_library_tbox/project/src/_demo/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("demo")
+target("demo")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua
index 608fb2455..7b38208d5 100644
--- a/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c++/shared_library_tbox/project/src/_library/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("shared")
diff --git a/xmake/templates/c++/shared_library_tbox/project/xmake.lua b/xmake/templates/c++/shared_library_tbox/project/xmake.lua
index 61e135480..20ab67394 100644
--- a/xmake/templates/c++/shared_library_tbox/project/xmake.lua
+++ b/xmake/templates/c++/shared_library_tbox/project/xmake.lua
@@ -12,7 +12,7 @@ add_cxflags("-Wno-error=deprecated-declarations")
 add_mxflags("-Wno-error=deprecated-declarations")
 
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -24,18 +24,18 @@ if modes("debug") then
     add_defines("__tb_debug__")
 
     -- attempt to enable some checkers for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
         add_cxflags("-fsanitize=address", "-ftrapv")
         add_mxflags("-fsanitize=address", "-ftrapv")
         add_ldflags("-fsanitize=address")
     end
 end
 
--- the release or profile modes
-if modes("release", "profile") then
+-- the release or profile is_mode
+if is_mode("release", "profile") then
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
         
         -- set the symbols visibility: hidden
         set_symbols("hidden")
@@ -56,7 +56,7 @@ if modes("release", "profile") then
     end
 
     -- for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
  
         -- enable fastest optimization
         set_optimize("fastest")
@@ -72,7 +72,7 @@ if modes("release", "profile") then
 end
 
 -- for embed
-if not archs("i386", "x86_64") then
+if not is_arch("i386", "x86_64") then
 
     -- add defines for small
     add_defines("__tb_small__")
@@ -85,13 +85,13 @@ end
 if plats("windows") then 
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
 
         -- link libcmt.lib
         add_cxflags("-MT") 
 
     -- the debug mode
-    elseif modes("debug") then
+    elseif is_mode("debug") then
 
         -- enable some checkers
         add_cxflags("-Gs", "-RTC1") 
@@ -105,7 +105,7 @@ if plats("windows") then
 end
 
 -- add option: demo
-def_option("demo")
+option("demo")
     set_option_enable(true)
     set_option_showmenu(true)
     set_option_category("option")
diff --git a/xmake/templates/c++/static_library/project/xmake.lua b/xmake/templates/c++/static_library/project/xmake.lua
index 4f088bf9e..7c7a96cb0 100644
--- a/xmake/templates/c++/static_library/project/xmake.lua
+++ b/xmake/templates/c++/static_library/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -22,7 +22,7 @@ if modes("release") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("static")
@@ -31,7 +31,7 @@ def_target("[targetname]")
     add_files("src/interface.cpp") 
 
 -- add target
-def_target("test")
+target("test")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c++/static_library_tbox/project/src/_demo/xmake.lua
index d2b9ae2e9..354b01a3c 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c++/static_library_tbox/project/src/_demo/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("demo")
+target("demo")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua
index 4a975ad66..b1b357397 100644
--- a/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c++/static_library_tbox/project/src/_library/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("static")
diff --git a/xmake/templates/c++/static_library_tbox/project/xmake.lua b/xmake/templates/c++/static_library_tbox/project/xmake.lua
index 61e135480..20ab67394 100644
--- a/xmake/templates/c++/static_library_tbox/project/xmake.lua
+++ b/xmake/templates/c++/static_library_tbox/project/xmake.lua
@@ -12,7 +12,7 @@ add_cxflags("-Wno-error=deprecated-declarations")
 add_mxflags("-Wno-error=deprecated-declarations")
 
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -24,18 +24,18 @@ if modes("debug") then
     add_defines("__tb_debug__")
 
     -- attempt to enable some checkers for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
         add_cxflags("-fsanitize=address", "-ftrapv")
         add_mxflags("-fsanitize=address", "-ftrapv")
         add_ldflags("-fsanitize=address")
     end
 end
 
--- the release or profile modes
-if modes("release", "profile") then
+-- the release or profile is_mode
+if is_mode("release", "profile") then
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
         
         -- set the symbols visibility: hidden
         set_symbols("hidden")
@@ -56,7 +56,7 @@ if modes("release", "profile") then
     end
 
     -- for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
  
         -- enable fastest optimization
         set_optimize("fastest")
@@ -72,7 +72,7 @@ if modes("release", "profile") then
 end
 
 -- for embed
-if not archs("i386", "x86_64") then
+if not is_arch("i386", "x86_64") then
 
     -- add defines for small
     add_defines("__tb_small__")
@@ -85,13 +85,13 @@ end
 if plats("windows") then 
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
 
         -- link libcmt.lib
         add_cxflags("-MT") 
 
     -- the debug mode
-    elseif modes("debug") then
+    elseif is_mode("debug") then
 
         -- enable some checkers
         add_cxflags("-Gs", "-RTC1") 
@@ -105,7 +105,7 @@ if plats("windows") then
 end
 
 -- add option: demo
-def_option("demo")
+option("demo")
     set_option_enable(true)
     set_option_showmenu(true)
     set_option_category("option")
diff --git a/xmake/templates/c/console/project/xmake.lua b/xmake/templates/c/console/project/xmake.lua
index c858ef1e5..d29179e0f 100644
--- a/xmake/templates/c/console/project/xmake.lua
+++ b/xmake/templates/c/console/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -22,7 +22,7 @@ if modes("release") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c/console_tbox/project/src/xmake.lua b/xmake/templates/c/console_tbox/project/src/xmake.lua
index 5270285f8..08f5e89d1 100644
--- a/xmake/templates/c/console_tbox/project/src/xmake.lua
+++ b/xmake/templates/c/console_tbox/project/src/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c/console_tbox/project/xmake.lua b/xmake/templates/c/console_tbox/project/xmake.lua
index 9a7c001e5..aab73814f 100644
--- a/xmake/templates/c/console_tbox/project/xmake.lua
+++ b/xmake/templates/c/console_tbox/project/xmake.lua
@@ -12,7 +12,7 @@ add_cxflags("-Wno-error=deprecated-declarations")
 add_mxflags("-Wno-error=deprecated-declarations")
 
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -24,18 +24,18 @@ if modes("debug") then
     add_defines("__tb_debug__")
 
     -- attempt to enable some checkers for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
         add_cxflags("-fsanitize=address", "-ftrapv")
         add_mxflags("-fsanitize=address", "-ftrapv")
         add_ldflags("-fsanitize=address")
     end
 end
 
--- the release or profile modes
-if modes("release", "profile") then
+-- the release or profile is_mode
+if is_mode("release", "profile") then
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
         
         -- set the symbols visibility: hidden
         set_symbols("hidden")
@@ -56,7 +56,7 @@ if modes("release", "profile") then
     end
 
     -- for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
  
         -- enable fastest optimization
         set_optimize("fastest")
@@ -72,7 +72,7 @@ if modes("release", "profile") then
 end
 
 -- for embed
-if not archs("i386", "x86_64") then
+if not is_arch("i386", "x86_64") then
 
     -- add defines for small
     add_defines("__tb_small__")
@@ -85,13 +85,13 @@ end
 if plats("windows") then 
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
 
         -- link libcmt.lib
         add_cxflags("-MT") 
 
     -- the debug mode
-    elseif modes("debug") then
+    elseif is_mode("debug") then
 
         -- enable some checkers
         add_cxflags("-Gs", "-RTC1") 
diff --git a/xmake/templates/c/shared_library/project/xmake.lua b/xmake/templates/c/shared_library/project/xmake.lua
index 20684126f..06a9a6ec8 100644
--- a/xmake/templates/c/shared_library/project/xmake.lua
+++ b/xmake/templates/c/shared_library/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -22,7 +22,7 @@ if modes("release") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("shared")
@@ -31,7 +31,7 @@ def_target("[targetname]")
     add_files("src/interface.c") 
 
 -- add target
-def_target("test")
+target("test")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c/shared_library_tbox/project/src/_demo/xmake.lua
index 8de43bb2b..c3bafab3c 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c/shared_library_tbox/project/src/_demo/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("demo")
+target("demo")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua
index 6fcedbf29..cb02e1815 100644
--- a/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c/shared_library_tbox/project/src/_library/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("shared")
diff --git a/xmake/templates/c/shared_library_tbox/project/xmake.lua b/xmake/templates/c/shared_library_tbox/project/xmake.lua
index 61e135480..20ab67394 100644
--- a/xmake/templates/c/shared_library_tbox/project/xmake.lua
+++ b/xmake/templates/c/shared_library_tbox/project/xmake.lua
@@ -12,7 +12,7 @@ add_cxflags("-Wno-error=deprecated-declarations")
 add_mxflags("-Wno-error=deprecated-declarations")
 
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -24,18 +24,18 @@ if modes("debug") then
     add_defines("__tb_debug__")
 
     -- attempt to enable some checkers for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
         add_cxflags("-fsanitize=address", "-ftrapv")
         add_mxflags("-fsanitize=address", "-ftrapv")
         add_ldflags("-fsanitize=address")
     end
 end
 
--- the release or profile modes
-if modes("release", "profile") then
+-- the release or profile is_mode
+if is_mode("release", "profile") then
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
         
         -- set the symbols visibility: hidden
         set_symbols("hidden")
@@ -56,7 +56,7 @@ if modes("release", "profile") then
     end
 
     -- for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
  
         -- enable fastest optimization
         set_optimize("fastest")
@@ -72,7 +72,7 @@ if modes("release", "profile") then
 end
 
 -- for embed
-if not archs("i386", "x86_64") then
+if not is_arch("i386", "x86_64") then
 
     -- add defines for small
     add_defines("__tb_small__")
@@ -85,13 +85,13 @@ end
 if plats("windows") then 
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
 
         -- link libcmt.lib
         add_cxflags("-MT") 
 
     -- the debug mode
-    elseif modes("debug") then
+    elseif is_mode("debug") then
 
         -- enable some checkers
         add_cxflags("-Gs", "-RTC1") 
@@ -105,7 +105,7 @@ if plats("windows") then
 end
 
 -- add option: demo
-def_option("demo")
+option("demo")
     set_option_enable(true)
     set_option_showmenu(true)
     set_option_category("option")
diff --git a/xmake/templates/c/static_library/project/xmake.lua b/xmake/templates/c/static_library/project/xmake.lua
index 26dd4e68c..5eac70e20 100644
--- a/xmake/templates/c/static_library/project/xmake.lua
+++ b/xmake/templates/c/static_library/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -22,7 +22,7 @@ if modes("release") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("static")
@@ -31,7 +31,7 @@ def_target("[targetname]")
     add_files("src/interface.c") 
 
 -- add target
-def_target("test")
+target("test")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c/static_library_tbox/project/src/_demo/xmake.lua b/xmake/templates/c/static_library_tbox/project/src/_demo/xmake.lua
index 8de43bb2b..c3bafab3c 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_demo/xmake.lua
+++ b/xmake/templates/c/static_library_tbox/project/src/_demo/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("demo")
+target("demo")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua b/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua
index 851328464..cec28c3d4 100644
--- a/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua
+++ b/xmake/templates/c/static_library_tbox/project/src/_library/xmake.lua
@@ -1,5 +1,5 @@
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("static")
diff --git a/xmake/templates/c/static_library_tbox/project/xmake.lua b/xmake/templates/c/static_library_tbox/project/xmake.lua
index 61e135480..20ab67394 100644
--- a/xmake/templates/c/static_library_tbox/project/xmake.lua
+++ b/xmake/templates/c/static_library_tbox/project/xmake.lua
@@ -12,7 +12,7 @@ add_cxflags("-Wno-error=deprecated-declarations")
 add_mxflags("-Wno-error=deprecated-declarations")
 
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -24,18 +24,18 @@ if modes("debug") then
     add_defines("__tb_debug__")
 
     -- attempt to enable some checkers for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
         add_cxflags("-fsanitize=address", "-ftrapv")
         add_mxflags("-fsanitize=address", "-ftrapv")
         add_ldflags("-fsanitize=address")
     end
 end
 
--- the release or profile modes
-if modes("release", "profile") then
+-- the release or profile is_mode
+if is_mode("release", "profile") then
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
         
         -- set the symbols visibility: hidden
         set_symbols("hidden")
@@ -56,7 +56,7 @@ if modes("release", "profile") then
     end
 
     -- for pc
-    if archs("i386", "x86_64") then
+    if is_arch("i386", "x86_64") then
  
         -- enable fastest optimization
         set_optimize("fastest")
@@ -72,7 +72,7 @@ if modes("release", "profile") then
 end
 
 -- for embed
-if not archs("i386", "x86_64") then
+if not is_arch("i386", "x86_64") then
 
     -- add defines for small
     add_defines("__tb_small__")
@@ -85,13 +85,13 @@ end
 if plats("windows") then 
 
     -- the release mode
-    if modes("release") then
+    if is_mode("release") then
 
         -- link libcmt.lib
         add_cxflags("-MT") 
 
     -- the debug mode
-    elseif modes("debug") then
+    elseif is_mode("debug") then
 
         -- enable some checkers
         add_cxflags("-Gs", "-RTC1") 
@@ -105,7 +105,7 @@ if plats("windows") then
 end
 
 -- add option: demo
-def_option("demo")
+option("demo")
     set_option_enable(true)
     set_option_showmenu(true)
     set_option_category("option")
diff --git a/xmake/templates/objc++/console/project/xmake.lua b/xmake/templates/objc++/console/project/xmake.lua
index 6f8ce1bf6..d9d4a4ed0 100644
--- a/xmake/templates/objc++/console/project/xmake.lua
+++ b/xmake/templates/objc++/console/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -33,7 +33,7 @@ if os("macosx", "ios") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/objc/console/project/xmake.lua b/xmake/templates/objc/console/project/xmake.lua
index eb59e833f..d2f3d710b 100644
--- a/xmake/templates/objc/console/project/xmake.lua
+++ b/xmake/templates/objc/console/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -33,7 +33,7 @@ if os("macosx", "ios") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("binary")
diff --git a/xmake/templates/swift/console/project/xmake.lua b/xmake/templates/swift/console/project/xmake.lua
index b4ac31e27..45fe404a0 100644
--- a/xmake/templates/swift/console/project/xmake.lua
+++ b/xmake/templates/swift/console/project/xmake.lua
@@ -1,5 +1,5 @@
 -- the debug mode
-if modes("debug") then
+if is_mode("debug") then
     
     -- enable the debug symbols
     set_symbols("debug")
@@ -9,7 +9,7 @@ if modes("debug") then
 end
 
 -- the release mode
-if modes("release") then
+if is_mode("release") then
 
     -- set the symbols visibility: hidden
     set_symbols("hidden")
@@ -22,7 +22,7 @@ if modes("release") then
 end
 
 -- add target
-def_target("[targetname]")
+target("[targetname]")
 
     -- set kind
     set_kind("binary")