diff options
| author | ruki <[email protected]> | 2017-04-02 17:29:02 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2017-04-02 17:29:02 +0800 |
| commit | 0f4f860a6d0db4d4a62bdbe88c8cd8a57e1df9e8 (patch) | |
| tree | ab96cfd59bd2e437832ccf79e281dd05f429e40e | |
| parent | 248b2cc8a96d41445a2e46d259d14fea8e4203ec (diff) | |
modify version
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | core/project.mak | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rw-r--r-- | scripts/PKGBUILD | 4 | ||||
| -rw-r--r-- | scripts/installer.nsi | 4 |
5 files changed, 12 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 25c911a10..bcd9ef59d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.1.3 + ### New features * [#65](https://github.com/tboox/xmake/pull/65): Add `set_default` api for target to modify default build and install behavior @@ -228,13 +230,13 @@ ### New features -* Add set_runscript api and support custom action +* Add `set_runscript` api and support custom action * Add import api and support import modules in xmake.lua, .e.g os, path, utils ... * Add new architecture: arm64-v8a for android ### Bugs fixed -* Fix api bug for set_installscript +* Fix api bug for `set_installscript` * Fix install bug for windows x86_64 * Fix relative path bug @@ -244,6 +246,8 @@ ## master (开发中) +## v2.1.3 + ### 新特性 * [#65](https://github.com/tboox/xmake/pull/65): 为target添加`set_default`接口用于修改默认的构建所有targets行为 diff --git a/core/project.mak b/core/project.mak index 59f6e4da2..9abc0e2ff 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 = 3 +PRO_VERSION_ALTER = 4 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index f4d8b9718..cc2360f4c 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.1.3") +set_version("2.1.4") -- set xmake min version set_xmakever("2.1.2") diff --git a/scripts/PKGBUILD b/scripts/PKGBUILD index 0037ce63d..ed1ddaf32 100644 --- a/scripts/PKGBUILD +++ b/scripts/PKGBUILD @@ -2,7 +2,7 @@ # PKGBuild Create By: lumpyzhu <[email protected]> pkgname=xmake -pkgver=2.1.2 +pkgver=2.1.3 pkgrel=1 pkgdesc="A make-like build utility based on Lua" arch=('i686' 'x86_64') @@ -10,7 +10,7 @@ url="https://github.com/tboox/xmake" license=('Apache') makedepends=() source=("$pkgname.zip::https://github.com/tboox/xmake/archive/v${pkgver}.zip") -sha256sums=('47521e586361d34d3a579690df0044da0373a1b7429a511326f8875cdc115f4a') +sha256sums=('7560ff0b0f6499f37c4bc085a0554563f88999ac5243fee9af8423927d378ccd') build() { cd "$srcdir/${pkgname}-${pkgver}" diff --git a/scripts/installer.nsi b/scripts/installer.nsi index f4082b69f..b9997abbb 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -49,13 +49,13 @@ RequestExecutionLevel admin ;--------------------------------
; Version Information
-VIProductVersion "2.1.3.0402"
+VIProductVersion "2.1.4.0402"
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.3"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.4"
;--------------------------------
|