From 97d11317df0066a52ae97d85c056b9ca6771ef2a Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 23 Aug 2018 22:54:15 +0800 Subject: modify changelogs --- CHANGELOG.md | 2 ++ xmake/actions/build/trybuild.lua | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8642f42a2..7e233efb9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * Support fasm assembler * Add `has_config` and `is_config` apis +* Add `$ xmake --try` to try building project using third-party buildsystem ### Changes @@ -479,6 +480,7 @@ * 新增fasm汇编器支持 * 添加`has_config`和`is_config`接口去快速判断option和配置值 +* 添加`$ xmake --try`去尝试构建工程 ### 改进 diff --git a/xmake/actions/build/trybuild.lua b/xmake/actions/build/trybuild.lua index 15fd3e0fa..b53536788 100644 --- a/xmake/actions/build/trybuild.lua +++ b/xmake/actions/build/trybuild.lua @@ -75,7 +75,6 @@ function main(targetname) table.insert(buildscripts, {"configure", _build_for_configure}) table.insert(buildscripts, {"[mM]akefile", _build_for_makefile}) - -- attempt to build it local ok = false for _, buildscript in pairs(buildscripts) do -- cgit v1.3.1