summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2021-07-01 22:37:50 +0800
committerruki <[email protected]>2021-07-01 22:37:50 +0800
commitc44aea875ce6bde152a1bd2d92fec3fd9ca6b223 (patch)
treebc282985531d06971d67580a19e904af12e2c023
parent97472156ae23c3c2c29d251e966b6f3f6077332a (diff)
update version
-rw-r--r--CHANGELOG.md4
-rw-r--r--core/project.mak2
-rw-r--r--core/xmake.lua2
-rw-r--r--scripts/rpmbuild/SPECS/xmake.spec4
4 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fa205b66..45e91d0b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## master (unreleased)
+## v2.5.5
+
### New features
* [#1421](https://github.com/xmake-io/xmake/issues/1421): Add prefix, suffix and extension options for target names
@@ -1019,6 +1021,8 @@
## master (开发中)
+## v2.5.5
+
### 新特性
* [#1421](https://github.com/xmake-io/xmake/issues/1421): 针对 target 目标,增加目标文件名的前缀,后缀和扩展名设置接口。
diff --git a/core/project.mak b/core/project.mak
index 1874bae38..4c3aed86c 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 = 4
+PRO_VERSION_ALTER = 5
# the project prefix
PRO_PREFIX = XM_
diff --git a/core/xmake.lua b/core/xmake.lua
index 16200869d..23d807ffe 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -2,7 +2,7 @@
set_project("xmake")
-- version
-set_version("2.5.4", {build = "%Y%m%d%H%M"})
+set_version("2.5.5", {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 c4a430a36..04b7efe55 100644
--- a/scripts/rpmbuild/SPECS/xmake.spec
+++ b/scripts/rpmbuild/SPECS/xmake.spec
@@ -1,5 +1,5 @@
%define xmake_revision 3597dc08d6dca6bf8acd92d7ecebe4914cc6a554
-%define tbox_revision 825e5cd073c58d2eea6326e3c7bac8bcb84028fe
+%define tbox_revision 5ef932750ede0b90867fd4afdcf1deed2464c82b
%define sv_revision 9a3cf7c8e589de4f70378824329882c4a047fffc
%define lua_cjson_revision 515bab6d6d80b164b94db73af69609ea02f3a798
%define luajit_revision e9af1abec542e6f9851ff2368e7f196b6382a44c
@@ -7,7 +7,7 @@
%undefine _disable_source_fetch
Name: xmake
-Version: 2.5.4
+Version: 2.5.5
Release: 1%{?dist}
Summary: A cross-platform build utility based on Lua
BuildArch: noarch