Merge pull request #7714 from xmake-io/addon

move add_addons to xmake.lua

1 files changed, 6 insertions, 2 deletions

diff --git a/xmake/actions/addon/main.lua b/xmake/actions/addon/main.lua
index bf6f27f5d..99f92d125 100644
--- a/xmake/actions/addon/main.lua
+++ b/xmake/actions/addon/main.lua
@@ -21,6 +21,7 @@
 -- imports
 import("core.base.option")
 import("core.package.addon")
+import("core.project.project")
 import("devel.git")
 import("private.action.addon.impl.install_addons")
 import("private.action.addon.impl.xrepo", {alias = "xrepo_addon"})
@@ -228,9 +229,12 @@ function _remove()
     end
 end
 
--- upgrade the addons which the current project declares in its `xmake-addons.lua`
+-- upgrade the addons which the current project declares, e.g. add_addons("esp32-devel 1.0.x")
 function _upgrade()
-    install_addons(os.projectdir(), {upgrade = true})
+    local declarations = {addons = table.wrap(project.get("addons")),
+                          repositories = table.wrap(project.get("repositories"))}
+    assert(#declarations.addons > 0, "no addons are declared in this project, e.g. add_addons(\"esp32-devel\")!")
+    install_addons(os.projectdir(), declarations, {upgrade = true})
 end
 
 -- search the addons from the repositories