summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2025-01-25 00:05:31 +0800
committerruki <[email protected]>2025-01-25 00:05:31 +0800
commit8729cdf3afc01932f67ba826ceda14b0319d3f7f (patch)
treebcaf55aac78da74bbe42c8f2cb3f97282714a0d9
parent7f01ecf6da7e040d4b0e27efaa035a8f27533e5e (diff)
fix import
-rw-r--r--xmake/modules/core/tools/cl.lua4
-rw-r--r--xmake/modules/core/tools/cl/parse_include.lua2
-rw-r--r--xmake/modules/core/tools/cl2000/parse_deps.lua2
-rw-r--r--xmake/modules/core/tools/ifort.lua2
-rw-r--r--xmake/modules/core/tools/link.lua2
-rw-r--r--xmake/modules/core/tools/ml.lua2
-rw-r--r--xmake/modules/core/tools/rc.lua2
-rw-r--r--xmake/plugins/project/ninja/build_ninja.lua2
8 files changed, 9 insertions, 9 deletions
diff --git a/xmake/modules/core/tools/cl.lua b/xmake/modules/core/tools/cl.lua
index 8a2971328..3b73719e7 100644
--- a/xmake/modules/core/tools/cl.lua
+++ b/xmake/modules/core/tools/cl.lua
@@ -25,8 +25,8 @@ import("core.base.hashset")
import("core.project.project")
import("core.project.policy")
import("core.language.language")
-import("private.tools.vstool")
-import("private.tools.cl.parse_include")
+import("core.tools.vstool")
+import("core.tools.cl.parse_include")
import("private.cache.build_cache")
import("private.service.distcc_build.client", {alias = "distcc_build_client"})
import("utils.progress")
diff --git a/xmake/modules/core/tools/cl/parse_include.lua b/xmake/modules/core/tools/cl/parse_include.lua
index 700f9823f..009d6d1f5 100644
--- a/xmake/modules/core/tools/cl/parse_include.lua
+++ b/xmake/modules/core/tools/cl/parse_include.lua
@@ -24,7 +24,7 @@ import("core.base.hashset")
import("core.tool.toolchain")
import("core.cache.detectcache")
import("lib.detect.find_tool")
-import("private.tools.vstool")
+import("core.tools.vstool")
-- probe include note prefix from cl
function probe_include_note_from_cl()
diff --git a/xmake/modules/core/tools/cl2000/parse_deps.lua b/xmake/modules/core/tools/cl2000/parse_deps.lua
index e02cf0501..c5d6e29c6 100644
--- a/xmake/modules/core/tools/cl2000/parse_deps.lua
+++ b/xmake/modules/core/tools/cl2000/parse_deps.lua
@@ -19,5 +19,5 @@
--
-- imports
-inherit("private.tools.cl6x.parse_deps")
+inherit("core.tools.cl6x.parse_deps")
diff --git a/xmake/modules/core/tools/ifort.lua b/xmake/modules/core/tools/ifort.lua
index 2d48f34c7..6235c50ff 100644
--- a/xmake/modules/core/tools/ifort.lua
+++ b/xmake/modules/core/tools/ifort.lua
@@ -23,7 +23,7 @@ if is_host("windows") then
-- imports
inherit("cl")
inherit("link")
- import("private.tools.vstool")
+ import("core.tools.vstool")
-- init it
function init(self)
diff --git a/xmake/modules/core/tools/link.lua b/xmake/modules/core/tools/link.lua
index 3e51ad40a..62f794bdd 100644
--- a/xmake/modules/core/tools/link.lua
+++ b/xmake/modules/core/tools/link.lua
@@ -20,7 +20,7 @@
-- imports
import("core.project.config")
-import("private.tools.vstool")
+import("core.tools.vstool")
-- init it
function init(self)
diff --git a/xmake/modules/core/tools/ml.lua b/xmake/modules/core/tools/ml.lua
index 5bb1fb884..4af30e7e7 100644
--- a/xmake/modules/core/tools/ml.lua
+++ b/xmake/modules/core/tools/ml.lua
@@ -19,7 +19,7 @@
--
-- imports
-import("private.tools.vstool")
+import("core.tools.vstool")
import("core.base.hashset")
-- init it
diff --git a/xmake/modules/core/tools/rc.lua b/xmake/modules/core/tools/rc.lua
index 91c1984ca..423652b49 100644
--- a/xmake/modules/core/tools/rc.lua
+++ b/xmake/modules/core/tools/rc.lua
@@ -22,7 +22,7 @@
import("core.base.option")
import("core.base.hashset")
import("core.project.project")
-import("private.tools.vstool")
+import("core.tools.vstool")
-- normailize path of a dependecy
function _normailize_dep(dep, projectdir)
diff --git a/xmake/plugins/project/ninja/build_ninja.lua b/xmake/plugins/project/ninja/build_ninja.lua
index 7a9ce3998..819758447 100644
--- a/xmake/plugins/project/ninja/build_ninja.lua
+++ b/xmake/plugins/project/ninja/build_ninja.lua
@@ -27,7 +27,7 @@ import("core.tool.linker")
import("core.tool.compiler")
import("lib.detect.find_tool")
import("lib.detect.find_toolname")
-import("private.tools.cl.parse_include")
+import("core.tools.cl.parse_include")
-- this sourcebatch is built?
function _sourcebatch_is_built(sourcebatch)