From patchwork Thu Mar 7 11:54:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50915 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 A8D4A4C9D; Thu, 7 Mar 2019 12:55:02 +0100 (CET) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 2A6FB4C9C for ; Thu, 7 Mar 2019 12:55:01 +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 orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2019 03:55:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="139925565" 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:00 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Thu, 7 Mar 2019 11:54:45 +0000 Message-Id: <20190307115448.54041-2-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 1/4] build: add single source of DPDK version number 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" 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 --- 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 + 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}' INSTALL_CONFIGS := $(sort $(filter-out %~,\ $(patsubst $(RTE_SRCDIR)/config/defconfig_%,%,\ From patchwork Thu Mar 7 11:54:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50916 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 3E1034CAF; Thu, 7 Mar 2019 12:55:10 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by dpdk.org (Postfix) with ESMTP id 947C04CAB for ; Thu, 7 Mar 2019 12:55:08 +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 fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Mar 2019 03:55:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="139925621" 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:06 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Thu, 7 Mar 2019 11:54:46 +0000 Message-Id: <20190307115448.54041-3-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 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 --- DPDK_VERSION | 2 +- 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 ++ 6 files changed, 36 insertions(+), 33 deletions(-) diff --git a/DPDK_VERSION b/DPDK_VERSION index c4a4cd00b..e013b54dd 100644 --- a/DPDK_VERSION +++ b/DPDK_VERSION @@ -1 +1 @@ -19.05.0-rc0 +19.05.1 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 757618144..9d5320395 100644 --- a/meson.build +++ b/meson.build @@ -22,6 +22,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 8dc31d7cf..bbfa24dee 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) ; \ 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 From patchwork Thu Mar 7 11:54:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 50918 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 124AC4F9A; Thu, 7 Mar 2019 12:55:19 +0100 (CET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 61ADD4D27 for ; Thu, 7 Mar 2019 12:55:17 +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:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="139925670" 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:16 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: Bruce Richardson Date: Thu, 7 Mar 2019 11:54:48 +0000 Message-Id: <20190307115448.54041-5-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 4/4] eal: remove unneeded version logic 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" The version number in the DPDK_VERSION file will never have an offset that needs to be subtracted, so remove that logic from the version string generation. Signed-off-by: Bruce Richardson --- lib/librte_eal/common/include/rte_version.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/librte_eal/common/include/rte_version.h b/lib/librte_eal/common/include/rte_version.h index 50867ea81..f7a3a1ebc 100644 --- a/lib/librte_eal/common/include/rte_version.h +++ b/lib/librte_eal/common/include/rte_version.h @@ -57,9 +57,7 @@ rte_version(void) RTE_VER_MONTH, RTE_VER_MINOR, RTE_VER_SUFFIX, - RTE_VER_RELEASE < 16 ? - RTE_VER_RELEASE : - RTE_VER_RELEASE - 16); + RTE_VER_RELEASE); return version; }