From 9d0945aad450cce769230370b3acb241fa0ebcff Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 23 Aug 2023 00:42:51 +0800 Subject: [PATCH] add deprecated for add_subdirs/add_subfiles --- xmake/core/base/interpreter.lua | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/xmake/core/base/interpreter.lua b/xmake/core/base/interpreter.lua index bb41831f7e..72643ec368 100644 --- a/xmake/core/base/interpreter.lua +++ b/xmake/core/base/interpreter.lua @@ -684,8 +684,8 @@ function interpreter.new() -- register the builtin interfaces instance:api_register(nil, "includes", interpreter.api_builtin_includes) - instance:api_register(nil, "add_subdirs", interpreter.api_builtin_includes) - instance:api_register(nil, "add_subfiles", interpreter.api_builtin_includes) + instance:api_register(nil, "add_subdirs", interpreter.api_builtin_add_subdirs) + instance:api_register(nil, "add_subfiles", interpreter.api_builtin_add_subfiles) instance:api_register(nil, "set_xmakever", interpreter.api_builtin_set_xmakever) instance:api_register(nil, "save_scope", interpreter.api_builtin_save_scope) instance:api_register(nil, "restore_scope",interpreter.api_builtin_restore_scope) @@ -1712,6 +1712,20 @@ function interpreter:api_builtin_includes(...) self._PRIVATE._CURFILE = curfile end +-- the builtin api: add_subdirs(), deprecated +function interpreter:api_builtin_add_subdirs(...) + self:api_builtin_includes(...) + local dirs = {...} + deprecated.add("includes(%s)", "add_subdirs(%s)", table.concat(dirs, ", "), table.concat(dirs, ", ")) +end + +-- the builtin api: add_subfiles(), deprecated +function interpreter:api_builtin_add_subfiles(...) + self:api_builtin_includes(...) + local files = {...} + deprecated.add("includes(%s)", "add_subfiles(%s)", table.concat(files, ", "), table.concat(files, ", ")) +end + -- the builtin api: save_scope() -- save the current scope function interpreter:api_builtin_save_scope()