From c762631ecccd88b2dcac2bfdbff05e79ace925c7 Mon Sep 17 00:00:00 2001 From: ririyeye <200610237@qq.com> Date: Wed, 22 Nov 2023 23:35:46 +0800 Subject: swig may generate multi files --- xmake/rules/swig/xmake.lua | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/xmake/rules/swig/xmake.lua b/xmake/rules/swig/xmake.lua index 00ef16afa..c073ffb3e 100644 --- a/xmake/rules/swig/xmake.lua +++ b/xmake/rules/swig/xmake.lua @@ -74,17 +74,20 @@ rule("swig.base") if fileconfig then scriptdir = fileconfig.scriptdir end - local scriptfile = path.join(target:autogendir(), "rules", "swig", path.basename(sourcefile)) + local scriptfile = path.join(target:autogendir(), "rules", "swig") if moduletype == "python" then - scriptfile = scriptfile .. ".py" + scriptfile = os.files(scriptfile .. "/*.py") elseif moduletype == "lua" then - scriptfile = scriptfile .. ".lua" + scriptfile = os.files(scriptfile .. "/*.lua") elseif moduletype == "java" then - scriptfile = scriptfile .. ".java" + scriptfile = os.files(scriptfile .. "/*.java") end - table.insert(scriptfiles, scriptfile) - if scriptdir then - target:add("installfiles", scriptfile, {prefixdir = scriptdir}) + + for _, scriptfile_any in pairs(scriptfile) do + table.insert(scriptfiles, scriptfile_any) + if scriptdir then + target:add("installfiles", scriptfile_any, {prefixdir = scriptdir}) + end end end end -- cgit v1.3.1 From 3789e2356dbd995c6e7952b05f666002d1a8c5ac Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 22 Nov 2023 19:08:48 -0600 Subject: Update xmake.lua --- xmake/rules/swig/xmake.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xmake/rules/swig/xmake.lua b/xmake/rules/swig/xmake.lua index c073ffb3e..05db9a3a1 100644 --- a/xmake/rules/swig/xmake.lua +++ b/xmake/rules/swig/xmake.lua @@ -74,19 +74,19 @@ rule("swig.base") if fileconfig then scriptdir = fileconfig.scriptdir end - local scriptfile = path.join(target:autogendir(), "rules", "swig") + local autogenfiles + local autogendir = path.join(target:autogendir(), "rules", "swig") if moduletype == "python" then - scriptfile = os.files(scriptfile .. "/*.py") + autogenfiles = os.files(path.join(autogendir, "*.py")) elseif moduletype == "lua" then - scriptfile = os.files(scriptfile .. "/*.lua") + autogenfiles = os.files(path.join(autogendir, "*.lua")) elseif moduletype == "java" then - scriptfile = os.files(scriptfile .. "/*.java") + autogenfiles = os.files(path.join(autogendir, "*.java")) end - - for _, scriptfile_any in pairs(scriptfile) do - table.insert(scriptfiles, scriptfile_any) + if autogenfiles then + table.join2(scriptfiles, autogenfiles) if scriptdir then - target:add("installfiles", scriptfile_any, {prefixdir = scriptdir}) + target:add("installfiles", autogenfiles, {prefixdir = scriptdir}) end end end -- cgit v1.3.1