summaryrefslogtreecommitdiff
path: root/xmake/rules/utils
diff options
context:
space:
mode:
authorruki <[email protected]>2021-10-09 11:58:10 +0800
committerruki <[email protected]>2021-10-09 11:58:10 +0800
commita01e17a5049bdd02ddc2514bd47af74cf2ff802d (patch)
tree83cea0cf9fa564bd0bbbddb35a366b64a404635e /xmake/rules/utils
parent59498b047190411a144f821a5cc40174faeaaa9a (diff)
move private.utils.progress to utils.progress
Diffstat (limited to 'xmake/rules/utils')
-rw-r--r--xmake/rules/utils/merge_archive/merge_archive.lua2
-rw-r--r--xmake/rules/utils/merge_archive/xmake.lua2
-rw-r--r--xmake/rules/utils/merge_object/xmake.lua2
-rw-r--r--xmake/rules/utils/symbols/export_all/export_all.lua2
-rw-r--r--xmake/rules/utils/symbols/extract/xmake.lua2
5 files changed, 5 insertions, 5 deletions
diff --git a/xmake/rules/utils/merge_archive/merge_archive.lua b/xmake/rules/utils/merge_archive/merge_archive.lua
index 96069befb..c98fc6b31 100644
--- a/xmake/rules/utils/merge_archive/merge_archive.lua
+++ b/xmake/rules/utils/merge_archive/merge_archive.lua
@@ -23,7 +23,7 @@ import("core.base.option")
import("core.theme.theme")
import("core.project.depend")
import("core.project.target", {alias = "project_target"})
-import("private.utils.progress")
+import("utils.progress")
import("core.tool.toolchain")
import("private.tools.vstool")
diff --git a/xmake/rules/utils/merge_archive/xmake.lua b/xmake/rules/utils/merge_archive/xmake.lua
index 62e3900ff..fd7805d8b 100644
--- a/xmake/rules/utils/merge_archive/xmake.lua
+++ b/xmake/rules/utils/merge_archive/xmake.lua
@@ -25,7 +25,7 @@ rule("utils.merge.archive")
if target:policy("build.merge_archive") and target:is_static() then
import("utils.archive.merge_staticlib")
import("core.project.depend")
- import("private.utils.progress")
+ import("utils.progress")
local libraryfiles = {}
for _, dep in ipairs(target:orderdeps()) do
if dep:is_static() then
diff --git a/xmake/rules/utils/merge_object/xmake.lua b/xmake/rules/utils/merge_object/xmake.lua
index 167e9013e..8bebb5f5c 100644
--- a/xmake/rules/utils/merge_object/xmake.lua
+++ b/xmake/rules/utils/merge_object/xmake.lua
@@ -31,7 +31,7 @@ rule("utils.merge.object")
import("core.base.option")
import("core.theme.theme")
import("core.project.depend")
- import("private.utils.progress")
+ import("utils.progress")
-- get object file
local objectfile = target:objectfile(sourcefile_obj)
diff --git a/xmake/rules/utils/symbols/export_all/export_all.lua b/xmake/rules/utils/symbols/export_all/export_all.lua
index 1a40e9820..800157411 100644
--- a/xmake/rules/utils/symbols/export_all/export_all.lua
+++ b/xmake/rules/utils/symbols/export_all/export_all.lua
@@ -24,7 +24,7 @@ import("core.tool.toolchain")
import("core.base.option")
import("core.base.hashset")
import("core.project.depend")
-import("private.utils.progress")
+import("utils.progress")
-- export all symbols for dynamic library
function main (target, opt)
diff --git a/xmake/rules/utils/symbols/extract/xmake.lua b/xmake/rules/utils/symbols/extract/xmake.lua
index f78cab808..dd1f3a1df 100644
--- a/xmake/rules/utils/symbols/extract/xmake.lua
+++ b/xmake/rules/utils/symbols/extract/xmake.lua
@@ -46,7 +46,7 @@ rule("utils.symbols.extract")
import("core.theme.theme")
import("core.project.depend")
import("core.platform.platform")
- import("private.utils.progress")
+ import("utils.progress")
-- get strip
local strip = target:tool("strip")