add back the user-repo

RT-Thread · Aug 15, 2023 · 29c5dfd · 29c5dfd
1 parent 0a90a2d
commit 29c5dfd
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/tools/scripts/xmake.lua b/tools/scripts/xmake.lua
@@ -24,6 +24,8 @@ set_xmakever("2.7.2")
 
 local dir = ""
 local rcfiles = os.getenv("XMAKE_RCFILES")
+local user_repo = os.getenv("RT_XMAKE_USERREPO_DIR")
+
 if rcfiles then
     dir = path.directory(rcfiles) .. "/"
 end
@@ -33,9 +35,18 @@ includes(dir .. "rules.lua")
 includes(dir .. "tasks.lua")
 includes(dir .. "toolchains.lua")
 
+if user_repo then
+    add_repositories("user-repo " .. user_repo)
+end
+
 for _, item in ipairs(os.dirs(dir .. "../../repo*")) do
-    bn = path.basename(item)
-    add_repositories(bn .. " " .. item)
+    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
 
 local archs = {