diff options
| author | ruki <[email protected]> | 2017-11-08 00:22:05 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-11-07 20:12:32 +0800 |
| commit | 1e40eea084e34e3b41b00b43679bb0626e48c7a0 (patch) | |
| tree | 991f12b3613889e93096500c3745ae349db54498 | |
| parent | 1dbc7da494ce9ac38795a5b31e9c3ebc250aa37c (diff) | |
modify version
| -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 47a0e5eb9..84121acac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.1.8 + ### New features * Add `XMAKE_LOGFILE` environment variable to dump the output info to file @@ -388,6 +390,8 @@ ## master (开发中) +## v2.1.8 + ### 新特性 * 添加`XMAKE_LOGFILE`环境变量，启用输出到日志文件 diff --git a/core/project.mak b/core/project.mak index da271cffc..543ca2cf8 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 = 7 +PRO_VERSION_ALTER = 8 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index d7dd65eff..58d9221ef 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.1.7", {build = "%Y%m%d%H%M"}) +set_version("2.1.8", {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 0633c68b6..4b7710c08 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -60,13 +60,13 @@ RequestExecutionLevel admin ;--------------------------------
; Version Information
-VIProductVersion "2.1.7.1013"
+VIProductVersion "2.1.8.1107"
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.7"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.8"
;--------------------------------
|