From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by dpdk.org (Postfix) with ESMTP id EB6BDDE0 for ; Wed, 10 Feb 2016 15:34:22 +0100 (CET) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP; 10 Feb 2016 06:33:52 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,426,1449561600"; d="scan'208";a="743669472" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga003.jf.intel.com with ESMTP; 10 Feb 2016 06:33:51 -0800 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u1AEXo7B008262; Wed, 10 Feb 2016 14:33:50 GMT Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id u1AEXoM6001908; Wed, 10 Feb 2016 14:33:50 GMT Received: (from jmcnam2@localhost) by sivswdev02.ir.intel.com with id u1AEXnIN001904; Wed, 10 Feb 2016 14:33:49 GMT From: John McNamara To: dev@dpdk.org Date: Wed, 10 Feb 2016 14:33:11 +0000 Message-Id: <1455114792-1603-1-git-send-email-john.mcnamara@intel.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1450704384-9986-2-git-send-email-bruce.richardson@intel.com> References: <1450704384-9986-2-git-send-email-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v2 1/2] version: switch to year/month version numbers 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: Wed, 10 Feb 2016 14:34:23 -0000 From: "Richardson, Bruce" As discussed on list, switch numbering scheme to be based on year/month. Release 2.3 then becomes 16.04. Ref: http://dpdk.org/ml/archives/dev/2015-December/030336.html Also, added zero padding to the month so that it appear as 16.04 and not 16.4 in "make showversion" and rte_version(). Signed-off-by: Bruce Richardson Signed-off-by: John McNamara --- lib/librte_eal/common/include/rte_version.h | 10 +++++----- mk/rte.sdkconfig.mk | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h index 6b1890e..4784e67 100644 --- a/lib/librte_eal/common/include/rte_version.h +++ b/lib/librte_eal/common/include/rte_version.h @@ -50,17 +50,17 @@ extern "C" { /** * String that appears before the version number */ -#define RTE_VER_PREFIX "RTE" +#define RTE_VER_PREFIX "DPDK" /** * Major version number i.e. the x in x.y.z */ -#define RTE_VER_MAJOR 2 +#define RTE_VER_MAJOR 16 /** * Minor version number i.e. the y in x.y.z */ -#define RTE_VER_MINOR 3 +#define RTE_VER_MINOR 4 /** * Patch level number i.e. the z in x.y.z @@ -105,13 +105,13 @@ rte_version(void) if (version[0] != 0) return version; if (strlen(RTE_VER_SUFFIX) == 0) - snprintf(version, sizeof(version), "%s %d.%d.%d", + snprintf(version, sizeof(version), "%s %d.%02d.%d", RTE_VER_PREFIX, RTE_VER_MAJOR, RTE_VER_MINOR, RTE_VER_PATCH_LEVEL); else - snprintf(version, sizeof(version), "%s %d.%d.%d%s%d", + snprintf(version, sizeof(version), "%s %d.%02d.%d%s%d", RTE_VER_PREFIX, RTE_VER_MAJOR, RTE_VER_MINOR, diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index f8d95b1..564a5c3 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -35,7 +35,7 @@ showversion: $$(sed -rne 's,^#define RTE_VER_[A-Z_]*[[:space:]]+([0-9]+).*,\1,p' \ -e 's,^#define RTE_VER_SUFFIX[[:space:]]+"(.*)",\1,p' \ $(RTE_SRCDIR)/lib/librte_eal/common/include/rte_version.h) ;\ - printf '%d.%d.%d' "$$1" "$$2" "$$3"; \ + printf '%d.%02d.%d' "$$1" "$$2" "$$3"; \ if [ -z "$$5" ]; then echo; \ else printf '%s' "$$4"; \ if [ $$5 -lt 16 ] ; then echo $$5; \ -- 2.5.0