Skip to content

Commit 29c5dfd

Browse files
committed
add back the user-repo
1 parent 0a90a2d commit 29c5dfd

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

tools/scripts/xmake.lua

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ set_xmakever("2.7.2")
2424

2525
local dir = ""
2626
local rcfiles = os.getenv("XMAKE_RCFILES")
27+
local user_repo = os.getenv("RT_XMAKE_USERREPO_DIR")
28+
2729
if rcfiles then
2830
dir = path.directory(rcfiles) .. "/"
2931
end
@@ -33,9 +35,18 @@ includes(dir .. "rules.lua")
3335
includes(dir .. "tasks.lua")
3436
includes(dir .. "toolchains.lua")
3537

38+
if user_repo then
39+
add_repositories("user-repo " .. user_repo)
40+
end
41+
3642
for _, item in ipairs(os.dirs(dir .. "../../repo*")) do
37-
bn = path.basename(item)
38-
add_repositories(bn .. " " .. item)
43+
if os.isfile(item .. "/repo/xmake.lua") then
44+
bn = path.basename(item)
45+
add_repositories(bn .. " " .. item .. "/repo")
46+
elseif os.isdir(item .. "/packages") and os.isfile(item .. "/xmake.lua") then
47+
bn = path.basename(item)
48+
add_repositories(bn .. " " .. item)
49+
end
3950
end
4051

4152
local archs = {

0 commit comments

Comments
 (0)