From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTP id 3458F28631 for ; Thu, 21 Mar 2019 10:09:59 -0400 (EDT) Received: from turing.freelists.org ([127.0.0.1]) by localhost (turing.freelists.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Mq_ysr464QYS for ; Thu, 21 Mar 2019 10:09:59 -0400 (EDT) Received: from smtp44.i.mail.ru (smtp44.i.mail.ru [94.100.177.104]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by turing.freelists.org (Avenir Technologies Mail Multiplex) with ESMTPS id CAA622A6E8 for ; Thu, 21 Mar 2019 10:09:58 -0400 (EDT) Date: Thu, 21 Mar 2019 17:09:55 +0300 From: Kirill Yukhin Subject: [tarantool-patches] Re: [PATCH 2/2] build: set specific name for packages of master branch Message-ID: <20190321140955.ll26wtga63p47hve@tarantool.org> References: <8650aab92f5973d0546b667fcbf3f0d4b0b82746.1553174240.git.kyukhin@tarantool.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <8650aab92f5973d0546b667fcbf3f0d4b0b82746.1553174240.git.kyukhin@tarantool.org> Sender: tarantool-patches-bounce@freelists.org Errors-to: tarantool-patches-bounce@freelists.org Reply-To: tarantool-patches@freelists.org List-Help: List-Unsubscribe: List-software: Ecartis version 1.0.0 List-Id: tarantool-patches List-Subscribe: List-Owner: List-post: List-Archive: To: alexander.turenko@tarantool.org Cc: tarantool-patches@freelists.org Hello, We need to update a test as well. Branch force-pushed. On 21 Mar 16:25, Kirill Yukhin wrote: > To make Linux package managers happy, set major version > number for master branch to 9999, so it will be always > freshest one. > --- > CMakeLists.txt | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/CMakeLists.txt b/CMakeLists.txt > index 7658fc6..dbe5847 100644 > --- a/CMakeLists.txt > +++ b/CMakeLists.txt > @@ -171,8 +171,16 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/.git" AND GIT) > OUTPUT_STRIP_TRAILING_WHITESPACE > WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) > > + execute_process (COMMAND ${GIT} rev-parse --abbrev-ref HEAD > + OUTPUT_VARIABLE TARANTOOL_GIT_BRANCH > + OUTPUT_STRIP_TRAILING_WHITESPACE > + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) > if (NOT ("${TARANTOOL_GIT_VERSION}" STREQUAL "${TARANTOOL_VERSION}")) > - set(TARANTOOL_VERSION "${TARANTOOL_GIT_VERSION}") > + if ("${TARANTOOL_GIT_BRANCH}" STREQUAL "master") > + set (TARANTOOL_VERSION "9999.${TARANTOOL_GIT_VERSION}") > + else() > + set(TARANTOOL_VERSION "${TARANTOOL_GIT_VERSION}") > + endif() > message(STATUS "Generating VERSION file") > file(WRITE ${VERSION_FILE} "${TARANTOOL_VERSION}\n") > > -- > 2.19.1 > diff --git a/test/box-py/args.result b/test/box-py/args.result index 54629ed..426d67b 100644 --- a/test/box-py/args.result +++ b/test/box-py/args.result @@ -44,7 +44,7 @@ tarantool --no-such-option --version tarantool: unrecognized option tarantool --version -Tarantool 2.minor.patch-- +Tarantool 9999.minor.patch-- Target: platform Build options: flags Compiler: cc @@ -52,7 +52,7 @@ C_FLAGS: flags CXX_FLAGS: flags tarantool -v -Tarantool 2.minor.patch-- +Tarantool 9999.minor.patch-- Target: platform Build options: flags Compiler: cc @@ -60,7 +60,7 @@ C_FLAGS: flags CXX_FLAGS: flags tarantool -V -Tarantool 2.minor.patch-- +Tarantool 9999.minor.patch-- Target: platform Build options: flags Compiler: cc @@ -111,7 +111,7 @@ arg[3] => 2 arg[4] => 3 tarantool -V ${SOURCEDIR}/test/box-py/args.lua 1 2 3 -Tarantool 2.minor.patch-- +Tarantool 9999.minor.patch-- Target: platform Build options: flags Compiler: cc -- Regards, Kirill Yukhin