summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-02-12 23:01:26 +0800
committerruki <[email protected]>2021-02-12 23:01:26 +0800
commite66d6878040a80e6512db851750185b8ab35b127 (patch)
treea2c4e681a917a4fb398938483a0485854f085e1c
parent5cd7e9ab5bccd3bf469eb5da49f70085a9753696 (diff)
fix import
-rw-r--r--xmake/actions/update/main.lua2
-rw-r--r--xmake/modules/private/xrepo/action/env.lua2
-rw-r--r--xmake/plugins/plugin/main.lua2
-rw-r--r--xmake/plugins/project/vstudio/impl/vs201x.lua2
-rw-r--r--xmake/plugins/project/vsxmake/getinfo.lua2
-rw-r--r--xmake/plugins/repo/main.lua2
6 files changed, 6 insertions, 6 deletions
diff --git a/xmake/actions/update/main.lua b/xmake/actions/update/main.lua
index 5a5786e74..9ed4f412a 100644
--- a/xmake/actions/update/main.lua
+++ b/xmake/actions/update/main.lua
@@ -30,7 +30,7 @@ import("net.fasturl")
import("core.base.privilege")
import("privilege.sudo")
import("private.async.runjobs")
-import("actions.require.impl.environment", {rootdir = os.programdir()})
+import("private.action.require.impl.environment")
import("private.action.update.fetch_version")
import("utils.archive")
import("lib.detect.find_file")
diff --git a/xmake/modules/private/xrepo/action/env.lua b/xmake/modules/private/xrepo/action/env.lua
index 90f8cd520..cc49534c7 100644
--- a/xmake/modules/private/xrepo/action/env.lua
+++ b/xmake/modules/private/xrepo/action/env.lua
@@ -21,7 +21,7 @@
-- imports
import("core.base.option")
import("core.project.config")
-import("actions.require.impl.package", {rootdir = os.programdir()})
+import("private.action.require.impl.package")
-- get menu options
function menu_options()
diff --git a/xmake/plugins/plugin/main.lua b/xmake/plugins/plugin/main.lua
index d2a8f263f..37ffa1050 100644
--- a/xmake/plugins/plugin/main.lua
+++ b/xmake/plugins/plugin/main.lua
@@ -23,7 +23,7 @@ import("core.base.option")
import("core.base.global")
import("devel.git")
import("net.fasturl")
-import("actions.require.impl.environment", {rootdir = os.programdir()})
+import("private.action.require.impl.environment")
-- install plugins
function _install()
diff --git a/xmake/plugins/project/vstudio/impl/vs201x.lua b/xmake/plugins/project/vstudio/impl/vs201x.lua
index 28454ba6e..268383919 100644
--- a/xmake/plugins/project/vstudio/impl/vs201x.lua
+++ b/xmake/plugins/project/vstudio/impl/vs201x.lua
@@ -31,7 +31,7 @@ import("vs201x_vcxproj")
import("vs201x_vcxproj_filters")
import("core.cache.memcache")
import("core.cache.localcache")
-import("actions.require.install", {alias = "install_requires", rootdir = os.programdir()})
+import("private.action.require.install", {alias = "install_requires"})
import("actions.config.configfiles", {alias = "generate_configfiles", rootdir = os.programdir()})
import("actions.config.configheader", {alias = "generate_configheader", rootdir = os.programdir()})
diff --git a/xmake/plugins/project/vsxmake/getinfo.lua b/xmake/plugins/project/vsxmake/getinfo.lua
index 435f1f3f6..75bb65aa9 100644
--- a/xmake/plugins/project/vsxmake/getinfo.lua
+++ b/xmake/plugins/project/vsxmake/getinfo.lua
@@ -31,7 +31,7 @@ import("core.cache.memcache")
import("core.cache.localcache")
import("lib.detect.find_tool")
import("private.action.run.make_runenvs")
-import("actions.require.install", {alias = "install_requires", rootdir = os.programdir()})
+import("private.action.require.install", {alias = "install_requires"})
import("actions.config.configheader", {alias = "generate_configheader", rootdir = os.programdir()})
import("actions.config.configfiles", {alias = "generate_configfiles", rootdir = os.programdir()})
diff --git a/xmake/plugins/repo/main.lua b/xmake/plugins/repo/main.lua
index f8bf1bd4d..a4ec01b90 100644
--- a/xmake/plugins/repo/main.lua
+++ b/xmake/plugins/repo/main.lua
@@ -26,7 +26,7 @@ import("core.platform.platform")
import("core.package.repository")
import("devel.git")
import("private.async.runjobs")
-import("actions.require.impl.environment", {rootdir = os.programdir()})
+import("private.action.require.impl.environment")
-- add repository url
function _add(name, url, branch, is_global)