move require action modules

24 files changed, 49 insertions, 49 deletions

diff --git a/xmake/actions/build/statistics.lua b/xmake/actions/build/statistics.lua
index 1f8126c83..84a2a5cc5 100644
--- a/xmake/actions/build/statistics.lua
+++ b/xmake/actions/build/statistics.lua
@@ -24,7 +24,7 @@ import("core.base.process")
 import("core.project.config")
 import("core.platform.platform")
 import("private.action.update.fetch_version")
-import("private.package.impl.packagenv")
+import("private.action.require.impl.packagenv")
 
 -- statistics is enabled?
 function _is_enabled()
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 73b73dbea..be96692a3 100644
--- a/xmake/actions/config/main.lua
+++ b/xmake/actions/config/main.lua
@@ -31,7 +31,7 @@ import("scangen")
 import("menuconf", {alias = "menuconf_show"})
 import("configfiles", {alias = "generate_configfiles"})
 import("configheader", {alias = "generate_configheader"})
-import("private.package.install", {alias = "install_requires"})
+import("private.action.require.install", {alias = "install_requires"})
 
 -- filter option
 function _option_filter(name)
diff --git a/xmake/actions/require/main.lua b/xmake/actions/require/main.lua
index 7b068ff70..f87e8c11c 100644
--- a/xmake/actions/require/main.lua
+++ b/xmake/actions/require/main.lua
@@ -24,15 +24,15 @@ import("core.base.task")
 import("core.project.config")
 import("core.project.project")
 import("core.platform.platform")
-import("private.package.list")
-import("private.package.scan")
-import("private.package.info")
-import("private.package.fetch")
-import("private.package.clean")
-import("private.package.search")
-import("private.package.export")
-import("private.package.install")
-import("private.package.uninstall")
+import("private.action.require.list")
+import("private.action.require.scan")
+import("private.action.require.info")
+import("private.action.require.fetch")
+import("private.action.require.clean")
+import("private.action.require.search")
+import("private.action.require.export")
+import("private.action.require.install")
+import("private.action.require.uninstall")
 
 --
 -- the default repositories:
diff --git a/xmake/modules/private/package/clean.lua b/xmake/modules/private/action/require/clean.lua
index fb93e6304..fb93e6304 100644
--- a/xmake/modules/private/package/clean.lua
+++ b/xmake/modules/private/action/require/clean.lua
diff --git a/xmake/modules/private/package/export.lua b/xmake/modules/private/action/require/export.lua
index 3902b87f6..218a669c6 100644
--- a/xmake/modules/private/package/export.lua
+++ b/xmake/modules/private/action/require/export.lua
@@ -21,10 +21,10 @@
 -- imports
 import("core.base.task")
 import("core.base.option")
-import("private.package.impl.package")
-import("private.package.impl.repository")
-import("private.package.impl.environment")
-import("private.package.impl.utils.get_requires")
+import("private.action.require.impl.package")
+import("private.action.require.impl.repository")
+import("private.action.require.impl.environment")
+import("private.action.require.impl.utils.get_requires")
 
 -- export the given packages
 function main(requires_raw)
diff --git a/xmake/modules/private/package/fetch.lua b/xmake/modules/private/action/require/fetch.lua
index f9c923916..e64b7f0b0 100644
--- a/xmake/modules/private/package/fetch.lua
+++ b/xmake/modules/private/action/require/fetch.lua
@@ -25,9 +25,9 @@ import("core.project.project")
 import("core.package.package", {alias = "core_package"})
 import("core.tool.linker")
 import("core.tool.compiler")
-import("private.package.impl.package")
-import("private.package.impl.repository")
-import("private.package.impl.utils.get_requires")
+import("private.action.require.impl.package")
+import("private.action.require.impl.repository")
+import("private.action.require.impl.utils.get_requires")
 
 -- fetch the given package info
 function main(requires_raw)
diff --git a/xmake/modules/private/package/impl/actions/download.lua b/xmake/modules/private/action/require/impl/actions/download.lua
index 7200db0a7..620ba67ec 100644
--- a/xmake/modules/private/package/impl/actions/download.lua
+++ b/xmake/modules/private/action/require/impl/actions/download.lua
@@ -26,8 +26,8 @@ import("core.project.config")
 import("core.package.package", {alias = "core_package"})
 import("lib.detect.find_file")
 import("lib.detect.find_directory")
-import("private.package.impl.utils.filter")
-import("private.package.impl..utils.url_filename")
+import("private.action.require.impl.utils.filter")
+import("private.action.require.impl..utils.url_filename")
 import("net.http")
 import("devel.git")
 import("utils.archive")
