From patchwork Thu Mar 7 11:54:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50917 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 A6D8B4F90; Thu, 7 Mar 2019 12:55:17 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 6508D4CC3 for ; Thu, 7 Mar 2019 12:55:15 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2019 03:55:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="139925646" Received: from silpixa00399126.ir.intel.com (HELO silpixa00399126.ger.corp.intel.com) ([10.237.222.236]) by orsmga002.jf.intel.com with ESMTP; 07 Mar 2019 03:55:13 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Thu, 7 Mar 2019 11:54:47 +0000 Message-Id: <20190307115448.54041-4-bruce.richardson@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190307115448.54041-1-bruce.richardson@intel.com> References: <20190307115448.54041-1-bruce.richardson@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 3/4] build: move meson version handling to config directory 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" To keep the top-level meson.build file as clean and clear as possible, we move the version handling - which was originally short but now is a lot longer - to the config/meson.build file, where the rest of the build configuration is already being set up. Signed-off-by: Bruce Richardson --- config/meson.build | 26 ++++++++++++++++++++++++++ meson.build | 26 -------------------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/config/meson.build b/config/meson.build index 0419607d3..bbe17c786 100644 --- a/config/meson.build +++ b/config/meson.build @@ -1,6 +1,32 @@ # SPDX-License-Identifier: BSD-3-Clause # Copyright(c) 2017 Intel Corporation +# set the major version, which might be used by drivers and libraries +# depending on the configuration options +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('')) +endif +driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt) +eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) + # set the machine type and cflags for it if meson.is_cross_build() machine = host_machine.cpu() diff --git a/meson.build b/meson.build index 9d5320395..b0151f0c7 100644 --- a/meson.build +++ b/meson.build @@ -17,32 +17,6 @@ dpdk_drivers = [] dpdk_extra_ldflags = [] dpdk_app_link_libraries = [] -# set the major version, which might be used by drivers and libraries -# depending on the configuration options -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('')) -endif -driver_install_path = join_paths(get_option('libdir'), pmd_subdir_opt) -eal_pmd_path = join_paths(get_option('prefix'), driver_install_path) - # configure the build, and make sure configs here and in config folder are # able to be included in any file. We also store a global array of include dirs # for passing to pmdinfogen scripts