Skip to content

Commit 3597dc0

Browse files
committed
update version
1 parent afdbc1e commit 3597dc0

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

CHANGELOG.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## master (unreleased)
44

5+
## v2.5.4
6+
57
### New features
68

79
* [#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 @@
1012
* [#1087](https://github.com/xmake-io/xmake/issues/1087): Add `xrepo env shell` and support load envs from `add_requires/xmake.lua`
1113
* [#1313](https://github.com/xmake-io/xmake/issues/1313): Support private package for `add_requires/add_deps`
1214
* [#1358](https://github.com/xmake-io/xmake/issues/1358): Support to set mirror url to speedup download package
13-
* [#1369](https://github.com/xmake-io/xmake/pull/1369): Support arm/arm64 packages for vcpkg
14-
* [#1405](https://github.com/xmake-io/xmake/pull/1405): Add portage package manager support
15+
* [#1369](https://github.com/xmake-io/xmake/pull/1369): Support arm/arm64 packages for vcpkg, thanks @fallending
16+
* [#1405](https://github.com/xmake-io/xmake/pull/1405): Add portage package manager support, thanks @Phate6660
1517

1618
### Change
1719

@@ -990,6 +992,8 @@
990992

991993
## master (开发中)
992994

995+
## v2.5.4
996+
993997
### 新特性
994998

995999
* [#1323](https://github.com/xmake-io/xmake/issues/1323): 支持从 apt 查找安装包,`add_requires("apt::zlib1g-dev")`
@@ -998,8 +1002,8 @@
9981002
* [#1087](https://github.com/xmake-io/xmake/issues/1087): 添加 `xrepo env shell` 并且支持从 `add_requires/xmake.lua` 加载包环境
9991003
* [#1313](https://github.com/xmake-io/xmake/issues/1313): 为 `add_requires/add_deps` 添加私有包支持
10001004
* [#1358](https://github.com/xmake-io/xmake/issues/1358): 支持设置镜像 url 站点加速包下载
1001-
* [#1369](https://github.com/xmake-io/xmake/pull/1369): 为 vcpkg 增加 arm/arm64 包集成支持
1002-
* [#1405](https://github.com/xmake-io/xmake/pull/1405): 添加 portage 包管理器支持
1005+
* [#1369](https://github.com/xmake-io/xmake/pull/1369): 为 vcpkg 增加 arm/arm64 包集成支持,感谢 @fallending
1006+
* [#1405](https://github.com/xmake-io/xmake/pull/1405): 添加 portage 包管理器支持,感谢 @Phate6660
10031007

10041008
### 改进
10051009

core/project.mak

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2
1010
PRO_VERSION_MINOR = 5
1111

1212
# the project alter version
13-
PRO_VERSION_ALTER = 3
13+
PRO_VERSION_ALTER = 4
1414

1515
# the project prefix
1616
PRO_PREFIX = XM_

core/xmake.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set_project("xmake")
33

44
-- version
5-
set_version("2.5.3", {build = "%Y%m%d%H%M"})
5+
set_version("2.5.4", {build = "%Y%m%d%H%M"})
66

77
-- set xmake min version
88
set_xmakever("2.2.3")

0 commit comments

Comments
 (0)