From 5a582e2c201ecfb7a5eeb68a126e4842a2391cd2 Mon Sep 17 00:00:00 2001 From: "Wu, Zhenyu" Date: Sun, 12 Jan 2025 14:42:05 +0800 Subject: Add rule python.cython Add test python/cython/example Move test pybind to python/pybind --- tests/projects/python/pybind/example_with_soabi/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/projects/python/pybind/example_with_soabi/xmake.lua (limited to 'tests/projects/python/pybind/example_with_soabi/xmake.lua') diff --git a/tests/projects/python/pybind/example_with_soabi/xmake.lua b/tests/projects/python/pybind/example_with_soabi/xmake.lua new file mode 100644 index 000000000..12d8ad334 --- /dev/null +++ b/tests/projects/python/pybind/example_with_soabi/xmake.lua @@ -0,0 +1,8 @@ +add_rules("mode.release", "mode.debug") +add_requires("pybind11") + +target("example") + add_rules("python.library", {soabi = true}) + add_files("src/*.cpp") + add_packages("pybind11") + set_languages("c++11") -- cgit v1.3.1 From 86970cf42c4b3623650d51cc219af1bc39ac1865 Mon Sep 17 00:00:00 2001 From: "Wu, Zhenyu" Date: Wed, 14 May 2025 20:21:27 +0800 Subject: Rename python.library to python.module --- tests/projects/python/pybind/example/xmake.lua | 2 +- .../python/pybind/example_with_soabi/xmake.lua | 2 +- xmake/rules/python/cython/xmake.lua | 2 +- xmake/rules/python/library/xmake.lua | 25 ++++++++ xmake/rules/python/module/xmake.lua | 68 ++++++++++++++++++++++ xmake/rules/python/xmake.lua | 68 ---------------------- 6 files changed, 96 insertions(+), 71 deletions(-) create mode 100644 xmake/rules/python/library/xmake.lua create mode 100644 xmake/rules/python/module/xmake.lua delete mode 100644 xmake/rules/python/xmake.lua (limited to 'tests/projects/python/pybind/example_with_soabi/xmake.lua') diff --git a/tests/projects/python/pybind/example/xmake.lua b/tests/projects/python/pybind/example/xmake.lua index 19b7b5a9e..93c200c57 100644 --- a/tests/projects/python/pybind/example/xmake.lua +++ b/tests/projects/python/pybind/example/xmake.lua @@ -2,7 +2,7 @@ add_rules("mode.release", "mode.debug") add_requires("pybind11") target("example") - add_rules("python.library") + add_rules("python.module") add_files("src/*.cpp") add_packages("pybind11") set_languages("c++11") diff --git a/tests/projects/python/pybind/example_with_soabi/xmake.lua b/tests/projects/python/pybind/example_with_soabi/xmake.lua index 12d8ad334..1b43713e8 100644 --- a/tests/projects/python/pybind/example_with_soabi/xmake.lua +++ b/tests/projects/python/pybind/example_with_soabi/xmake.lua @@ -2,7 +2,7 @@ add_rules("mode.release", "mode.debug") add_requires("pybind11") target("example") - add_rules("python.library", {soabi = true}) + add_rules("python.module", {soabi = true}) add_files("src/*.cpp") add_packages("pybind11") set_languages("c++11") diff --git a/xmake/rules/python/cython/xmake.lua b/xmake/rules/python/cython/xmake.lua index 78323dfb2..02c73ff60 100644 --- a/xmake/rules/python/cython/xmake.lua +++ b/xmake/rules/python/cython/xmake.lua @@ -19,7 +19,7 @@ -- rule("python.cython") - add_deps("python.library") + add_deps("python.module") set_extensions(".py", ".pyx") on_load(function (target) diff --git a/xmake/rules/python/library/xmake.lua b/xmake/rules/python/library/xmake.lua new file mode 100644 index 000000000..b587bb37e --- /dev/null +++ b/xmake/rules/python/library/xmake.lua @@ -0,0 +1,25 @@ +--!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("python.library") + on_config(function (target) + wprint('deprecated: please use add_rules("python.module") instead of add_rules("python.library")') + end) + add_deps("python.module") diff --git a/xmake/rules/python/module/xmake.lua b/xmake/rules/python/module/xmake.lua new file mode 100644 index 000000000..6f86d929b --- /dev/null +++ b/xmake/rules/python/module/xmake.lua @@ -0,0 +1,68 @@ +--!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 +-- + +-- @see https://github.com/xmake-io/xmake/issues/1896 +rule("python.module") + on_config(function (target) + target:set("kind", "shared") + target:set("prefixname", "") + target:add("runenvs", "PYTHONPATH", target:targetdir()) + local soabi = target:extraconf("rules", "python.module", "soabi") + if soabi then + import("lib.detect.find_tool") + local python = assert(find_tool("python3"), "python not found!") + local result = try { function() return os.iorunv(python.program, {"-c", "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))"}) end} + if result then + result = result:trim() + if result ~= "None" then + target:set("extension", result) + end + end + else + if target:is_plat("windows", "mingw") then + target:set("extension", ".pyd") + else + target:set("extension", ".so") + end + end + -- fix segmentation fault for macosx + -- @see https://github.com/xmake-io/xmake/issues/2177#issuecomment-1209398292 + if target:is_plat("macosx", "linux") then + if target:is_plat("macosx") then + target:add("shflags", "-undefined dynamic_lookup", {force = true}) + end + for _, pkg in pairs(target:pkgs()) do + local links = pkg:get("links") + if links then + local with_python = false + for _, link in ipairs(links) do + if link:startswith("python") then + with_python = true + break + end + end + if with_python then + pkg:set("links", nil) + pkg:set("linkdirs", nil) + end + end + end + end + end) diff --git a/xmake/rules/python/xmake.lua b/xmake/rules/python/xmake.lua deleted file mode 100644 index 20c30c6b5..000000000 --- a/xmake/rules/python/xmake.lua +++ /dev/null @@ -1,68 +0,0 @@ ---!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 --- - --- @see https://github.com/xmake-io/xmake/issues/1896 -rule("python.library") - on_config(function (target) - target:set("kind", "shared") - target:set("prefixname", "") - target:add("runenvs", "PYTHONPATH", target:targetdir()) - local soabi = target:extraconf("rules", "python.library", "soabi") - if soabi then - import("lib.detect.find_tool") - local python = assert(find_tool("python3"), "python not found!") - local result = try { function() return os.iorunv(python.program, {"-c", "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))"}) end} - if result then - result = result:trim() - if result ~= "None" then - target:set("extension", result) - end - end - else - if target:is_plat("windows", "mingw") then - target:set("extension", ".pyd") - else - target:set("extension", ".so") - end - end - -- fix segmentation fault for macosx - -- @see https://github.com/xmake-io/xmake/issues/2177#issuecomment-1209398292 - if target:is_plat("macosx", "linux") then - if target:is_plat("macosx") then - target:add("shflags", "-undefined dynamic_lookup", {force = true}) - end - for _, pkg in pairs(target:pkgs()) do - local links = pkg:get("links") - if links then - local with_python = false - for _, link in ipairs(links) do - if link:startswith("python") then - with_python = true - break - end - end - if with_python then - pkg:set("links", nil) - pkg:set("linkdirs", nil) - end - end - end - end - end) -- cgit v1.3.1 From 43088a77832349076bb796159d5a885065773d7f Mon Sep 17 00:00:00 2001 From: "Wu, Zhenyu" Date: Thu, 15 May 2025 03:10:57 +0800 Subject: Change python.module soabi's default value to true --- tests/projects/python/pybind/example/xmake.lua | 2 +- tests/projects/python/pybind/example_with_soabi/xmake.lua | 2 +- xmake/rules/python/module/xmake.lua | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/projects/python/pybind/example_with_soabi/xmake.lua') diff --git a/tests/projects/python/pybind/example/xmake.lua b/tests/projects/python/pybind/example/xmake.lua index 93c200c57..e8435e360 100644 --- a/tests/projects/python/pybind/example/xmake.lua +++ b/tests/projects/python/pybind/example/xmake.lua @@ -2,7 +2,7 @@ add_rules("mode.release", "mode.debug") add_requires("pybind11") target("example") - add_rules("python.module") + add_rules("python.module", {soabi = false}) add_files("src/*.cpp") add_packages("pybind11") set_languages("c++11") diff --git a/tests/projects/python/pybind/example_with_soabi/xmake.lua b/tests/projects/python/pybind/example_with_soabi/xmake.lua index 1b43713e8..93c200c57 100644 --- a/tests/projects/python/pybind/example_with_soabi/xmake.lua +++ b/tests/projects/python/pybind/example_with_soabi/xmake.lua @@ -2,7 +2,7 @@ add_rules("mode.release", "mode.debug") add_requires("pybind11") target("example") - add_rules("python.module", {soabi = true}) + add_rules("python.module") add_files("src/*.cpp") add_packages("pybind11") set_languages("c++11") diff --git a/xmake/rules/python/module/xmake.lua b/xmake/rules/python/module/xmake.lua index 6f86d929b..46d41be0b 100644 --- a/xmake/rules/python/module/xmake.lua +++ b/xmake/rules/python/module/xmake.lua @@ -25,7 +25,7 @@ rule("python.module") target:set("prefixname", "") target:add("runenvs", "PYTHONPATH", target:targetdir()) local soabi = target:extraconf("rules", "python.module", "soabi") - if soabi then + if soabi == nil or soabi then import("lib.detect.find_tool") local python = assert(find_tool("python3"), "python not found!") local result = try { function() return os.iorunv(python.program, {"-c", "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX'))"}) end} -- cgit v1.3.1