summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-07-20 22:35:50 +0800
committerruki <[email protected]>2021-07-20 22:35:50 +0800
commit4451461655f1f725aa1667a9287fb9a0367c291b (patch)
tree734492d821ceff669988ce946e81560d3b61d0d7
parent4061f4d6627358f188bf00778fe296c967b9593e (diff)
remove some deprecated apis
-rw-r--r--xmake/core/project/deprecated/project.lua46
-rw-r--r--xmake/languages/c++/api.lua10
2 files changed, 2 insertions, 54 deletions
diff --git a/xmake/core/project/deprecated/project.lua b/xmake/core/project/deprecated/project.lua
index 91a38106a..dceeac9ba 100644
--- a/xmake/core/project/deprecated/project.lua
+++ b/xmake/core/project/deprecated/project.lua
@@ -33,24 +33,6 @@ local platform = require("platform/platform")
local deprecated = require("base/deprecated")
local deprecated_interpreter = require("base/deprecated/interpreter")
--- set modes
-function deprecated_project._api_set_modes(interp, ...)
-
- -- get api function
- local apifunc = interp:api_func("set_modes")
- assert(apifunc)
-
- -- register api
- interp:api_register_builtin("set_modes", function (...)
-
- -- deprecated
- deprecated.add("add_rules(\"mode.debug\", \"mode.release\")", "set_modes(\"debug\", \"release\")")
-
- -- dispatch it
- apifunc(...)
- end)
-end
-
-- add_headers for target
function deprecated_project._api_target_add_headers(interp)
@@ -159,37 +141,9 @@ function deprecated_project._api_target_add_tools(interp)
end)
end
--- enable options?
-function deprecated_project._api_is_option(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
-
- -- deprecated
- deprecated.add("has_config(\"%s\")", "is_option(\"%s\")", values)
-
- -- done
- return config.has(...)
-end
-
-- register api
function deprecated_project.api_register(interp)
- -- register api: is_option() to root
- interp:api_register(nil, "is_option", deprecated_project._api_is_option)
-
- -- register api: set_modes() to root
- deprecated_project._api_set_modes(interp)
-
-- register api: add_headers() to target
deprecated_project._api_target_add_headers(interp)
diff --git a/xmake/languages/c++/api.lua b/xmake/languages/c++/api.lua
index e3e8e7041..e33580fc4 100644
--- a/xmake/languages/c++/api.lua
+++ b/xmake/languages/c++/api.lua
@@ -26,8 +26,6 @@
-- sigsetjmp{int a = 0; sigsetjmp((void*)a, a);}
--
function _funcinfo(func)
-
- -- parse name and code
local name, code = string.match(func, "(.+){(.+)}")
if code == nil then
local pos = func:find("%(")
@@ -39,8 +37,6 @@ function _funcinfo(func)
code = string.format("volatile void* p%s = (void*)&%s;", name, name)
end
end
-
- -- ok
return name:trim(), code
end
@@ -90,8 +86,7 @@ end
-- TODO add c functions, deprecated
function _api_add_cfuncs(interp, module, links, includes, ...)
-
- -- done
+ wprint("target.add_cfuncs is deprecated, please use option.add_cfuncs()")
for _, func in ipairs({...}) do
_api_add_cfunc(interp, module, nil, links, includes, func)
end
@@ -143,8 +138,7 @@ end
-- TODO add c++ functions, deprecated
function _api_add_cxxfuncs(interp, module, links, includes, ...)
-
- -- done
+ wprint("target.add_cxxfuncs is deprecated, please use option.add_cxxfuncs()")
for _, func in ipairs({...}) do
_api_add_cxxfunc(interp, module, nil, links, includes, func)
end