diff options
| author | ruki <[email protected]> | 2021-07-26 23:33:16 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-07-26 23:33:16 +0800 |
| commit | fd248b8b97f62762ce6ea6e0008b4367bef29d4d (patch) | |
| tree | 846d6dd5e9530b4c4257ef15c4960b4283fa04c8 | |
| parent | eb17b3a6e8f17bb0a0636c556b14cea0313e08d1 (diff) | |
update version
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | core/project.mak | 2 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rw-r--r-- | scripts/rpmbuild/SPECS/xmake.spec | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d991707a..f010ace24 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.5.6 + ### New features * [#1483](https://github.com/xmake-io/xmake/issues/1483): Add `os.joinenvs()` and improve package tools envirnoments @@ -1038,6 +1040,8 @@ ## master (开发中) +## v2.5.6 + ### 新特性 * [#1483](https://github.com/xmake-io/xmake/issues/1483): 添加 `os.joinenvs()` 和改进包工具环境 diff --git a/core/project.mak b/core/project.mak index 4c3aed86c..eafef391e 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 = 5 +PRO_VERSION_ALTER = 6 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index 23d807ffe..e66405e57 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.5.5", {build = "%Y%m%d%H%M"}) +set_version("2.5.6", {build = "%Y%m%d%H%M"}) -- set xmake min version set_xmakever("2.2.3") diff --git a/scripts/rpmbuild/SPECS/xmake.spec b/scripts/rpmbuild/SPECS/xmake.spec index 9887176bc..79a9f0c45 100644 --- a/scripts/rpmbuild/SPECS/xmake.spec +++ b/scripts/rpmbuild/SPECS/xmake.spec @@ -7,7 +7,7 @@ %undefine _disable_source_fetch Name: xmake -Version: 2.5.5 +Version: 2.5.6 Release: 1%{?dist} Summary: A cross-platform build utility based on Lua BuildArch: noarch |