diff options
| author | ruki <[email protected]> | 2017-10-13 23:58:36 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-10-13 17:51:41 +0800 |
| commit | a04725662933fbbe3ad4a319d03267fc32907242 (patch) | |
| tree | fda83f6b8f9149bce08bdbef47a620ab0869af3b | |
| parent | b9df5eab46be67e030d770bd0549ff2ded0e1093 (diff) | |
update versionv2.1.7
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | core/project.mak | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rw-r--r-- | scripts/installer.nsi | 4 |
4 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index b9f96a074..9df387572 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 83ba54ebb..da271cffc 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 e9abac669..d7dd65eff 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 c7d17e896..0633c68b6 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"
;--------------------------------
|