From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 76C7E4C96 for ; Thu, 7 Mar 2019 14:35:17 +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:16 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,451,1544515200"; d="scan'208";a="325085838" 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:15 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: David Marchand , Bruce Richardson Date: Thu, 7 Mar 2019 13:34:58 +0000 Message-Id: <20190307133502.55321-1-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 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 0/4] One versionfile to rule them all... 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: , X-List-Received-Date: Thu, 07 Mar 2019 13:35:19 -0000 Right now with DPDK we have two sources of version information - the rte_version.h header file containing macros for C use, and the project version number in the project definition in meson.build. This is not optimal, so this patchset aims to provide a single source for the DPDK version. The options considered are: * Keep version info in rte_version.h only. The two reasons this was not chosen were: 1) parsing the version number from the header is awkward, as seen in the rte.sdkconfig.mk file, and a script to do so would be needed to integrate that into the meson build project definition. 2) rte_version.h is not in an obvious location inside the project when a user clones from git. It's hidden away in the "lib/librte_eal/common/include" folder. Ideally the version number should be evident at the top level of the DPDK tree. * Keep version info in meson.build file only. This seemed a better option than keeping the info in rte_version.h, but it still had disadvantages: 1) For make, using grep on meson.build to extract the version seemed a bit awkward, though doable. Splitting the version was tricky too, but managable with a small amount of scripting. 2) There was no easy way to have users access the version number when "make showversion" was deprecated with the make build system. * Store the version number in a new version file at the root level of the repo. * This did have the advantage of being easily discoverable on clone * Still had the disadvantage of needing some parsing to generate the defines from rte_version.h Since the last option seemed best, that is what is implemented in this set. The file DPDK_VERSION is added to store the version number, and make and meson both use that as their source of version info. For C code, the rte_version.h header remains, except that the basic definitions of the release YEAR, MONTH, MINOR etc. are moved to be automatically generated as part of rte_config.h. For make builds, this is done via using the preprocessor to insert the values when it generates the config. For meson builds, this is done by just adding the values to the dpdk_conf configuration object. --- V2: Updated following review from David Marchand. Bruce Richardson (4): build: add single source of DPDK version number build: use version number from config file build: move meson version handling to config directory eal: remove unneeded version logic DPDK_VERSION | 1 + config/common_base | 14 ++++++++ config/meson.build | 26 +++++++++++++++ config/rte_config.h | 5 +++ lib/librte_eal/common/include/rte_version.h | 36 +-------------------- meson.build | 16 ++------- mk/rte.sdkconfig.mk | 18 +++-------- 7 files changed, 54 insertions(+), 62 deletions(-) create mode 100644 DPDK_VERSION -- 2.20.1