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 381ac1b8a6..38607bc62c 100644 --- a/lolly/xmake.lua +++ b/lolly/xmake.lua @@ -61,8 +61,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 e69cd44a98..1f1c43b65c 100644 --- a/xmake/targets/libmogan.lua +++ b/xmake/targets/libmogan.lua @@ -90,7 +90,7 @@ target("libmogan") do if not is_plat("wasm") then add_packages("cpr") end - add_packages("argh") + add_packages("argh", {public = true}) if not is_plat("macosx") then add_packages("libiconv") end