[dpdk-dev,v2,1/2] version: switch to year/month version numbers

Message ID 1455114792-1603-1-git-send-email-john.mcnamara@intel.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

John McNamara Feb. 10, 2016, 2:33 p.m. UTC
  From: "Richardson, Bruce" <bruce.richardson@intel.com>

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 <bruce.richardson@intel.com>
Signed-off-by: John McNamara <john.mcnamara@intel.com>
---
 lib/librte_eal/common/include/rte_version.h | 10 +++++-----
 mk/rte.sdkconfig.mk                         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)
  

Comments

Thomas Monjalon Feb. 10, 2016, 3:11 p.m. UTC | #1
2016-02-10 14:33, John McNamara:
>  /**
>   * 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
>

I liked the idea of Bruce of renaming these constants to
*_YEAR and *_MONTH.
I also think RTE_VER_PATCH_LEVEL should be RTE_VER_MINOR.
And maybe that RTE_VER_PATCH_RELEASE should be RTE_VER_RELEASE.

It shouldn't hurt applications as they must use RTE_VERSION
and rte_version().

Opinions?
  
Bruce Richardson Feb. 10, 2016, 3:31 p.m. UTC | #2
On Wed, Feb 10, 2016 at 04:11:40PM +0100, Thomas Monjalon wrote:
> 2016-02-10 14:33, John McNamara:
> >  /**
> >   * 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
> >
> 
> I liked the idea of Bruce of renaming these constants to
> *_YEAR and *_MONTH.
> I also think RTE_VER_PATCH_LEVEL should be RTE_VER_MINOR.
> And maybe that RTE_VER_PATCH_RELEASE should be RTE_VER_RELEASE.
> 
> It shouldn't hurt applications as they must use RTE_VERSION
> and rte_version().
> 
> Opinions?

Well, I always tend to like Bruce's ideas too, so +1 from me :-)

/Bruce
  
John McNamara Feb. 10, 2016, 4:52 p.m. UTC | #3
> -----Original Message-----
> From: Thomas Monjalon [mailto:thomas.monjalon@6wind.com]
> Sent: Wednesday, February 10, 2016 3:12 PM
> To: Mcnamara, John <john.mcnamara@intel.com>
> Cc: dev@dpdk.org; Richardson, Bruce <bruce.richardson@intel.com>
> Subject: Re: [PATCH v2 1/2] version: switch to year/month version numbers
> 
> ...
>
> I liked the idea of Bruce of renaming these constants to *_YEAR and
> *_MONTH.
> I also think RTE_VER_PATCH_LEVEL should be RTE_VER_MINOR.
> And maybe that RTE_VER_PATCH_RELEASE should be RTE_VER_RELEASE.
> 
> It shouldn't hurt applications as they must use RTE_VERSION and
> rte_version().
> 
> Opinions?


That seems like a good change. I'll resubmit.

John.
--
  

Patch

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; \