From a04725662933fbbe3ad4a319d03267fc32907242 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 13 Oct 2017 23:58:36 +0800 Subject: [PATCH] update version --- CHANGELOG.md | 4 ++++ core/project.mak | 2 +- core/xmake.lua | 2 +- scripts/installer.nsi | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b9f96a074b..9df3875724 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.1.7 + ### New features * Add `add_imports` to bulk import modules for the target, option and package script @@ -370,6 +372,8 @@ ## master (开发中) +## v2.1.7 + ### 新特性 * 添加`add_imports`去为target,option和package的自定义脚本批量导入模块,简化自定义脚本 diff --git a/core/project.mak b/core/project.mak index 83ba54ebb7..da271cffc1 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 = 6 +PRO_VERSION_ALTER = 7 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index e9abac6696..d7dd65eff0 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.1.6", {build = "%Y%m%d%H%M"}) +set_version("2.1.7", {build = "%Y%m%d%H%M"}) -- set xmake min version set_xmakever("2.1.6") diff --git a/scripts/installer.nsi b/scripts/installer.nsi index c7d17e8968..0633c68b6b 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -60,13 +60,13 @@ RequestExecutionLevel admin ;-------------------------------- ; Version Information -VIProductVersion "2.1.6.0816" +VIProductVersion "2.1.7.1013" 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.6" +VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.7" ;--------------------------------