Skip to content

Commit a57d2b6

Browse files
committed
👽 Upgrade xmake-python
1 parent fff989b commit a57d2b6

File tree

2 files changed

+8
-32
lines changed

2 files changed

+8
-32
lines changed

scripts/xmake.lua

Lines changed: 3 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,12 @@
11
-- luacheck: ignore 111 113
22
---@diagnostic disable: undefined-global
3-
option("xmake-platlib")
4-
do
5-
set_default("/../platlib")
6-
end
7-
option("xmake-scripts")
3+
option("bindir")
84
do
95
set_default("/bin")
106
end
11-
option("xmake-headers")
12-
do
13-
set_default("/include")
14-
end
15-
option("xmake-data")
16-
do
17-
set_default("/")
18-
end
19-
option("xmake-metadata")
20-
do
21-
set_default("/../metadata")
22-
end
23-
option("xmake-null")
24-
do
25-
set_default("/../null")
26-
end
27-
option("xmake-root")
28-
do
29-
set_default("{root}")
30-
end
31-
option("xmake-version")
7+
option("datadir")
328
do
33-
set_default("{version}")
9+
set_default("/share")
3410
end
3511
option_end()
3612
set_prefixdir("/", {bindir = "bin", libdir = "lib", includedir = "include"})

xmake.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ do
3434
function(target)
3535
local prefix = target:pkg("xmake"):installdir()
3636
if target:is_plat("windows") then
37-
target:add("installfiles", "scripts/xmake.cmd", { prefixdir = "$(xmake-scripts)" })
38-
target:add("installfiles", "scripts/xmake.ps1", { prefixdir = "$(xmake-scripts)" })
39-
target:add("installfiles", path.join(prefix, "*"), { prefixdir = "$(xmake-data)/share" })
37+
target:add("installfiles", "scripts/xmake.cmd", { prefixdir = "$(bindir)" })
38+
target:add("installfiles", "scripts/xmake.ps1", { prefixdir = "$(bindir)" })
39+
target:add("installfiles", path.join(prefix, "*"), { prefixdir = "$(datadir)" })
4040
else
41-
target:add("installfiles", path.join(prefix, "bin/*"), { prefixdir = "$(xmake-scripts)" })
42-
target:add("installfiles", path.join(prefix, "(share/**)"), { prefixdir = "$(xmake-data)" })
41+
target:add("installfiles", path.join(prefix, "bin/*"), { prefixdir = "$(bindir)" })
42+
target:add("installfiles", path.join(prefix, "share/**"), { prefixdir = "$(datadir)" })
4343
end
4444
end
4545
)

0 commit comments

Comments
 (0)