modify require impl modules

13 files changed, 23 insertions, 23 deletions

diff --git a/xmake/actions/require/action/download.lua b/xmake/actions/require/impl/action/download.lua
index bb5017e5f..6fc0d5f3c 100644
--- a/xmake/actions/require/action/download.lua
+++ b/xmake/actions/require/impl/action/download.lua
@@ -24,7 +24,7 @@
 
 -- imports
 import("core.base.option")
-import("filter")
+import(".utils.filter")
 import("net.http")
 import("devel.git")
 import("utils.archive")
diff --git a/xmake/actions/require/action/install.lua b/xmake/actions/require/impl/action/install.lua
index 0af940549..5beb0e8f1 100644
--- a/xmake/actions/require/action/install.lua
+++ b/xmake/actions/require/impl/action/install.lua
@@ -26,7 +26,7 @@
 import("core.base.option")
 import("core.project.target")
 import("test")
-import("filter")
+import(".utils.filter")
 
 -- uninstall package from the prefix directory
 function uninstall_prefix(package)
diff --git a/xmake/actions/require/action/test.lua b/xmake/actions/require/impl/action/test.lua
index dba807865..8fa9caa55 100644
--- a/xmake/actions/require/action/test.lua
+++ b/xmake/actions/require/impl/action/test.lua
@@ -24,7 +24,7 @@
 
 -- imports
 import("core.base.option")
-import("filter")
+import(".utils.filter")
 
 -- test the given package
 function main(package)
diff --git a/xmake/actions/require/environment.lua b/xmake/actions/require/impl/environment.lua
index f340ab7eb..f340ab7eb 100644
--- a/xmake/actions/require/environment.lua
+++ b/xmake/actions/require/impl/environment.lua
diff --git a/xmake/actions/require/package.lua b/xmake/actions/require/impl/package.lua
index fc67ea232..fc67ea232 100644
--- a/xmake/actions/require/package.lua
+++ b/xmake/actions/require/impl/package.lua
diff --git a/xmake/actions/require/repository.lua b/xmake/actions/require/impl/repository.lua
index f9fa4d3cb..f9fa4d3cb 100644
--- a/xmake/actions/require/repository.lua
+++ b/xmake/actions/require/impl/repository.lua
diff --git a/xmake/actions/require/action/filter.lua b/xmake/actions/require/impl/utils/filter.lua
index 209c703ba..209c703ba 100644
--- a/xmake/actions/require/action/filter.lua
+++ b/xmake/actions/require/impl/utils/filter.lua
diff --git a/xmake/actions/require/info.lua b/xmake/actions/require/info.lua
index 8fcbe8d9e..19a51139f 100644
--- a/xmake/actions/require/info.lua
+++ b/xmake/actions/require/info.lua
@@ -26,10 +26,10 @@
 import("core.base.task")
 import("core.base.option")
 import("core.project.project")
-import("action.filter")
-import("package")
-import("repository")
-import("environment")
+import("impl.utils.filter")
+import("impl.package")
+import("impl.repository")
+import("impl.environment")
 
 -- show the given package info
 function main(requires)
diff --git a/xmake/actions/require/install.lua b/xmake/actions/require/install.lua
index e43e99b4d..f42380d2a 100644
--- a/xmake/actions/require/install.lua
+++ b/xmake/actions/require/install.lua
@@ -27,9 +27,9 @@ import("core.base.option")
 import("core.base.task")
 import("core.project.project")
 import("lib.detect.find_tool")
-import("package")
-import("repository")
-import("environment")
+import("impl.package")
+import("impl.repository")
+import("impl.environment")
 
 -- attach package to option
 function _attach_to_option(instance, opt)
diff --git a/xmake/actions/require/list.lua b/xmake/actions/require/list.lua
index 54356d14d..066ed2a64 100644
--- a/xmake/actions/require/list.lua
+++ b/xmake/actions/require/list.lua
@@ -25,9 +25,9 @@
 -- imports
 import("core.project.project")
 import("core.base.task")
-import("package")
-import("repository")
-import("environment")
+import("impl.package")
+import("impl.repository")
+import("impl.environment")
 
 -- from local/global/system/remote?
 function _from(instance)
diff --git a/xmake/actions/require/remove.lua b/xmake/actions/require/remove.lua
index 4296ab05c..4ca2dc207 100644
--- a/xmake/actions/require/remove.lua
+++ b/xmake/actions/require/remove.lua
@@ -25,9 +25,9 @@
 -- imports
 import("core.base.task")
 import("core.base.option")
-import("package")
-import("repository")
-import("environment")
+import("impl.package")
+import("impl.repository")
+import("impl.environment")
 
 -- show the given package info
 function main(requires)
diff --git a/xmake/actions/require/search.lua b/xmake/actions/require/search.lua
index c7e341337..f2f11a75c 100644
--- a/xmake/actions/require/search.lua
+++ b/xmake/actions/require/search.lua
@@ -24,10 +24,10 @@
 
 -- imports
 import("core.base.task")
-import("action.filter")
-import("package")
-import("repository")
-import("environment")
+import("impl.utils.filter")
+import("impl.package")
+import("impl.repository")
+import("impl.environment")
 
 -- search the given packages
 function main(names)
diff --git a/xmake/core/sandbox/modules/import/core/sandbox/module.lua b/xmake/core/sandbox/modules/import/core/sandbox/module.lua
index 8f73bf298..c51c16ef1 100644
--- a/xmake/core/sandbox/modules/import/core/sandbox/module.lua
+++ b/xmake/core/sandbox/modules/import/core/sandbox/module.lua
@@ -278,7 +278,7 @@ end
 -- import module
 --
 -- @param name      the module name, .e.g core.platform
--- @param opt       the argument options, .e.g {alias = "", rootdir = "", try = false, inherit = false, anonymous = false, nocache = false}
+-- @param opt       the argument options, .e.g {alias = "", nolocal = true, rootdir = "", try = false, inherit = false, anonymous = false, nocache = false}
 --
 -- @return          the module instance
 --
@@ -342,8 +342,8 @@ function core_sandbox_module.import(name, opt)
     local rootdir = opt.rootdir or instance:rootdir()
     assert(rootdir)
 
-    -- init module directories
-    local modules_directories = table.join(rootdir, core_sandbox_module.directories())
+    -- init module directories (disable local packages?)
+    local modules_directories = opt.nolocal and core_sandbox_module.directories() or table.join(rootdir, core_sandbox_module.directories())
 
     -- load module
     local found = false