summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2022-04-25 22:38:22 +0800
committerruki <[email protected]>2022-04-25 09:51:42 +0800
commit95a0f1530d62df8850b822f1e090cbed746a611f (patch)
treed662a214ab5eac4b7dc5fe23b66294114127d10c
parent32b35898d3d88a961b0868f5e852d1c4ec4c94a9 (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.spec6
4 files changed, 9 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8f8518bc7..a04b82c77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
## master (unreleased)
+## v2.6.5
+
### New features
* [#2138](https://github.com/xmake-io/xmake/issues/2138): Support template package
@@ -1244,6 +1246,8 @@
## master (开发中)
+## v2.6.5
+
### 新特性
* [#2138](https://github.com/xmake-io/xmake/issues/2138): 支持模板包
diff --git a/core/project.mak b/core/project.mak
index e853c6fe4..27caf2cd5 100644
--- a/core/project.mak
+++ b/core/project.mak
@@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2
PRO_VERSION_MINOR = 6
# 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 c0a2ec5d5..ba07d0a0f 100644
--- a/core/xmake.lua
+++ b/core/xmake.lua
@@ -2,7 +2,7 @@
set_project("xmake")
-- version
-set_version("2.6.4", {build = "%Y%m%d%H%M"})
+set_version("2.6.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 5850de406..db280d8f7 100644
--- a/scripts/rpmbuild/SPECS/xmake.spec
+++ b/scripts/rpmbuild/SPECS/xmake.spec
@@ -1,5 +1,5 @@
-%define xmake_revision b2a4ded3d810b41e8b82b83afc46d5d4c7139241
-%define tbox_revision cfb72e0c568537c61f672e492013af0d96cb9ae1
+%define xmake_revision 68f60cdd350c606ebb07dd79ccbfd388a47b4304
+%define tbox_revision d7b9946b94235a048b9c0064ad5cce0fce010556
%define sv_revision 035262773da0500367cb88e6f30197908159a348
%define lua_cjson_revision 515bab6d6d80b164b94db73af69609ea02f3a798
%define luajit_revision e9af1abec542e6f9851ff2368e7f196b6382a44c
@@ -8,7 +8,7 @@
%undefine _disable_source_fetch
Name: xmake
-Version: 2.6.4
+Version: 2.6.5
Release: 1%{?dist}
Summary: A cross-platform build utility based on Lua
BuildArch: noarch