From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <bruce.richardson@intel.com>
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
by dpdk.org (Postfix) with ESMTP id 4289F2C17
for <dev@dpdk.org>; Fri, 15 Mar 2019 19:20:39 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga007.fm.intel.com ([10.253.24.52])
by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
15 Mar 2019 11:20:38 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.58,483,1544515200"; d="scan'208";a="134701229"
Received: from silpixa00399126.ir.intel.com (HELO
silpixa00399126.ger.corp.intel.com) ([10.237.222.236])
by fmsmga007.fm.intel.com with ESMTP; 15 Mar 2019 11:20:36 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: David Marchand <david.marchand@redhat.com>,
Thomas Monjalon <thomas@monjalon.net>, Luca Boccassi <bluca@debian.org>,
Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 15 Mar 2019 18:20:18 +0000
Message-Id: <20190315182022.39976-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 v3 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Mar 2019 18:20:39 -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
manageable 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.
---
V3: Reworked following review from Thomas Monjalon. Main change is to how
the RTE_VER_RELEASE value is computed for non-release candidates.
Also added int() conversion to each version value to remove leading
zeros
V2: Updated following review from David Marchand.
Bruce Richardson (4):
build: add single source of DPDK version number
build: move meson version handling to config directory
build: use version number from config file
eal: remove unneeded version logic
VERSION | 1 +
config/common_base | 14 ++++++++
config/meson.build | 26 +++++++++++++++
config/rte_config.h | 3 ++
lib/librte_eal/common/include/rte_version.h | 36 +--------------------
meson.build | 21 +++++-------
mk/rte.sdkconfig.mk | 23 ++++++-------
7 files changed, 62 insertions(+), 62 deletions(-)
create mode 100644 VERSION
--
2.20.1
From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by dpdk.space (Postfix) with ESMTP id 6F154A0096
for <public@inbox.dpdk.org>; Fri, 15 Mar 2019 19:20:42 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 38EAE4C96;
Fri, 15 Mar 2019 19:20:41 +0100 (CET)
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
by dpdk.org (Postfix) with ESMTP id 4289F2C17
for <dev@dpdk.org>; Fri, 15 Mar 2019 19:20:39 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga007.fm.intel.com ([10.253.24.52])
by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
15 Mar 2019 11:20:38 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.58,483,1544515200"; d="scan'208";a="134701229"
Received: from silpixa00399126.ir.intel.com (HELO
silpixa00399126.ger.corp.intel.com) ([10.237.222.236])
by fmsmga007.fm.intel.com with ESMTP; 15 Mar 2019 11:20:36 -0700
From: Bruce Richardson <bruce.richardson@intel.com>
To: dev@dpdk.org
Cc: David Marchand <david.marchand@redhat.com>,
Thomas Monjalon <thomas@monjalon.net>, Luca Boccassi <bluca@debian.org>,
Bruce Richardson <bruce.richardson@intel.com>
Date: Fri, 15 Mar 2019 18:20:18 +0000
Message-Id: <20190315182022.39976-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 v3 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 <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Content-Type: text/plain; charset="UTF-8"
Message-ID: <20190315182018.qbP1rQedF5qoo0S_4TBAX4Ab03rw68u0zF58hJw_wHk@z>
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
manageable 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.
---
V3: Reworked following review from Thomas Monjalon. Main change is to how
the RTE_VER_RELEASE value is computed for non-release candidates.
Also added int() conversion to each version value to remove leading
zeros
V2: Updated following review from David Marchand.
Bruce Richardson (4):
build: add single source of DPDK version number
build: move meson version handling to config directory
build: use version number from config file
eal: remove unneeded version logic
VERSION | 1 +
config/common_base | 14 ++++++++
config/meson.build | 26 +++++++++++++++
config/rte_config.h | 3 ++
lib/librte_eal/common/include/rte_version.h | 36 +--------------------
meson.build | 21 +++++-------
mk/rte.sdkconfig.mk | 23 ++++++-------
7 files changed, 62 insertions(+), 62 deletions(-)
create mode 100644 VERSION
--
2.20.1