From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 8E2515A13 for ; Mon, 21 Dec 2015 14:26:44 +0100 (CET) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 21 Dec 2015 05:26:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,459,1444719600"; d="scan'208";a="845763680" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 21 Dec 2015 05:26:41 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id tBLDQe9P000503; Mon, 21 Dec 2015 13:26:40 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id tBLDQetV010038; Mon, 21 Dec 2015 13:26:40 GMT Received: (from bricha3@localhost) by sivswdev01.ir.intel.com with id tBLDQer9010034; Mon, 21 Dec 2015 13:26:40 GMT From: Bruce Richardson To: dev@dpdk.org Date: Mon, 21 Dec 2015 13:26:23 +0000 Message-Id: <1450704384-9986-3-git-send-email-bruce.richardson@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1450704384-9986-1-git-send-email-bruce.richardson@intel.com> References: <1450704384-9986-1-git-send-email-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH 2/3] version: adjust printing for new version scheme X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Dec 2015 13:26:45 -0000 Since we are now using a year-month numbering scheme, adjust the printing of the version to always use 2-digits for YY.MM format. Also omit the patch version unless there is a patch version present, since patches for releases are rare on DPDK. This means that the final release of 16.04 will report as 16.04, rather than 16.04.0. Release candidates for it will similarly report as 16.04-rcX. Signed-off-by: Bruce Richardson --- lib/librte_eal/common/include/rte_version.h | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h index f1c7b98..7feea73 100644 --- a/lib/librte_eal/common/include/rte_version.h +++ b/lib/librte_eal/common/include/rte_version.h @@ -55,12 +55,12 @@ extern "C" { /** * Major version number i.e. the x in x.y.z */ -#define RTE_VER_MAJOR 16 +#define RTE_REL_YEAR 16 /** * Minor version number i.e. the y in x.y.z */ -#define RTE_VER_MINOR 4 +#define RTE_REL_MONTH 4 /** * Patch level number i.e. the z in x.y.z @@ -88,8 +88,8 @@ extern "C" { * All version numbers in one to compare with RTE_VERSION_NUM() */ #define RTE_VERSION RTE_VERSION_NUM( \ - RTE_VER_MAJOR, \ - RTE_VER_MINOR, \ + RTE_REL_YEAR, \ + RTE_REL_MONTH, \ RTE_VER_PATCH_LEVEL, \ RTE_VER_PATCH_RELEASE) @@ -102,20 +102,19 @@ static inline const char * rte_version(void) { static char version[32]; + int pos; if (version[0] != 0) return version; - if (strlen(RTE_VER_SUFFIX) == 0) - snprintf(version, sizeof(version), "%s %d.%d.%d", + + pos = snprintf(version, sizeof(version), "%s %02d.%02d", RTE_VER_PREFIX, - RTE_VER_MAJOR, - RTE_VER_MINOR, + RTE_REL_YEAR, + RTE_REL_MONTH); + if (RTE_VER_PATCH_LEVEL > 0) + pos += snprintf(version + pos, sizeof(version) - pos, ".%d", RTE_VER_PATCH_LEVEL); - else - snprintf(version, sizeof(version), "%s %d.%d.%d%s%d", - RTE_VER_PREFIX, - RTE_VER_MAJOR, - RTE_VER_MINOR, - RTE_VER_PATCH_LEVEL, + if (strlen(RTE_VER_SUFFIX) > 0) + pos += snprintf(version + pos, sizeof(version) - pos, "%s%d", RTE_VER_SUFFIX, RTE_VER_PATCH_RELEASE < 16 ? RTE_VER_PATCH_RELEASE : -- 2.5.0