remove some deprecated apis

7 files changed, 5 insertions, 49 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5c03d6f5..dcdbb2b68 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 ### Change
 
 * Improve `find_package` and add `package:find_package` for xmake package
+* Remove deprecated `set_config_h` and `set_config_h_prefix` apis
 
 ### v2.5.3
 
@@ -985,6 +986,7 @@
 ### 改进
 
 * 改进 `find_package` 并且添加 `package:find_package` 接口在包定义中方便查找包
+* 移除废弃的 `set_config_h` 和 `set_config_h_prefix` 接口
 
 ## v2.5.3
 
diff --git a/xmake/core/project/deprecated/project.lua b/xmake/core/project/deprecated/project.lua
index ea6a103d8..b4d8b55ed 100644
--- a/xmake/core/project/deprecated/project.lua
+++ b/xmake/core/project/deprecated/project.lua
@@ -152,24 +152,6 @@ function deprecated_project._api_target_add_headers(interp)
                                         end)
 end
 
--- add_headerdirs for target
-function deprecated_project._api_target_add_headerdirs(interp)
-
-    -- get api function
-    local apifunc = interp:_api_within_scope("target", "add_headerdirs")
-    assert(apifunc)
-
-    -- register api
-    interp:_api_within_scope_set("target", "add_headerdirs", function (value, ...)
-
-                                            -- deprecated
-                                            deprecated.add("add_includedirs(%s, {public|interface = true})", "add_headerdirs(%s)", tostring(value))
-
-                                            -- dispatch it
-                                            apifunc(value, ...)
-                                        end)
-end
-
 -- set_config_header for target
 function deprecated_project._api_target_set_config_header(interp)
 
@@ -303,7 +285,6 @@ function deprecated_project.api_register(interp)
 
     -- register api: add_headers() to target
     deprecated_project._api_target_add_headers(interp)
-    deprecated_project._api_target_add_headerdirs(interp)
 
     -- register api: set_config_header() to option/target
     deprecated_project._api_target_set_config_header(interp)
diff --git a/xmake/core/project/target.lua b/xmake/core/project/target.lua
index 7c36f1633..531ffb887 100644
--- a/xmake/core/project/target.lua
+++ b/xmake/core/project/target.lua
@@ -1687,11 +1687,6 @@ function _instance:configprefix()
     if type(configheader_extra) == "table" then
         configprefix = table.wrap(configheader_extra[configheader]).prefix
     end
-    if not configprefix then
-        configprefix = self:get("config_h_prefix") or (self:name():upper() .. "_CONFIG")
-    end
-
-    -- ok?
     return configprefix
 end
 
@@ -1699,16 +1694,11 @@ end
 function _instance:configheader(outputdir)
 
     -- get config header
-    local configheader = self:get("config_header") or self:get("config_h")
+    local configheader = self:get("config_header")
     if not configheader then
         return
     end
 
-    -- mark as deprecated
-    if self:get("config_h") then
-        deprecated.add("set_config_header(\"%s\", {prefix = \"...\"})", "set_config_h(\"%s\")", path.relative(self:get("config_h"), os.projectdir()))
-    end
-
     -- get the root directory
     local rootdir, count = configheader:gsub("|.*$", ""):gsub("%(.*%)$", "")
     if count == 0 then
diff --git a/xmake/languages/asm/api.lua b/xmake/languages/asm/api.lua
index af0ccf8b3..49bda6a36 100644
--- a/xmake/languages/asm/api.lua
+++ b/xmake/languages/asm/api.lua
@@ -75,7 +75,6 @@ function apis()
     {
         -- target.add_xxx
         "target.add_headers"    -- TODO deprecated
-    ,   "target.add_headerdirs"
     ,   "target.add_headerfiles"
     ,   "target.add_linkdirs"
     ,   "target.add_includedirs"
diff --git a/xmake/languages/c++/api.lua b/xmake/languages/c++/api.lua
index 277223139..e0409ba30 100644
--- a/xmake/languages/c++/api.lua
+++ b/xmake/languages/c++/api.lua
@@ -157,10 +157,8 @@ function apis()
     -- init apis
     _g.values =
     {
-        -- target.set_xxx
-        "target.set_config_h_prefix" -- deprecated
         -- target.add_xxx
-    ,   "target.add_links"
+        "target.add_links"
     ,   "target.add_syslinks"
     ,   "target.add_cflags"
     ,   "target.add_cxflags"
@@ -230,13 +228,11 @@ function apis()
     {
         -- target.set_xxx
         "target.set_headerdir"        -- TODO deprecated
-    ,   "target.set_config_h"         -- TODO deprecated
     ,   "target.set_config_header"    -- TODO deprecated
     ,   "target.set_pcheader"
     ,   "target.set_pcxxheader"
         -- target.add_xxx
     ,   "target.add_headers"          -- TODO deprecated
-    ,   "target.add_headerdirs"       -- TODO deprecated
     ,   "target.add_headerfiles"
     ,   "target.add_linkdirs"
     ,   "target.add_includedirs"
diff --git a/xmake/languages/objc++/api.lua b/xmake/languages/objc++/api.lua
index 656bc2174..8df275896 100644
--- a/xmake/languages/objc++/api.lua
+++ b/xmake/languages/objc++/api.lua
@@ -24,10 +24,8 @@ function apis()
     -- init apis
     _g.values =
     {
-        -- target.set_xxx
-        "target.set_config_h_prefix" -- deprecated
         -- target.add_xxx
-    ,   "target.add_links"
+        "target.add_links"
     ,   "target.add_syslinks"
     ,   "target.add_mflags"
     ,   "target.add_mxflags"
@@ -80,13 +78,11 @@ function apis()
     {
         -- target.set_xxx
         "target.set_headerdir"      -- TODO deprecated
-    ,   "target.set_config_h"       -- TODO deprecated
     ,   "target.set_config_header"
     ,   "target.set_pcheader"
     ,   "target.set_pcxxheader"
         -- target.add_xxx
     ,   "target.add_headers"        -- TODO deprecated
-    ,   "target.add_headerdirs"
     ,   "target.add_headerfiles"
     ,   "target.add_linkdirs"
     ,   "target.add_includedirs"
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
index 022e9fd88..6259effed 100644
--- a/xmake/plugins/project/cmake/cmakelists.lua
+++ b/xmake/plugins/project/cmake/cmakelists.lua
@@ -162,14 +162,6 @@ function _add_target_include_directories(cmakelists, target)
     end
 
     -- TODO deprecated
-    local headerdirs = target:get("headerdirs")
-    if headerdirs then
-        cmakelists:print("target_include_directories(%s PUBLIC", target:name())
-        for _, headerdir in ipairs(headerdirs) do
-            cmakelists:print("    " .. _get_unix_path(headerdir))
-        end
-        cmakelists:print(")")
-    end
     local includedirs_interface = target:get("includedirs", {interface = true})
     if includedirs_interface then
         cmakelists:print("target_include_directories(%s INTERFACE", target:name())