diff --git a/xmake/modules/private/package/impl/actions/download_resources.lua b/xmake/modules/private/action/require/impl/actions/download_resources.lua
index 6447b3ea2..6447b3ea2 100644
--- a/xmake/modules/private/package/impl/actions/download_resources.lua
+++ b/xmake/modules/private/action/require/impl/actions/download_resources.lua
diff --git a/xmake/modules/private/package/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua
index 8de1c3aa8..a9a46d49b 100644
--- a/xmake/modules/private/package/impl/actions/install.lua
+++ b/xmake/modules/private/action/require/impl/actions/install.lua
@@ -23,10 +23,10 @@ import("core.base.option")
 import("core.base.tty")
 import("core.project.target")
 import("lib.detect.find_file")
-import("private.package.impl.actions.test")
-import("private.package.impl.actions.patch_sources")
-import("private.package.impl.actions.download_resources")
-import("private.package.impl.utils.filter")
+import("private.action.require.impl.actions.test")
+import("private.action.require.impl.actions.patch_sources")
+import("private.action.require.impl.actions.download_resources")
+import("private.action.require.impl.utils.filter")
 
 -- patch pkgconfig if not exists
 function _patch_pkgconfig(package)
diff --git a/xmake/modules/private/package/impl/actions/patch_sources.lua b/xmake/modules/private/action/require/impl/actions/patch_sources.lua
index 110330af0..110330af0 100644
--- a/xmake/modules/private/package/impl/actions/patch_sources.lua
+++ b/xmake/modules/private/action/require/impl/actions/patch_sources.lua
diff --git a/xmake/modules/private/package/impl/actions/test.lua b/xmake/modules/private/action/require/impl/actions/test.lua
index caf784ffb..f29910f2a 100644
--- a/xmake/modules/private/package/impl/actions/test.lua
+++ b/xmake/modules/private/action/require/impl/actions/test.lua
@@ -20,7 +20,7 @@
 
 -- imports
 import("core.base.option")
-import("private.package.impl.utils.filter")
+import("private.action.require.impl.utils.filter")
 
 -- test the given package
 function main(package)
diff --git a/xmake/modules/private/package/impl/environment.lua b/xmake/modules/private/action/require/impl/environment.lua
index 2485e58c9..e7832d6a1 100644
--- a/xmake/modules/private/package/impl/environment.lua
+++ b/xmake/modules/private/action/require/impl/environment.lua
@@ -22,8 +22,8 @@
 import("core.project.config")
 import("core.package.package", {alias = "core_package"})
 import("lib.detect.find_tool")
-import("private.package.impl.packagenv")
-import("private.package.impl.package")
+import("private.action.require.impl.packagenv")
+import("private.action.require.impl.package")
 
 -- enter environment
 --
diff --git a/xmake/modules/private/package/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index dff6bd7cc..a3d69a982 100644
--- a/xmake/modules/private/package/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -35,7 +35,7 @@ import("actions.install", {alias = "action_install"})
 import("actions.download", {alias = "action_download"})
 import("devel.git")
 import("net.fasturl")
-import("private.package.impl.repository")
+import("private.action.require.impl.repository")
 
 -- get memcache
 function _memcache()
diff --git a/xmake/modules/private/package/impl/packagenv.lua b/xmake/modules/private/action/require/impl/packagenv.lua
index 232670b54..232670b54 100644
--- a/xmake/modules/private/package/impl/packagenv.lua
+++ b/xmake/modules/private/action/require/impl/packagenv.lua
diff --git a/xmake/modules/private/package/impl/repository.lua b/xmake/modules/private/action/require/impl/repository.lua
index 6fc72d49c..6fc72d49c 100644
--- a/xmake/modules/private/package/impl/repository.lua
+++ b/xmake/modules/private/action/require/impl/repository.lua
diff --git a/xmake/modules/private/package/impl/utils/filter.lua b/xmake/modules/private/action/require/impl/utils/filter.lua
index 11bdf70de..11bdf70de 100644
--- a/xmake/modules/private/package/impl/utils/filter.lua
+++ b/xmake/modules/private/action/require/impl/utils/filter.lua
diff --git a/xmake/modules/private/package/impl/utils/get_requires.lua b/xmake/modules/private/action/require/impl/utils/get_requires.lua
index 9a0ad76c1..9a0ad76c1 100644
--- a/xmake/modules/private/package/impl/utils/get_requires.lua
+++ b/xmake/modules/private/action/require/impl/utils/get_requires.lua
diff --git a/xmake/modules/private/package/impl/utils/url_filename.lua b/xmake/modules/private/action/require/impl/utils/url_filename.lua
index e17e8673b..e17e8673b 100644
--- a/xmake/modules/private/package/impl/utils/url_filename.lua
+++ b/xmake/modules/private/action/require/impl/utils/url_filename.lua
diff --git a/xmake/modules/private/package/info.lua b/xmake/modules/private/action/require/info.lua
index 847e0e989..37d4eb6a3 100644
--- a/xmake/modules/private/package/info.lua
+++ b/xmake/modules/private/action/require/info.lua
@@ -26,12 +26,12 @@ import("core.project.project")
 import("core.package.package", {alias = "core_package"})
 import("devel.git")
 import("utils.archive")
