From 72bd93de8dd64cc5de8986860819a5873ce08fe5 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 20 Jun 2019 22:09:46 +0800 Subject: [PATCH] modify version --- CHANGELOG.md | 4 ++++ core/project.mak | 2 +- core/xmake.lua | 2 +- scripts/installer.nsi | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5311ccee8b6..1d0bcdb3286 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master (unreleased) +## v2.2.7 + ### New features * [#455](https://github.com/xmake-io/xmake/pull/455): support clang as cuda compiler, try `xmake f --cu=clang` @@ -601,6 +603,8 @@ ## master (开发中) +## v2.2.7 + ### 新特性 * [#455](https://github.com/xmake-io/xmake/pull/455): 支持使用 clang 作为 cuda 编译器,`xmake f --cu=clang` diff --git a/core/project.mak b/core/project.mak index 665a9514f15..5d87f1bd5c3 100644 --- a/core/project.mak +++ b/core/project.mak @@ -10,7 +10,7 @@ PRO_VERSION_MAJOR = 2 PRO_VERSION_MINOR = 2 # the project alter version -PRO_VERSION_ALTER = 6 +PRO_VERSION_ALTER = 7 # the project prefix PRO_PREFIX = XM_ diff --git a/core/xmake.lua b/core/xmake.lua index 415947daf91..68f13470f77 100644 --- a/core/xmake.lua +++ b/core/xmake.lua @@ -2,7 +2,7 @@ set_project("xmake") -- version -set_version("2.2.6", {build = "%Y%m%d%H%M"}) +set_version("2.2.7", {build = "%Y%m%d%H%M"}) -- set xmake min version set_xmakever("2.2.3") diff --git a/scripts/installer.nsi b/scripts/installer.nsi index 14e64700f49..9abeacf1700 100644 --- a/scripts/installer.nsi +++ b/scripts/installer.nsi @@ -19,10 +19,10 @@ !define MINOR 2 !endif !ifndef ALTER - !define ALTER 6 + !define ALTER 7 !endif !ifndef BUILD - !define BUILD 201906070000 + !define BUILD 201906200000 !endif !define VERSION ${MAJOR}.${MINOR}.${ALTER}