remove some deprecated apis for 1.x

3 files changed, 2 insertions, 84 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3328cebc1..a88db2640 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * [#293](https://github.com/tboox/xmake/issues/293): Add `xmake f/g --mingw=xxx` configuration option and improve to find_mingw
 * [#301](https://github.com/tboox/xmake/issues/301): Improve precompiled header file
 * [#322](https://github.com/tboox/xmake/issues/322): Add `option.add_features`, `option.add_cxxsnippets` and `option.add_csnippets`
+* Remove some deprecated interfaces of xmake 1.x, e.g. `add_option_xxx`
 
 ### Bugs fixed
 
@@ -556,6 +557,7 @@
 * [#293](https://github.com/tboox/xmake/issues/293): 添加`xmake f/g --mingw=xxx` 配置选线，并且改进find_mingw检测
 * [#301](https://github.com/tboox/xmake/issues/301): 改进编译预处理头文件以及依赖头文件生成，编译速度提升30%
 * [#322](https://github.com/tboox/xmake/issues/322): 添加`option.add_features`, `option.add_cxxsnippets` 和 `option.add_csnippets`
+* 移除xmake 1.x的一些废弃接口, 例如：`add_option_xxx`
 
 ### Bugs修复
 
diff --git a/xmake/core/base/deprecated/interpreter.lua b/xmake/core/base/deprecated/interpreter.lua
index 11d47b697..fd6de43e2 100644
--- a/xmake/core/base/deprecated/interpreter.lua
+++ b/xmake/core/base/deprecated/interpreter.lua
@@ -140,53 +140,5 @@ function deprecated_interpreter:api_register_set_script(scope_kind, ...)
     self:_api_register_xxx_values(scope_kind, "set", implementation, ...)
 end
 
--- register api: set_xxx_xxx
-function deprecated_interpreter:_api_register_set_xxx_xxx(scope_kind, apiname)
-
-    -- the old api
-    local oldapi = string.format("set_%s_%s", scope_kind, apiname)
-
-    -- the new api
-    local newapi = string.format("set_%s", apiname)
-
-    -- get api function
-    local apifunc = self:_api_within_scope(scope_kind, newapi)
-    assert(apifunc)
-
-    -- register api
-    self:api_register_builtin(oldapi, function (value, ...) 
-
-                                        -- deprecated
-                                        deprecated.add(newapi .. "(\"%s\")", oldapi .. "(\"%s\")", tostring(value))
-                                      
-                                        -- dispatch it
-                                        apifunc(value, ...)
-                                    end)
-end
-
--- register api: add_xxx_xxx
-function deprecated_interpreter:_api_register_add_xxx_xxx(scope_kind, apiname)
-
-    -- the old api
-    local oldapi = string.format("add_%s_%s", scope_kind, apiname)
-
-    -- the new api
-    local newapi = string.format("add_%s", apiname)
-
-    -- get api function
-    local apifunc = self:_api_within_scope(scope_kind, newapi)
-    assert(apifunc)
-
-    -- register api
-    self:api_register_builtin(oldapi, function (value, ...) 
-
-                                        -- deprecated
-                                        deprecated.add(newapi .. "(\"%s\")", oldapi .. "(\"%s\")", tostring(value))
-                                      
-                                        -- dispatch it
-                                        apifunc(value, ...)
-                                    end)
-end
-
 -- return module: deprecated_interpreter
 return deprecated_interpreter
diff --git a/xmake/core/project/deprecated/project.lua b/xmake/core/project/deprecated/project.lua
index 8bf29610e..a7139e726 100644
--- a/xmake/core/project/deprecated/project.lua
+++ b/xmake/core/project/deprecated/project.lua
@@ -203,42 +203,6 @@ function deprecated_project.api_register(interp)
 
     -- register api: add_cxxsnippet() to option
     interp:api_register("option", "add_cxxsnippet", deprecated_project._api_option_add_cxxsnippet)
-
-    -- register api: set_values() to option
-    deprecated_interpreter._api_register_set_xxx_xxx(interp, "option", "enable")
-    deprecated_interpreter._api_register_set_xxx_xxx(interp, "option", "showmenu")
-    deprecated_interpreter._api_register_set_xxx_xxx(interp, "option", "category")
-    deprecated_interpreter._api_register_set_xxx_xxx(interp, "option", "warnings")
-    deprecated_interpreter._api_register_set_xxx_xxx(interp, "option", "optimize")
-    deprecated_interpreter._api_register_set_xxx_xxx(interp, "option", "languages")
-    deprecated_interpreter._api_register_set_xxx_xxx(interp, "option", "description")
-
-    -- register api: add_values() to option
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "links")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cincludes")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cxxincludes")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cfuncs")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cxxfuncs")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "ctypes")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cxxtypes")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cflags")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cxflags")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "cxxflags")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "mflags")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "mxflags")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "mxxflags")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "ldflags")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "vectorexts")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "defines")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "defines_if_ok")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "defines_h_if_ok")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "undefines")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "undefines_if_ok")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "undefines_h_if_ok")
-
-    -- register api: add_pathes() to option
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "linkdirs")
-    deprecated_interpreter._api_register_add_xxx_xxx(interp, "option", "includedirs")
 end
 
 -- return module: deprecated_project