v2.2.6 released

xmake-io · May 26, 2019 · 3633407 · 3633407
1 parent 62e802d
commit 3633407
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master (unreleased)
 
+## v2.2.6
+
 ### New features
 
 * [#380](https://github.com/xmake-io/xmake/pull/380): Add support to export compile_flags.txt 
@@ -582,6 +584,8 @@
 
 ## master (开发中)
 
+## v2.2.6
+
 ### 新特性
 
 * [#380](https://github.com/xmake-io/xmake/pull/380): 添加导出compile_flags.txt 

diff --git a/core/project.mak b/core/project.mak
@@ -10,7 +10,7 @@ PRO_VERSION_MAJOR 	= 2
 PRO_VERSION_MINOR 	= 2
 
 # the project alter version
-PRO_VERSION_ALTER 	= 5
+PRO_VERSION_ALTER 	= 6
 
 # the project prefix
 PRO_PREFIX 			= XM_

diff --git a/core/xmake.lua b/core/xmake.lua
@@ -2,7 +2,7 @@
 set_project("xmake")
 
 -- version
-set_version("2.2.5", {build = "%Y%m%d%H%M"})
+set_version("2.2.6", {build = "%Y%m%d%H%M"})
 
 -- set xmake min version
 set_xmakever("2.2.3")

diff --git a/scripts/get.ps1 b/scripts/get.ps1
@@ -4,7 +4,7 @@
 
 param (
     [string]$branch = "master", 
-    [string]$version = "v2.2.5"
+    [string]$version = "v2.2.6"
 )
 
 & {

diff --git a/scripts/installer.nsi b/scripts/installer.nsi
@@ -14,7 +14,7 @@
 ;--------------------------------
 
 ; The name of the installer
-Name "xmake-v2.2.5"
+Name "xmake-v2.2.6"
 
 ; The file to write
 OutFile "xmake.exe"
@@ -60,13 +60,13 @@ RequestExecutionLevel admin
 ;--------------------------------
 ; Version Information
 
-VIProductVersion "2.2.5.0401"
+VIProductVersion "2.2.6.0526"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: https://xmake.io"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2019 tboox.org"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "A cross-platform build utility based on Lua"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.5"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.6"
 
 ;--------------------------------