Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show all apis #5004

Closed
wants to merge 2 commits into from
Closed

Show all apis #5004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba319fe
remove deprecated headers
waruqi Aug 1, 2023
1496de7
remove deprecated tools
waruqi Aug 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 0 additions & 115 deletions xmake/actions/config/configheader.lua
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions xmake/actions/config/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import("core.cache.localcache")
import("scangen")
import("menuconf", {alias = "menuconf_show"})
import("configfiles", {alias = "generate_configfiles"})
import("configheader", {alias = "generate_configheader"})
import("private.action.require.check", {alias = "check_packages"})
import("private.action.require.install", {alias = "install_packages"})
import("private.service.remote_build.action", {alias = "remote_build_action"})
Expand Down Expand Up @@ -404,9 +403,6 @@ force to build in current directory via run `xmake -P .`]], os.projectdir())

-- update the config files
generate_configfiles({force = recheck})
if recheck then
generate_configheader()
end
end

-- dump config
Expand Down
6 changes: 0 additions & 6 deletions xmake/actions/package/oldpkg/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,6 @@ function _package_library(target)
end
end

-- copy the config.h to the output directory (deprecated)
local configheader = target:configheader()
if configheader then
os.vcp(configheader, format("%s/%s.pkg/$(plat)/$(arch)/include/%s", outputdir, targetname, path.filename(configheader)))
end

-- copy headers
local srcheaders, dstheaders = target:headerfiles(format("%s/%s.pkg/$(plat)/$(arch)/include", outputdir, targetname))
if srcheaders and dstheaders then
Expand Down
122 changes: 0 additions & 122 deletions xmake/core/project/deprecated/project.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,130 +32,8 @@ local config = require("project/config")
local platform = require("platform/platform")
local deprecated = require("base/deprecated")

-- add_headers for target
function deprecated_project._api_target_add_headers(interp)

-- get api function
local apifunc = interp:_api_within_scope("target", "add_headers")
assert(apifunc)

-- register api
interp:_api_within_scope_set("target", "add_headers", function (value, ...)

-- deprecated
deprecated.add("add_headerfiles(%s)", "add_headers(%s)", tostring(value))

-- dispatch it
apifunc(value, ...)
end)
end

-- set_config_header for target
function deprecated_project._api_target_set_config_header(interp)

-- get api function
local apifunc = interp:_api_within_scope("target", "set_config_header")
assert(apifunc)

-- register api
interp:_api_within_scope_set("target", "set_config_header", function (value, ...)

-- deprecated
deprecated.add("add_configfiles(%s.in)", "set_config_header(%s)", tostring(value))

-- dispatch it
apifunc(value, ...)
end)
end

-- set_headerdir for target
function deprecated_project._api_target_set_headerdir(interp)

-- get api function
local apifunc = interp:_api_within_scope("target", "set_headerdir")
assert(apifunc)

-- register api
interp:_api_within_scope_set("target", "set_headerdir", function (value, ...)

-- deprecated
deprecated.add(false, "set_headerdir(%s)", tostring(value))

-- dispatch it
apifunc(value, ...)
end)
end

-- set_tools for target
function deprecated_project._api_target_set_tools(interp)

-- get api function
local apifunc = interp:_api_within_scope("target", "set_tools")
assert(apifunc)

-- register api
interp:_api_within_scope_set("target", "set_tools", function (key, value, ...)

-- deprecated
deprecated.add("set_toolset(%s, %s)", "set_tools(%s, %s)", tostring(key), tostring(value))

-- dispatch it
apifunc(key, value, ...)
end)
end

-- set_toolchain for target
function deprecated_project._api_target_set_toolchain(interp)

-- get api function
local apifunc = interp:_api_within_scope("target", "set_toolchain")
assert(apifunc)

-- register api
interp:_api_within_scope_set("target", "set_toolchain", function (key, value, ...)

-- deprecated
deprecated.add("set_toolset(%s, %s)", "set_toolchain(%s, %s)", tostring(key), tostring(value))

-- dispatch it
apifunc(key, value, ...)
end)
end

-- add_tools for target
function deprecated_project._api_target_add_tools(interp)

-- get api function
local apifunc = interp:_api_within_scope("target", "add_tools")
assert(apifunc)

-- register api
interp:_api_within_scope_set("target", "add_tools", function (key, value, ...)

-- deprecated
deprecated.add("set_toolset(%s, %s)", "add_tools(%s, %s)", tostring(key), tostring(value))

-- dispatch it
apifunc(key, value, ...)
end)
end

-- register api
function deprecated_project.api_register(interp)

-- register api: add_headers() to target
deprecated_project._api_target_add_headers(interp)

-- register api: set_config_header() to option/target
deprecated_project._api_target_set_config_header(interp)

-- register api: set_headerdir() to target
deprecated_project._api_target_set_headerdir(interp)

-- register api: set_toolchain/set_tools/add_tools() to target
deprecated_project._api_target_set_tools(interp)
deprecated_project._api_target_add_tools(interp)
deprecated_project._api_target_set_toolchain(interp)
end

-- return module: deprecated_project
Expand Down
Loading
Loading