diff mbox series

[v2,3/4] build: move meson version handling to config directory

Message ID 20190307133502.55321-4-bruce.richardson@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series One versionfile to rule them all... |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation success Compilation OK

Commit Message

Bruce Richardson March 7, 2019, 1:35 p.m. UTC 
  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 <bruce.richardson@intel.com>
Acked-by: Luca Boccassi <bluca@debian.org>
---
V2: No changes, added Luca's ack
---
 config/meson.build | 26 ++++++++++++++++++++++++++
 meson.build        | 26 --------------------------
 2 files changed, 26 insertions(+), 26 deletions(-)
diff mbox series

Patch

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('<VERSION>')
+	pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
+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 9fefa1b75..9fba06767 100644
--- a/meson.build
+++ b/meson.build
@@ -19,32 +19,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('<VERSION>')
-	pmd_subdir_opt = major_version.join(pmd_subdir_opt.split('<VERSION>'))
-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