Skip to content

Add repo* in userapps folder in default. #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BernardXiong merged 2 commits into from
Aug 17, 2023
Merged

Add repo* in userapps folder in default. #32

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a90a2d
Add repo* in userapps folder in default.
BernardXiong Aug 11, 2023
29c5dfd
add back the user-repo
BernardXiong Aug 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions tools/scripts/xmake.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ set_xmakever("2.7.2")

local dir = ""
local rcfiles = os.getenv("XMAKE_RCFILES")
local private_repo = os.getenv("RT_XMAKE_PRIVATEREPO_DIR")
local user_repo = os.getenv("RT_XMAKE_USERREPO_DIR")

if rcfiles then
dir = path.directory(rcfiles) .. "/"
end
Expand All @@ -36,12 +36,18 @@ includes(dir .. "tasks.lua")
includes(dir .. "toolchains.lua")

if user_repo then
add_repositories("rt-smart-user-repo " .. user_repo)
add_repositories("user-repo " .. user_repo)
end
if private_repo then
add_repositories("rt-smart-private-repo " .. private_repo)

for _, item in ipairs(os.dirs(dir .. "../../repo*")) do
if os.isfile(item .. "/repo/xmake.lua") then
bn = path.basename(item)
add_repositories(bn .. " " .. item .. "/repo")
elseif os.isdir(item .. "/packages") and os.isfile(item .. "/xmake.lua") then
bn = path.basename(item)
add_repositories(bn .. " " .. item)
end
end
add_repositories("rt-smart-repo " .. dir .. "../../repo")

local archs = {
aarch64 = "aarch64-smart-musleabi",
Expand Down