From 1113aa27550a13f0ff18b0485418b5b6f63ccba6 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 26 Mar 2024 23:53:32 +0800 Subject: [PATCH] improve xpack #4877 --- xmake/plugins/pack/main.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/xmake/plugins/pack/main.lua b/xmake/plugins/pack/main.lua index c9576774fb..d55855143d 100644 --- a/xmake/plugins/pack/main.lua +++ b/xmake/plugins/pack/main.lua @@ -21,6 +21,7 @@ -- imports import("core.base.task") import("core.base.option") +import("core.project.config") import("core.project.project") import("private.service.remote_build.action", {alias = "remote_build_action"}) import("actions.build.main", {rootdir = os.programdir(), alias = "build_action"}) @@ -115,10 +116,7 @@ function main() project.lock() -- load config first - task.run("config", {}, {disable_dump = true}) - - -- load targets - project.load_targets() + config.load() -- enter project directory local oldir = os.cd(project.directory()) @@ -128,6 +126,9 @@ function main() _build_targets() end + -- load targets + project.load_targets() + -- do pack _pack_packages()