diff options
| author | david.wang <[email protected]> | 2024-12-20 08:32:23 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-20 08:32:23 +0800 |
| commit | 75c7054aabca8a0e7728643ab92fe5142260edbd (patch) | |
| tree | 651bcd4bd11ce50f13455893fa3fb8b66b2a909a | |
| parent | 11a26d2b1e4aed7b817b0f8bc4c0ac0e99013f7e (diff) | |
| parent | 1b6a5d25595c45c6e9515932975cc795ac3c8e6a (diff) | |
Merge pull request #1 from 19317362/master
merge from 2.9.7
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | core/xmake.lua | 2 | ||||
| -rwxr-xr-x | core/xmake.sh | 2 | ||||
| -rwxr-xr-x | scripts/get.ps1 | 2 | ||||
| -rw-r--r-- | scripts/rpmbuild/xmake.spec | 2 |
5 files changed, 8 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d612b479..bb57694eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.9.7 + ### New features * [#5813](https://github.com/xmake-io/xmake/pull/5813): Add `before_config` and `after_config` for rule @@ -1918,6 +1920,8 @@ ## master (开发中) +## v2.9.7 + ### 新特性 * [#5813](https://github.com/xmake-io/xmake/pull/5813): 为 rule 添加 `before_config` 和 `after_config` diff --git a/core/xmake.lua b/core/xmake.lua index 7454cccfb..0d282dcdf 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.9.6", {build = "%Y%m%d"}) +set_version("2.9.7", {build = "%Y%m%d"}) -- set xmake min version set_xmakever("2.8.5") diff --git a/core/xmake.sh b/core/xmake.sh index 35f840152..3c94fd994 100755 --- a/core/xmake.sh +++ b/core/xmake.sh @@ -1,7 +1,7 @@ #!/bin/sh set_project "xmake" -set_version "2.9.6" "%Y%m%d" +set_version "2.9.7" "%Y%m%d" # set warning all set_warnings "all" diff --git a/scripts/get.ps1 b/scripts/get.ps1 index ad92f85e7..fd86340cd 100755 --- a/scripts/get.ps1 +++ b/scripts/get.ps1 @@ -11,7 +11,7 @@ param ( ) & { - $LastRelease = "v2.9.6" + $LastRelease = "v2.9.7" $ErrorActionPreference = 'Stop' function writeErrorTip($msg) { diff --git a/scripts/rpmbuild/xmake.spec b/scripts/rpmbuild/xmake.spec index 5dc033650..539e98528 100644 --- a/scripts/rpmbuild/xmake.spec +++ b/scripts/rpmbuild/xmake.spec @@ -2,7 +2,7 @@ %define use_luajit 0 Name: xmake -Version: 2.9.6 +Version: 2.9.7 Release: 1%{?dist} Summary: A cross-platform build utility based on Lua |