modify version

xmake-io · Oct 16, 2018 · 18a42e0 · 18a42e0
1 parent b7fb3fa
commit 18a42e0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## master (unreleased)
 
+## v2.2.2
+
 ### New features
 
 * Support fasm assembler
@@ -486,6 +488,8 @@
 
 ## master (开发中)
 
+## v2.2.2
+
 ### 新特性
 
 * 新增fasm汇编器支持

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 	= 1
+PRO_VERSION_ALTER 	= 2
 
 # 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.1", {build = "%Y%m%d%H%M"})
+set_version("2.2.2", {build = "%Y%m%d%H%M"})
 
 -- set xmake min version
 set_xmakever("2.1.8")

diff --git a/scripts/get.ps1 b/scripts/get.ps1
@@ -42,7 +42,7 @@ try{
     writeErrorTip 'Please set environment var "TMP" to another path'
     myExit 1
 }
-if($ver -eq $null){ $ver='v2.2.1' }
+if($ver -eq $null){ $ver='v2.2.2' }
 Write-Host 'Start downloading... Hope amazon S3 is not broken again'
 try{
     Invoke-Webrequest "https://github.com/tboox/xmake/releases/download/$ver/xmake-$ver.exe" -OutFile "$outfile"

diff --git a/scripts/installer.nsi b/scripts/installer.nsi
@@ -60,13 +60,13 @@ RequestExecutionLevel admin
 ;--------------------------------
 ; Version Information
 
-VIProductVersion "2.2.1.0616"
+VIProductVersion "2.2.2.1016"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "XMake"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "Comments" "website: https://www.xmake.io"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The TBOOX Open Source Group"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright 2015-2018 tboox.org"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "The cross-platform build utility based on Lua"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.1"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.2"
 
 ;--------------------------------