From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Marchand <david.marchand@redhat.com>
Subject: Re: [PATCH 1/4] build: add single source of DPDK version
	number
Date: Thu, 7 Mar 2019 13:33:07 +0100
Message-ID: <CAJFAV8ycZrjCLqSDRCTBshKep+pFTJxXxCCbfPStGG124rDakw@mail.gmail.com>
References: <20190307115448.54041-1-bruce.richardson@intel.com>
 <20190307115448.54041-2-bruce.richardson@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="UTF-8"
Cc: dev <dev@dpdk.org>
To: Bruce Richardson <bruce.richardson@intel.com>
Return-path: <dev-bounces@dpdk.org>
Received: from mail-vs1-f68.google.com (mail-vs1-f68.google.com
 [209.85.217.68]) by dpdk.org (Postfix) with ESMTP id F1BA94C9D
 for <dev@dpdk.org>; Thu,  7 Mar 2019 13:33:19 +0100 (CET)
Received: by mail-vs1-f68.google.com with SMTP id h7so4339525vsl.1
 for <dev@dpdk.org>; Thu, 07 Mar 2019 04:33:19 -0800 (PST)
In-Reply-To: <20190307115448.54041-2-bruce.richardson@intel.com>
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>

On Thu, Mar 7, 2019 at 12:55 PM Bruce Richardson <bruce.richardson@intel.com>
wrote:

> Add a new file DPDK_VERSION to hold the current DPDK version number.
> Have meson use this file for it's project version, and have make use
> it for reporting out "showversion" and "showversionum".
>
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  DPDK_VERSION        |  1 +
>  meson.build         |  2 +-
>  mk/rte.sdkconfig.mk | 16 ++--------------
>  3 files changed, 4 insertions(+), 15 deletions(-)
>  create mode 100644 DPDK_VERSION
>
> diff --git a/DPDK_VERSION b/DPDK_VERSION
> new file mode 100644
> index 000000000..c4a4cd00b
> --- /dev/null
> +++ b/DPDK_VERSION
> @@ -0,0 +1 @@
> +19.05.0-rc0
> diff --git a/meson.build b/meson.build
> index 69833de82..757618144 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2,7 +2,9 @@
>  # Copyright(c) 2017 Intel Corporation
>
>  project('DPDK', 'C',
> -       version: '19.05.0-rc0',
> +       # get version number from file
> +       # use "more" rather than "cat" for windows compatiblity
>

compatibility

+       version: run_command('more',
> files('DPDK_VERSION')).stdout().strip(),
>         license: 'BSD',
>         default_options: ['buildtype=release', 'default_library=static'],
>         meson_version: '>= 0.47.1'
> diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk
> index fa77331cb..8dc31d7cf 100644
> --- a/mk/rte.sdkconfig.mk
> +++ b/mk/rte.sdkconfig.mk
> @@ -3,23 +3,11 @@
>
>  .PHONY: showversion
>  showversion:
> -       @set -- \
> -               $$(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.%02d.%d' "$$1" "$$2" "$$3"; \
> -               if [ -z "$$5" ]; then echo; \
> -               else printf '%s' "$$4"; \
> -                       if [ $$5 -lt 16 ] ; then echo $$5; \
> -                       else echo $$(($$5 - 16)); fi; \
> -               fi
> +       @cat $(RTE_SRCDIR)/DPDK_VERSION
>
>  .PHONY: showversionum
>  showversionum:
> -       @set -- \
> -               $$(sed -rne 's,^#define
> RTE_VER_[A-Z_]*[[:space:]]+([0-9]+).*,\1,p' \
> -
>  $(RTE_SRCDIR)/lib/librte_eal/common/include/rte_version.h); \
> -               printf '%02d%02d\n' "$$1" "$$2"
> +       @cat ${RTE_SRCDIR}/DPDK_VERSION | awk -F '.' '{print $$1$$2}'
>

s/{RTE_SRCDIR}/(RTE_SRCDIR)/


>  INSTALL_CONFIGS := $(sort $(filter-out %~,\
>         $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\
>
>

-- 
David Marchand