diff options
| author | ruki <[email protected]> | 2021-02-28 16:25:54 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-02-28 16:25:54 +0800 |
| commit | 9a4429bb643ce719f64a646e2110f4c6f3f0efb2 (patch) | |
| tree | a882328e15efe9b2433ffefd6cfaa0f6d84a4792 | |
| parent | 4541f6292cc6cdedeac228efa1bb7abc76927f17 (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 bf81ba15f..da1aec6fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.5.2 + ### New features * [#955](https://github.com/xmake-io/xmake/issues/955#issuecomment-766481512): Support `zig cc` and `zig c++` as c/c++ compiler @@ -935,6 +937,8 @@ ## master (开发中) +## v2.5.2 + ### 新特性 * [#955](https://github.com/xmake-io/xmake/issues/955#issuecomment-766481512): 支持 `zig cc` 和 `zig c++` 作为 c/c++ 编译器 diff --git a/core/project.mak b/core/project.mak index 486a8bb0a..281553e05 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 = 1 +PRO_VERSION_ALTER = 2 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index a85072ba8..021405999 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.5.1", {build = "%Y%m%d%H%M"}) +set_version("2.5.2", {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 e92022b73..3316eb2f0 100644 --- a/scripts/rpmbuild/SPECS/xmake.spec +++ b/scripts/rpmbuild/SPECS/xmake.spec @@ -1,4 +1,4 @@ -%define xmake_revision 2f6e5e72cb9527bad1b417ef9c48ea0ecfae53b7 +%define xmake_revision 4541f6292cc6cdedeac228efa1bb7abc76927f17 %define tbox_revision 6e5fb77c5ab5c0d712871c52c42a5bc7843cd780 %define sv_revision 9a3cf7c8e589de4f70378824329882c4a047fffc %define lua_cjson_revision 515bab6d6d80b164b94db73af69609ea02f3a798 |