Skip to content

Commit a06e562

Browse files
authored
Merge pull request #32 from RT-Thread/default_repo
Add repo* in userapps folder in default.
2 parents ec7625a + 29c5dfd commit a06e562

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

tools/scripts/xmake.lua

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

2525
local dir = ""
2626
local rcfiles = os.getenv("XMAKE_RCFILES")
27-
local private_repo = os.getenv("RT_XMAKE_PRIVATEREPO_DIR")
2827
local user_repo = os.getenv("RT_XMAKE_USERREPO_DIR")
28+
2929
if rcfiles then
3030
dir = path.directory(rcfiles) .. "/"
3131
end
@@ -36,12 +36,18 @@ includes(dir .. "tasks.lua")
3636
includes(dir .. "toolchains.lua")
3737

3838
if user_repo then
39-
add_repositories("rt-smart-user-repo " .. user_repo)
39+
add_repositories("user-repo " .. user_repo)
4040
end
41-
if private_repo then
42-
add_repositories("rt-smart-private-repo " .. private_repo)
41+
42+
for _, item in ipairs(os.dirs(dir .. "../../repo*")) do
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
4350
end
44-
add_repositories("rt-smart-repo " .. dir .. "../../repo")
4551

4652
local archs = {
4753
aarch64 = "aarch64-smart-musleabi",

0 commit comments

Comments
 (0)