diff options
| author | ruki <[email protected]> | 2021-05-15 14:49:09 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-05-15 14:49:09 +0800 |
| commit | 3597dc08d6dca6bf8acd92d7ecebe4914cc6a554 (patch) | |
| tree | 13dd9a7656f7ef90154660eb907a4e8042b64bad | |
| parent | afdbc1e7ecd6815e807901d573749a6224311545 (diff) | |
update versionv2.5.4
| -rw-r--r-- | CHANGELOG.md | 12 | ||||
| -rw-r--r-- | core/project.mak | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 2 |
3 files changed, 10 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a2c6694df..8121f302f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.5.4 + ### New features * [#1323](https://github.com/xmake-io/xmake/issues/1323): Support find and install package from `apt`, `add_requires("apt::zlib1g-dev")` @@ -10,8 +12,8 @@ * [#1087](https://github.com/xmake-io/xmake/issues/1087): Add `xrepo env shell` and support load envs from `add_requires/xmake.lua` * [#1313](https://github.com/xmake-io/xmake/issues/1313): Support private package for `add_requires/add_deps` * [#1358](https://github.com/xmake-io/xmake/issues/1358): Support to set mirror url to speedup download package -* [#1369](https://github.com/xmake-io/xmake/pull/1369): Support arm/arm64 packages for vcpkg -* [#1405](https://github.com/xmake-io/xmake/pull/1405): Add portage package manager support +* [#1369](https://github.com/xmake-io/xmake/pull/1369): Support arm/arm64 packages for vcpkg, thanks @fallending +* [#1405](https://github.com/xmake-io/xmake/pull/1405): Add portage package manager support, thanks @Phate6660 ### Change @@ -990,6 +992,8 @@ ## master (开发中) +## v2.5.4 + ### 新特性 * [#1323](https://github.com/xmake-io/xmake/issues/1323): 支持从 apt 查找安装包，`add_requires("apt::zlib1g-dev")` @@ -998,8 +1002,8 @@ * [#1087](https://github.com/xmake-io/xmake/issues/1087): 添加 `xrepo env shell` 并且支持从 `add_requires/xmake.lua` 加载包环境 * [#1313](https://github.com/xmake-io/xmake/issues/1313): 为 `add_requires/add_deps` 添加私有包支持 * [#1358](https://github.com/xmake-io/xmake/issues/1358): 支持设置镜像 url 站点加速包下载 -* [#1369](https://github.com/xmake-io/xmake/pull/1369): 为 vcpkg 增加 arm/arm64 包集成支持 -* [#1405](https://github.com/xmake-io/xmake/pull/1405): 添加 portage 包管理器支持 +* [#1369](https://github.com/xmake-io/xmake/pull/1369): 为 vcpkg 增加 arm/arm64 包集成支持，感谢 @fallending +* [#1405](https://github.com/xmake-io/xmake/pull/1405): 添加 portage 包管理器支持，感谢 @Phate6660 ### 改进 diff --git a/core/project.mak b/core/project.mak index fb43483be..1874bae38 100644 --- a/core/project.mak +++ b/core/project.mak @@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2 PRO_VERSION_MINOR = 5 # the project alter version -PRO_VERSION_ALTER = 3 +PRO_VERSION_ALTER = 4 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index e33454a2e..8187c5e93 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.5.3", {build = "%Y%m%d%H%M"}) +set_version("2.5.4", {build = "%Y%m%d%H%M"}) -- set xmake min version set_xmakever("2.2.3") |