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.

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

rename luarocks.module to lua.module, platform.linux.driver to platform.linux.module #5953

Merged
merged 3 commits into from
Dec 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tests/projects/linux/driver/hello/xmake.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
add_requires("linux-headers", {configs = {driver_modules = true}})

target("hello")
add_rules("platform.linux.driver")
add_rules("platform.linux.module")
add_files("src/*.c")
add_packages("linux-headers")
set_license("GPL-2.0")
2 changes: 1 addition & 1 deletion tests/projects/linux/driver/hello_custom/xmake.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
option("linux-headers", {showmenu = true, description = "Set linux-headers path."})
target("hello")
add_rules("platform.linux.driver")
add_rules("platform.linux.module")
add_files("src/*.c")
set_values("linux.driver.linux-headers", "$(linux-headers)")

83 changes: 83 additions & 0 deletions xmake/rules/lua/module/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
--!A cross-platform build utility based on Lua
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
-- Copyright (C) 2015-present, TBOOX Open Source Group.
--
-- @author ruki
-- @file xmake.lua
--

rule("lua.module")
on_load(function (target)

-- imports
import("core.cache.detectcache")
import("core.project.target", {alias = "project_target"})

-- set kind
if target:is_plat("macosx") then
target:set("kind", "binary")
target:add("ldflags", "-bundle", "-undefined dynamic_lookup", {force = true})
else
target:set("kind", "shared")
end

-- set library name
local modulename = target:name():split('.', {plain = true})
modulename = modulename[#modulename]
if target:is_plat("windows", "mingw") then
target:set("basename", modulename)
else
target:set("filename", modulename .. ".so")
end

-- export symbols
if target:is_plat("windows") then
local exported_name = target:name():gsub("%.", "_")
exported_name = exported_name:match('^[^%-]+%-(.+)$') or exported_name
target:add("shflags", "/export:luaopen_" .. exported_name, {force = true})
else
target:set("symbols", "none")
end

-- add lua library
local has_lua = false
local includedirs = get_config("includedirs") -- pass lua library from luarocks-build-xmake/xmake.lua
if includedirs and includedirs:find("lua", 1, true) then
has_lua = true
end
if not has_lua then
-- user use `add_requires/add_packages` to add lua/luajit package
for _, pkg in ipairs(target:get("packages")) do
if pkg == "lua" or pkg == "luajit" then
has_lua = true
break
end
end
end
if not has_lua then
target:add(find_package("lua"))
end
end)
on_install(function (target)
if target:is_plat("macosx") then
target:set("kind", "shared")
end
local moduledir = path.directory((target:name():gsub('%.', '/')))
import("target.action.install")(target, {
installdir = target:installdir(),
libdir = path.join("lib", moduledir),
bindir = path.join("lib", moduledir),
includedir = path.join("include", moduledir)})
end)
64 changes: 3 additions & 61 deletions xmake/rules/luarocks/module/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -19,65 +19,7 @@
--

rule("luarocks.module")
on_load(function (target)

-- imports
import("core.cache.detectcache")
import("core.project.target", {alias = "project_target"})

-- set kind
if target:is_plat("macosx") then
target:set("kind", "binary")
target:add("ldflags", "-bundle", "-undefined dynamic_lookup", {force = true})
else
target:set("kind", "shared")
end

-- set library name
local modulename = target:name():split('.', {plain = true})
modulename = modulename[#modulename]
if target:is_plat("windows", "mingw") then
target:set("basename", modulename)
else
target:set("filename", modulename .. ".so")
end

-- export symbols
if target:is_plat("windows") then
local exported_name = target:name():gsub("%.", "_")
exported_name = exported_name:match('^[^%-]+%-(.+)$') or exported_name
target:add("shflags", "/export:luaopen_" .. exported_name, {force = true})
else
target:set("symbols", "none")
end

-- add lua library
local has_lua = false
local includedirs = get_config("includedirs") -- pass lua library from luarocks-build-xmake/xmake.lua
if includedirs and includedirs:find("lua", 1, true) then
has_lua = true
end
if not has_lua then
-- user use `add_requires/add_packages` to add lua/luajit package
for _, pkg in ipairs(target:get("packages")) do
if pkg == "lua" or pkg == "luajit" then
has_lua = true
break
end
end
end
if not has_lua then
target:add(find_package("lua"))
end
end)
on_install(function (target)
if target:is_plat("macosx") then
target:set("kind", "shared")
end
local moduledir = path.directory((target:name():gsub('%.', '/')))
import("target.action.install")(target, {
installdir = target:installdir(),
libdir = path.join("lib", moduledir),
bindir = path.join("lib", moduledir),
includedir = path.join("include", moduledir)})
on_config(function (target)
wprint('deprecated: please use add_rules("lua.module") instead of add_rules("luarocks.module")')
end)
add_deps("lua.module")
Freed-Wu marked this conversation as resolved.
Show resolved Hide resolved
19 changes: 2 additions & 17 deletions xmake/rules/platform/linux/driver/xmake.lua
Original file line number Diff line number Diff line change
Expand Up @@ -18,23 +18,8 @@
-- @file xmake.lua
--

-- build linux driver module
rule("platform.linux.driver")
set_sourcekinds("cc")
on_load(function (target)
import("driver_modules").load(target)
end)
on_config(function (target)
import("driver_modules").config(target)
end)
on_link(function (target, opt)
import("driver_modules").link(target, opt)
end)
on_install(function (target)
import("driver_modules").install(target)
wprint('deprecated: please use add_rules("platform.linux.module") instead of add_rules("platform.linux.driver")')
end)
on_uninstall(function (target)
import("driver_modules").uninstall(target)
end)


add_deps("platform.linux.module")
40 changes: 40 additions & 0 deletions xmake/rules/platform/linux/module/xmake.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
--!A cross-platform build utility based on Lua
--
-- Licensed under the Apache License, Version 2.0 (the "License");
-- you may not use this file except in compliance with the License.
-- You may obtain a copy of the License at
--
-- http://www.apache.org/licenses/LICENSE-2.0
--
-- Unless required by applicable law or agreed to in writing, software
-- distributed under the License is distributed on an "AS IS" BASIS,
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-- See the License for the specific language governing permissions and
-- limitations under the License.
--
-- Copyright (C) 2015-present, TBOOX Open Source Group.
--
-- @author ruki
-- @file xmake.lua
--

-- build linux driver module
rule("platform.linux.driver")
set_sourcekinds("cc")
on_load(function (target)
import("driver_modules").load(target)
end)
on_config(function (target)
import("driver_modules").config(target)
end)
on_link(function (target, opt)
import("driver_modules").link(target, opt)
end)
on_install(function (target)
import("driver_modules").install(target)
end)
on_uninstall(function (target)
import("driver_modules").uninstall(target)
end)


Loading