summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2017-03-23 22:43:10 +0800
committerruki <[email protected]>2017-03-23 22:43:10 +0800
commit709edb9091fa4de947c59a937793a4e545285985 (patch)
tree31ad4125fa05f5c88b544fb75b87c06803f5c741
parentbf69a2413117cf21c53bde1edbda713e77d4fd9b (diff)
modify version
-rw-r--r--CHANGELOG.md4
-rw-r--r--core/project.mak2
-rw-r--r--core/xmake.lua2
-rw-r--r--scripts/PKGBUILD4
-rw-r--r--scripts/installer.nsi4
5 files changed, 10 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index da1aeb098..af4c7d95e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## master (unreleased)
+## v2.1.2
+
### New features
* Add aur package script and support to install xmake from yaourt
@@ -220,6 +222,8 @@
## master (开发中)
+## v2.1.2
+
### 新特性
* 添加aur打包脚本,并支持用`yaourt`包管理器进行安装。
diff --git a/core/project.mak b/core/project.mak
index eedf9f37f..59f6e4da2 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 = 2
+PRO_VERSION_ALTER = 3
# the project prefix
PRO_PREFIX = XM_
diff --git a/core/xmake.lua b/core/xmake.lua
index 7f36ecc98..849b1987f 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -2,7 +2,7 @@
set_project("xmake")
-- version
-set_version("2.1.2")
+set_version("2.1.3")
-- set warning all as error
set_warnings("all", "error")
diff --git a/scripts/PKGBUILD b/scripts/PKGBUILD
index df6352c01..780384982 100644
--- a/scripts/PKGBUILD
+++ b/scripts/PKGBUILD
@@ -2,7 +2,7 @@
# PKGBuild Create By: lumpyzhu <[email protected]>
pkgname=xmake
-pkgver=2.1.1
+pkgver=2.1.2
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")
-md5sums=('fca9f41c64c1bb0838d399aad0ac3a2a')
+sha256sums=('47521e586361d34d3a579690df0044da0373a1b7429a511326f8875cdc115f4a')
build() {
cd "$srcdir/${pkgname}-${pkgver}"
diff --git a/scripts/installer.nsi b/scripts/installer.nsi
index 85cdb3342..8b965573f 100644
--- a/scripts/installer.nsi
+++ b/scripts/installer.nsi
@@ -49,13 +49,13 @@ RequestExecutionLevel admin
;--------------------------------
; Version Information
-VIProductVersion "2.1.2.0304"
+VIProductVersion "2.1.3"
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.2"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.1.3"
;--------------------------------