-import("private.package.impl.utils.filter")
-import("private.package.impl.utils.url_filename")
-import("private.package.impl.package")
-import("private.package.impl.repository")
-import("private.package.impl.environment")
-import("private.package.impl.utils.get_requires")
+import("private.action.require.impl.utils.filter")
+import("private.action.require.impl.utils.url_filename")
+import("private.action.require.impl.package")
+import("private.action.require.impl.repository")
+import("private.action.require.impl.environment")
+import("private.action.require.impl.utils.get_requires")
 
 -- from xmake/system/remote?
 function _from(instance)
diff --git a/xmake/modules/private/package/install.lua b/xmake/modules/private/action/require/install.lua
index 4850f0c08..f7be8b9b9 100644
--- a/xmake/modules/private/package/install.lua
+++ b/xmake/modules/private/action/require/install.lua
@@ -23,10 +23,10 @@ import("core.base.option")
 import("core.base.task")
 import("core.project.project")
 import("lib.detect.find_tool")
-import("private.package.impl.package")
-import("private.package.impl.repository")
-import("private.package.impl.environment")
-import("private.package.impl.utils.get_requires")
+import("private.action.require.impl.package")
+import("private.action.require.impl.repository")
+import("private.action.require.impl.environment")
+import("private.action.require.impl.utils.get_requires")
 
 -- register required package environments
 -- envs: bin path for *.dll, program ..
diff --git a/xmake/modules/private/package/list.lua b/xmake/modules/private/action/require/list.lua
index f9983fe04..2a165111b 100644
--- a/xmake/modules/private/package/list.lua
+++ b/xmake/modules/private/action/require/list.lua
@@ -21,9 +21,9 @@
 -- imports
 import("core.project.project")
 import("core.base.task")
-import("private.package.impl.package")
-import("private.package.impl.repository")
-import("private.package.impl.environment")
+import("private.action.require.impl.package")
+import("private.action.require.impl.repository")
+import("private.action.require.impl.environment")
 
 -- from xmake/system/remote?
 function _from(instance)
diff --git a/xmake/modules/private/package/scan.lua b/xmake/modules/private/action/require/scan.lua
index a038f9f9e..a038f9f9e 100644
--- a/xmake/modules/private/package/scan.lua
+++ b/xmake/modules/private/action/require/scan.lua
diff --git a/xmake/modules/private/package/search.lua b/xmake/modules/private/action/require/search.lua
index 0c4a8b91f..2637e6c36 100644
--- a/xmake/modules/private/package/search.lua
+++ b/xmake/modules/private/action/require/search.lua
@@ -20,10 +20,10 @@
 
 -- imports
 import("core.base.task")
-import("private.package.impl.utils.filter")
-import("private.package.impl.package")
-import("private.package.impl.repository")
-import("private.package.impl.environment")
+import("private.action.require.impl.utils.filter")
+import("private.action.require.impl.package")
+import("private.action.require.impl.repository")
+import("private.action.require.impl.environment")
 
 -- search the given packages
 function main(names)
diff --git a/xmake/modules/private/package/uninstall.lua b/xmake/modules/private/action/require/uninstall.lua
index 49c23a3cd..2d690614b 100644
--- a/xmake/modules/private/package/uninstall.lua
+++ b/xmake/modules/private/action/require/uninstall.lua
@@ -21,10 +21,10 @@
 -- imports
 import("core.base.task")
 import("core.base.option")
-import("private.package.impl.package")
-import("private.package.impl.repository")
-import("private.package.impl.environment")
-import("private.package.impl.utils.get_requires")
+import("private.action.require.impl.package")
+import("private.action.require.impl.repository")
+import("private.action.require.impl.environment")
+import("private.action.require.impl.utils.get_requires")
 
 -- uninstall the given packages
 function main(requires_raw)