From 7ea60d24da152469258a4cb35b3ce591ea2fd961 Mon Sep 17 00:00:00 2001 From: ruki Date: Wed, 16 Aug 2017 22:12:50 +0800 Subject: modify version --- CHANGELOG.md | 4 ++++ core/project.mak | 2 +- core/xmake.lua | 4 ++-- scripts/installer.nsi | 4 ++-- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 51aa26300..cca25d9f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.1.6 + ### Changes * Improve `add_files` to configure the compile option of the given files @@ -336,6 +338,8 @@ ## master (开发中) +## v2.1.6 + ### 改进 * 改进`add_files`,支持对files粒度进行编译选项的各种配置,更加灵活。 diff --git a/core/project.mak b/core/project.mak index 71a21ce8a..83ba54ebb 100644 --- a/core/project.mak +++ b/core/project.mak @@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2 PRO_VERSION_MINOR = 1 # the project alter version -PRO_VERSION_ALTER = 5 +PRO_VERSION_ALTER = 6 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index ebee560e6..ac6d8b9cc 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,10 +2,10 @@ set_project("xmake") -- version -set_version("2.1.5") +set_version("2.1.6") -- set xmake min version -set_xmakever("2.1.5") +set_xmakever("2.1.6") -- set warning all as error set_warnings("all", "error") diff --git a/scripts/installer.nsi b/scripts/installer.nsi index 6e0099f78..28c9d3567 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -60,13 +60,13 @@ RequestExecutionLevel admin ;-------------------------------- ; Version Information -VIProductVersion "2.1.5.0805" +VIProductVersion "2.1.6.0816" VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake" VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: http://www.xmake.io" VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2017 tboox.org" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "The Make-like Build Utility based on Lua" -VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.5" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.6" ;-------------------------------- -- cgit v1.3.1