From 9638f2c33345e4c734a8b1c1fc1e4a0f7324c67d Mon Sep 17 00:00:00 2001 From: Jim Zhou Date: Fri, 10 Jul 2026 11:22:41 +0800 Subject: [PATCH] =?UTF-8?q?[0725]=20=E6=9B=B4=E6=96=B0=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E8=84=9A=E6=9C=AC=E4=BB=A5=E9=81=BF=E5=85=8D=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devel/0725.md | 15 +++++++++++++++ lolly/xmake.lua | 3 +-- xmake/goldfish.lua | 2 +- xmake/targets/libmogan.lua | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 devel/0725.md diff --git a/devel/0725.md b/devel/0725.md new file mode 100644 index 0000000000..214378b8f2 --- /dev/null +++ b/devel/0725.md @@ -0,0 +1,15 @@ +# [0725] 更新构建脚本以避免重复的依赖 + +## What +在构建脚本中修改了 tbox, argh 相关的内容,避免重复依赖 + +## Why +避免重复的依赖,减少构建时间以及产物大小 + +## 如何测试 + +``` +xmake f +``` + +检查即将安装的依赖中是否有重复项 diff --git a/lolly/xmake.lua b/lolly/xmake.lua index 68aaef70f4..fd7a361585 100644 --- a/lolly/xmake.lua +++ b/lolly/xmake.lua @@ -66,8 +66,7 @@ option_end() local MIMALLOC_VERSION = "2.1.2" local JEMALLOC_VERSION = "5.3.0" -tbox_configs = {hash=true, ["force-utf8"]=true, charset=true} -add_requires("liii-tbox", {system=false, configs=tbox_configs}) +add_requires("liii-tbox", {system=false}) if has_config("enable_tests") or is_mode("releasedbg") then add_requires("liii-doctest", {system=false}) add_requires("nanobench", {system=false}) diff --git a/xmake/goldfish.lua b/xmake/goldfish.lua index b3b86cd37b..be7610b714 100644 --- a/xmake/goldfish.lua +++ b/xmake/goldfish.lua @@ -23,7 +23,7 @@ package("goldfish") on_load(function (package) package:addenv("PATH", "bin") - package:add("deps", "argh") + package:add("deps", "argh v1.3.2") end) on_install("bsd", "cross", "cygwin", "linux", "macosx", "mingw", "msys", "wasm", "windows", function (package) diff --git a/xmake/targets/libmogan.lua b/xmake/targets/libmogan.lua index 9bcf6eb1c0..02f1f34d7b 100644 --- a/xmake/targets/libmogan.lua +++ b/xmake/targets/libmogan.lua @@ -84,7 +84,7 @@ target("libmogan") do add_packages("goldfish") add_packages("liii-tbox") add_packages("cpr") - add_packages("argh") + add_packages("argh", {public = true}) if not is_plat("macosx") then add_packages("libiconv") end