move require impl

24 files changed, 49 insertions, 49 deletions

diff --git a/xmake/actions/build/statistics.lua b/xmake/actions/build/statistics.lua
index c98684cd6..1f8126c83 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.action.require.packagenv")
+import("private.package.impl.packagenv")
 
 -- statistics is enabled?
 function _is_enabled()
diff --git a/xmake/actions/config/main.lua b/xmake/actions/config/main.lua
index 6acdf7999..73b73dbea 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("actions.require.install", {alias = "install_requires", rootdir = os.programdir()})
+import("private.package.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 bdac48cdf..7b068ff70 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("list")
-import("scan")
-import("info")
-import("fetch")
-import("clean")
-import("search")
-import("export")
-import("install")
-import("uninstall")
+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")
 
 --
 -- the default repositories:
diff --git a/xmake/actions/require/clean.lua b/xmake/modules/private/package/clean.lua
index fb93e6304..fb93e6304 100644
--- a/xmake/actions/require/clean.lua
+++ b/xmake/modules/private/package/clean.lua
diff --git a/xmake/actions/require/export.lua b/xmake/modules/private/package/export.lua
index 76b53f29c..3902b87f6 100644
--- a/xmake/actions/require/export.lua
+++ b/xmake/modules/private/package/export.lua
@@ -21,10 +21,10 @@
 -- imports
 import("core.base.task")
 import("core.base.option")
-import("impl.package")
-import("impl.repository")
-import("impl.environment")
-import("impl.utils.get_requires")
+import("private.package.impl.package")
+import("private.package.impl.repository")
+import("private.package.impl.environment")
+import("private.package.impl.utils.get_requires")
 
 -- export the given packages
 function main(requires_raw)
diff --git a/xmake/actions/require/fetch.lua b/xmake/modules/private/package/fetch.lua
index 7a7a85fce..f9c923916 100644
--- a/xmake/actions/require/fetch.lua
+++ b/xmake/modules/private/package/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("impl.package")
-import("impl.repository")
-import("impl.utils.get_requires")
+import("private.package.impl.package")
+import("private.package.impl.repository")
+import("private.package.impl.utils.get_requires")
 
 -- fetch the given package info
 function main(requires_raw)
diff --git a/xmake/actions/require/impl/actions/download.lua b/xmake/modules/private/package/impl/actions/download.lua
index af1c96b75..7200db0a7 100644
--- a/xmake/actions/require/impl/actions/download.lua
+++ b/xmake/modules/private/package/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(".utils.filter")
-import(".utils.url_filename")
+import("private.package.impl.utils.filter")
+import("private.package.impl..utils.url_filename")
 import("net.http")
 import("devel.git")
 import("utils.archive")
diff --git a/xmake/actions/require/impl/actions/download_resources.lua b/xmake/modules/private/package/impl/actions/download_resources.lua
index 6447b3ea2..6447b3ea2 100644
--- a/xmake/actions/require/impl/actions/download_resources.lua
+++ b/xmake/modules/private/package/impl/actions/download_resources.lua
diff --git a/xmake/actions/require/impl/actions/install.lua b/xmake/modules/private/package/impl/actions/install.lua
index 4b077b373..8de1c3aa8 100644
--- a/xmake/actions/require/impl/actions/install.lua
+++ b/xmake/modules/private/package/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("test")
-import("patch_sources")
-import("download_resources")
-import(".utils.filter")
+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")
 
 -- patch pkgconfig if not exists
 function _patch_pkgconfig(package)
diff --git a/xmake/actions/require/impl/actions/patch_sources.lua b/xmake/modules/private/package/impl/actions/patch_sources.lua
index 110330af0..110330af0 100644
--- a/xmake/actions/require/impl/actions/patch_sources.lua
+++ b/xmake/modules/private/package/impl/actions/patch_sources.lua
diff --git a/xmake/actions/require/impl/actions/test.lua b/xmake/modules/private/package/impl/actions/test.lua
index 2cad6f689..caf784ffb 100644
--- a/xmake/actions/require/impl/actions/test.lua
+++ b/xmake/modules/private/package/impl/actions/test.lua
@@ -20,7 +20,7 @@
 
 -- imports
 import("core.base.option")
-import(".utils.filter")
+import("private.package.impl.utils.filter")
 
 -- test the given package
 function main(package)
diff --git a/xmake/actions/require/impl/environment.lua b/xmake/modules/private/package/impl/environment.lua
index 89034fabf..2485e58c9 100644
--- a/xmake/actions/require/impl/environment.lua
+++ b/xmake/modules/private/package/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.action.require.packagenv")
-import("package")
+import("private.package.impl.packagenv")
+import("private.package.impl.package")
 
 -- enter environment
 --
diff --git a/xmake/actions/require/impl/package.lua b/xmake/modules/private/package/impl/package.lua
index 17589aaf4..dff6bd7cc 100644
--- a/xmake/actions/require/impl/package.lua
+++ b/xmake/modules/private/package/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("repository")
+import("private.package.impl.repository")
 
 -- get memcache
 function _memcache()
diff --git a/xmake/modules/private/action/require/packagenv.lua b/xmake/modules/private/package/impl/packagenv.lua
index 232670b54..232670b54 100644
--- a/xmake/modules/private/action/require/packagenv.lua
+++ b/xmake/modules/private/package/impl/packagenv.lua
diff --git a/xmake/actions/require/impl/repository.lua b/xmake/modules/private/package/impl/repository.lua
index 6fc72d49c..6fc72d49c 100644
--- a/xmake/actions/require/impl/repository.lua
+++ b/xmake/modules/private/package/impl/repository.lua
diff --git a/xmake/actions/require/impl/utils/filter.lua b/xmake/modules/private/package/impl/utils/filter.lua
index 11bdf70de..11bdf70de 100644
--- a/xmake/actions/require/impl/utils/filter.lua
+++ b/xmake/modules/private/package/impl/utils/filter.lua
diff --git a/xmake/actions/require/impl/utils/get_requires.lua b/xmake/modules/private/package/impl/utils/get_requires.lua
index 9a0ad76c1..9a0ad76c1 100644
--- a/xmake/actions/require/impl/utils/get_requires.lua
+++ b/xmake/modules/private/package/impl/utils/get_requires.lua
diff --git a/xmake/actions/require/impl/utils/url_filename.lua b/xmake/modules/private/package/impl/utils/url_filename.lua
index e17e8673b..e17e8673b 100644
--- a/xmake/actions/require/impl/utils/url_filename.lua
+++ b/xmake/modules/private/package/impl/utils/url_filename.lua
diff --git a/xmake/actions/require/info.lua b/xmake/modules/private/package/info.lua
index 1c33c51ca..847e0e989 100644
--- a/xmake/actions/require/info.lua
+++ b/xmake/modules/private/package/info.lua
@@ -26,12 +26,12 @@ import("core.project.project")
 import("core.package.package", {alias = "core_package"})
 import("devel.git")
 import("utils.archive")
-import("impl.utils.filter")
-import("impl.utils.url_filename")
-import("impl.package")
-import("impl.repository")
-import("impl.environment")
-import("impl.utils.get_requires")
+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")
 
 -- from xmake/system/remote?
 function _from(instance)
diff --git a/xmake/actions/require/install.lua b/xmake/modules/private/package/install.lua
index 674adf203..4850f0c08 100644
--- a/xmake/actions/require/install.lua
+++ b/xmake/modules/private/package/install.lua
@@ -23,10 +23,10 @@ import("core.base.option")
 import("core.base.task")
 import("core.project.project")
 import("lib.detect.find_tool")
-import("impl.package")
-import("impl.repository")
-import("impl.environment")
-import("impl.utils.get_requires")
+import("private.package.impl.package")
+import("private.package.impl.repository")
+import("private.package.impl.environment")
+import("private.package.impl.utils.get_requires")
 
 -- register required package environments
 -- envs: bin path for *.dll, program ..
diff --git a/xmake/actions/require/list.lua b/xmake/modules/private/package/list.lua
index da4f8001c..f9983fe04 100644
--- a/xmake/actions/require/list.lua
+++ b/xmake/modules/private/package/list.lua
@@ -21,9 +21,9 @@
 -- imports
 import("core.project.project")
 import("core.base.task")
-import("impl.package")
-import("impl.repository")
-import("impl.environment")
+import("private.package.impl.package")
+import("private.package.impl.repository")
+import("private.package.impl.environment")
 
 -- from xmake/system/remote?
 function _from(instance)
diff --git a/xmake/actions/require/scan.lua b/xmake/modules/private/package/scan.lua
index a038f9f9e..a038f9f9e 100644
--- a/xmake/actions/require/scan.lua
+++ b/xmake/modules/private/package/scan.lua
diff --git a/xmake/actions/require/search.lua b/xmake/modules/private/package/search.lua
index 0055d620e..0c4a8b91f 100644
--- a/xmake/actions/require/search.lua
+++ b/xmake/modules/private/package/search.lua
@@ -20,10 +20,10 @@
 
 -- imports
 import("core.base.task")
-import("impl.utils.filter")
-import("impl.package")
-import("impl.repository")
-import("impl.environment")
+import("private.package.impl.utils.filter")
+import("private.package.impl.package")
+import("private.package.impl.repository")
+import("private.package.impl.environment")
 
 -- search the given packages
 function main(names)
diff --git a/xmake/actions/require/uninstall.lua b/xmake/modules/private/package/uninstall.lua
index 4b2d9e198..49c23a3cd 100644
--- a/xmake/actions/require/uninstall.lua
+++ b/xmake/modules/private/package/uninstall.lua
@@ -21,10 +21,10 @@
 -- imports
 import("core.base.task")
 import("core.base.option")
-import("impl.package")
-import("impl.repository")
-import("impl.environment")
-import("impl.utils.get_requires")
+import("private.package.impl.package")
+import("private.package.impl.repository")
+import("private.package.impl.environment")
+import("private.package.impl.utils.get_requires")
 
 -- uninstall the given packages
 function main(requires_raw)