From patchwork Thu Mar 7 13:35:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50963 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 01C4A1B112; Thu, 7 Mar 2019 14:35:26 +0100 (CET) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id AC5631B0FF for ; Thu, 7 Mar 2019 14:35:23 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2019 05:35:23 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="325085863" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by fmsmga006.fm.intel.com with ESMTP; 07 Mar 2019 05:35:22 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: David Marchand , Bruce Richardson , Luca Boccassi Date: Thu, 7 Mar 2019 13:35:00 +0000 Message-Id: <20190307133502.55321-3-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307133502.55321-1-bruce.richardson@intel.com> References: <20190307115448.54041-1-bruce.richardson@intel.com> <20190307133502.55321-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v2 2/4] build: use version number from config file X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Since we have the version number in a separate file at the root level, we should not need to duplicate this in rte_version.h too. Best approach here is to move the macros for specifying the year/month/etc. parts from the version header file to the build config file - leaving the other utility macros for e.g. printing the version string, where they are. For make this is done by having a little bit of awk parse the version file and pass the results through to the preprocessor for the config generation stage. For meson, this is done by parsing the version and adding it to the standard dpdk_conf object. Signed-off-by: Bruce Richardson Acked-by: Luca Boccassi --- V2: removed extra change to DPDK_VERSION that crept into patch. Added ack --- config/common_base | 14 +++++++++ config/rte_config.h | 5 ++++ lib/librte_eal/common/include/rte_version.h | 32 --------------------- meson.build | 14 +++++++++ mk/rte.sdkconfig.mk | 2 ++ 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/config/common_base b/config/common_base index 0b09a9348..6292bc4af 100644 --- a/config/common_base +++ b/config/common_base @@ -1,6 +1,20 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2010-2017 Intel Corporation +# +# String that appears before the version number +# +CONFIG_RTE_VER_PREFIX="DPDK" + +# +# Version information completed when this file is processed for a build +# +CONFIG_RTE_VER_YEAR=__YEAR +CONFIG_RTE_VER_MONTH=__MONTH +CONFIG_RTE_VER_MINOR=__MINOR +CONFIG_RTE_VER_SUFFIX=__SUFFIX +CONFIG_RTE_VER_RELEASE=__RELEASE + # # define executive environment # RTE_EXEC_ENV values are the directories in mk/exec-env/ diff --git a/config/rte_config.h b/config/rte_config.h index 7606f5d7b..5f1749dbb 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -18,6 +18,11 @@ #include +/** + * String that appears before the version number + */ +#define RTE_VER_PREFIX "DPDK" + /****** library defines ********/ /* compat defines */ diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h index a7eed7ab7..50867ea81 100644 --- a/lib/librte_eal/common/include/rte_version.h +++ b/lib/librte_eal/common/include/rte_version.h @@ -19,38 +19,6 @@ extern "C" { #include #include -/** - * String that appears before the version number - */ -#define RTE_VER_PREFIX "DPDK" - -/** - * Major version/year number i.e. the yy in yy.mm.z - */ -#define RTE_VER_YEAR 19 - -/** - * Minor version/month number i.e. the mm in yy.mm.z - */ -#define RTE_VER_MONTH 5 - -/** - * Patch level number i.e. the z in yy.mm.z - */ -#define RTE_VER_MINOR 0 - -/** - * Extra string to be appended to version number - */ -#define RTE_VER_SUFFIX "-rc" - -/** - * Patch release number - * 0-15 = release candidates - * 16 = release - */ -#define RTE_VER_RELEASE 0 - /** * Macro to compute a version number usable for comparisons */ diff --git a/meson.build b/meson.build index aaa6002ae..9fefa1b75 100644 --- a/meson.build +++ b/meson.build @@ -24,6 +24,20 @@ dpdk_app_link_libraries = [] pver = meson.project_version().split('.') major_version = '@0@.@1@'.format(pver.get(0), pver.get(1)) +# extract all version information into the build configuration +dpdk_conf.set('RTE_VER_YEAR', pver.get(0)) +dpdk_conf.set('RTE_VER_MONTH', pver.get(1)) +if pver.get(2).contains('-rc') + rc_ver = pver.get(2).split('-rc') + dpdk_conf.set('RTE_VER_MINOR', rc_ver.get(0)) + dpdk_conf.set_quoted('RTE_VER_SUFFIX', '-rc') + dpdk_conf.set('RTE_VER_RELEASE', rc_ver.get(1)) +else + dpdk_conf.set('RTE_VER_MINOR', pver.get(2)) + dpdk_conf.set_quoted('RTE_VER_SUFFIX', '') + dpdk_conf.set('RTE_VER_RELEASE', 0) +endif + pmd_subdir_opt = get_option('drivers_install_subdir') if pmd_subdir_opt.contains('') pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('')) diff --git a/mk/rte.sdkconfig.mk b/mk/rte.sdkconfig.mk index d9c8d53d2..007022adf 100644 --- a/mk/rte.sdkconfig.mk +++ b/mk/rte.sdkconfig.mk @@ -76,6 +76,8 @@ else $(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE | $(RTE_OUTPUT) $(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \ $(CPP) -undef -P -x assembler-with-cpp \ + `cat $(RTE_SRCDIR)/DPDK_VERSION | sed -e 's/-rc/.-rc./' | \ + awk -F '.' '{print "-D__YEAR="$$1, "-D__MONTH="$$2, "-D__MINOR="$$3, "-D__SUFFIX=\""$$4"\"", "-D__RELEASE="int($$5)}'` \ -ffreestanding \ -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \ config=$$(cat $(RTE_OUTPUT)/.config_tmp) ; \