From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE2B0A0526; Tue, 21 Jul 2020 17:42:30 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 81D971BFEB; Tue, 21 Jul 2020 17:42:30 +0200 (CEST) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 52A851BFE9 for ; Tue, 21 Jul 2020 17:42:29 +0200 (CEST) IronPort-SDR: 5gG+o9OIlRd/bKYdwaVRZEss4Dq2ZrCs8hkzMoL+NLdOW3RpW0FdAEueVewp30x4hy/Ft2m6/a U+eZiICrptSA== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="235014180" X-IronPort-AV: E=Sophos;i="5.75,379,1589266800"; d="scan'208";a="235014180" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 08:42:28 -0700 IronPort-SDR: SRHTHzn7L0R90e7bH2XOI8aeWPJQy8tHECoDkHO0nE6J9hYEf9cGWPM/099lzfW7OMcWLOHSml pnBncmu/poUw== X-IronPort-AV: E=Sophos;i="5.75,379,1589266800"; d="scan'208";a="488127366" Received: from bricha3-mobl.ger.corp.intel.com ([10.252.9.114]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-SHA; 21 Jul 2020 08:42:27 -0700 Date: Tue, 21 Jul 2020 16:42:24 +0100 From: Bruce Richardson To: John McNamara , Marko Kovacevic Cc: dev@dpdk.org Message-ID: <20200721154224.GH735@bricha3-MOBL.ger.corp.intel.com> References: <20200721153950.748927-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200721153950.748927-1-bruce.richardson@intel.com> Subject: Re: [dpdk-dev] [PATCH] doc/guides: remove dependency on make build system 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" On Tue, Jul 21, 2020 at 04:39:50PM +0100, Bruce Richardson wrote: > When building the DPDK guide documents, the DPDK version information was > pulled using "make showversion", which meant there was a dependency on > the DPDK make-based build system. Change this to just read the data from > the VERSION file in the root directory. > > Signed-off-by: Bruce Richardson > --- > NOTE: When make build system is completed removed, we can change the > relative path to the VERSION file i.e. "../../", to instead pull the > path from "MESON_SOURCE_ROOT" in the environment, which should be more > robust. > --- > doc/guides/conf.py | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > > diff --git a/doc/guides/conf.py b/doc/guides/conf.py > index 700e05e17..ff8ddc7e7 100644 > --- a/doc/guides/conf.py > +++ b/doc/guides/conf.py > @@ -2,7 +2,6 @@ > # Copyright(c) 2010-2015 Intel Corporation > > from __future__ import print_function > -import subprocess > from docutils import nodes > from distutils.version import LooseVersion > from sphinx import __version__ as sphinx_version > @@ -38,10 +37,8 @@ > html_show_copyright = False > highlight_language = 'none' > > -# If MAKEFLAGS is exported by the user, garbage text might end up in version > -version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'], > - env=dict(environ, MAKEFLAGS="")) > -version = version.decode('utf-8').rstrip() > +with open('../../VERSION') as verfile: > + version = verfile.readline().rstrip() > release = version > > master_doc = 'index' > -- As a side-effect, this patch also allows doc building on FreeBSD, since it no longer uses "make" command, which should be "gmake" on BSD. /Bruce