diff options
| author | ruki <[email protected]> | 2018-10-17 00:32:52 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-10-16 21:17:16 +0800 |
| commit | 18a42e0e8980e3edc39198b18c5c4b9a464ea381 (patch) | |
| tree | d5148d48938f250e98c0f1dc6f1b9e6c1a4d712e | |
| parent | b7fb3fa8f6efc8c467ab7edb016da3dc2319390b (diff) | |
modify versionv2.2.2
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | core/project.mak | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rw-r--r-- | scripts/get.ps1 | 2 | ||||
| -rw-r--r-- | scripts/installer.nsi | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index bc2cf0322..60c107b91 100644 --- 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 index 56ef60f24..1c7350862 100644 --- 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 index 18403c1c1..8181e5a1d 100644 --- 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 index 642f83282..5571e421b 100644 --- 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 index c749b5b2d..2c4458609 100644 --- 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"
;--------------------------------
|