rename addons position

4 files changed, 7 insertions, 7 deletions

diff --git a/xmake/actions/addon/main.lua b/xmake/actions/addon/main.lua
index c5c126bef..7183925ea 100644
--- a/xmake/actions/addon/main.lua
+++ b/xmake/actions/addon/main.lua
@@ -22,6 +22,7 @@
 import("core.base.option")
 import("core.package.addon")
 import("devel.git")
+import("private.action.addon.impl.install_addons")
 import("private.action.require.impl.environment")
 import("private.action.require.impl.search_packages")
 
@@ -253,7 +254,6 @@ end
 
 -- upgrade the addons which the current project declares in its `xmake-addons.lua`
 function _upgrade()
-    import("private.addons", {alias = "install_addons"})
     install_addons(os.projectdir(), {upgrade = true})
 end
 
diff --git a/xmake/core/project/project.lua b/xmake/core/project/project.lua
index 924ac8f9e..831f882d4 100644
--- a/xmake/core/project/project.lua
+++ b/xmake/core/project/project.lua
@@ -232,7 +232,7 @@ end
 -- install the addons which this project declares
 --
 -- @note we cannot install them here, we are loading the project, so we do it in a
--- sub-process, @see xmake/modules/private/addons/main.lua
+-- sub-process, @see xmake/modules/private/action/addon/impl/install_addons.lua
 --
 function project._install_addons()
     -- @note we need to cache the result, the project may be loaded many times,
@@ -295,7 +295,7 @@ function project._do_install_addons()
             flags_added[flag] = true
         end
     end
-    table.insert(argv, "private.addons")
+    table.insert(argv, "private.action.addon.impl.install_addons")
     table.insert(argv, os.projectdir())
     local envs = os.getenvs()
     envs.XMAKE_SKIP_ADDONS = "y"
diff --git a/xmake/modules/private/addons/main.lua b/xmake/modules/private/action/addon/impl/install_addons.lua
index 1cdc2191d..6ece11964 100644
--- a/xmake/modules/private/addons/main.lua
+++ b/xmake/modules/private/action/addon/impl/install_addons.lua
@@ -15,7 +15,7 @@
 -- Copyright (C) 2015-present, Xmake Open Source Community.
 --
 -- @author      ruki
--- @file        main.lua
+-- @file        install_addons.lua
 --
 
 -- imports
@@ -73,8 +73,8 @@ end
 
 -- install the addons which the given project declares in its `xmake-addons.lua`
 --
--- @note we are called from a sub-process, the project cannot be loaded until its
--- addons are installed, @see core/project/project.lua
+-- @note we are also called from a sub-process, the project cannot be loaded until
+-- its addons are installed, @see core/project/project.lua
 --
 function main(projectdir, opt)
     opt = opt or {}
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua
index 1a2e389b3..7ddb66cca 100644
--- a/xmake/modules/private/action/require/impl/actions/install.lua
+++ b/xmake/modules/private/action/require/impl/actions/install.lua
@@ -319,7 +319,7 @@ function _register_addon(package)
     end
 
     -- we also record where it comes from, so that the projects can lock it,
-    -- @see xmake/modules/private/addons/main.lua
+    -- @see xmake/modules/private/action/addon/impl/install_addons.lua
     local repo = package:repo()
     addon.register(package:name(), package:version_str() or "latest",
         {description = description, deps = deps,