update version

xmake-io · Nov 28, 2018 · c4d0e69 · c4d0e69
1 parent 30e298c
commit c4d0e69
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -22,6 +22,13 @@
 * [#247](https://github.com/tboox/xmake/pull/247): Add `-D` and `--diagnosis` instead of `--backtrace`
 * [#259](https://github.com/tboox/xmake/issues/259): Improve on_build, on_build_file and on_xxx for target and rule
 * [#269](https://github.com/tboox/xmake/issues/269): Clean up the temporary files at last 30 days
+* Improve remote package manager
+* Support to add packages with only header file
+* Support to modify builtin package links, e.g. `add_packages("xxx", {links = {}})`
+
+### Bugs fixed
+
+* Fix state inconsistency after failed outage of installation dependency package
 
 ## v2.2.2
 
@@ -529,6 +536,13 @@
 * [#249](https://github.com/tboox/xmake/pull/249): 改进编译进度信息显示格式
 * [#247](https://github.com/tboox/xmake/pull/247): 添加`-D`和`--diagnosis`去替换`--backtrace`，改进诊断信息显示
 * [#259](https://github.com/tboox/xmake/issues/259): 改进 on_build, on_build_file 和 on_xxx 等接口
+* 改进远程包管理器，更加方便的包依赖配置切换
+* 支持only头文件依赖包的安装
+* 支持对包内置links的手动调整，`add_packages("xxx", {links = {}})`
+
+### Bugs修复
+
+* 修复安装依赖包失败中断后的状态不一致性问题
 
 ## v2.2.2
 

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

diff --git a/scripts/installer.nsi b/scripts/installer.nsi
@@ -14,7 +14,7 @@
 ;--------------------------------
 
 ; The name of the installer
-Name "xmake-v2.2.2"
+Name "xmake-v2.2.3"
 
 ; The file to write
 OutFile "xmake.exe"
@@ -60,13 +60,13 @@ RequestExecutionLevel admin
 ;--------------------------------
 ; Version Information
 
-VIProductVersion "2.2.2.1016"
+VIProductVersion "2.2.3.1128"
 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.2"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "2.2.3"
 
 ;--------------------------------