From patchwork Tue Jul 21 15:39:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruce Richardson X-Patchwork-Id: 74581 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 223F8A0526; Tue, 21 Jul 2020 17:40:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CA6411BFE9; Tue, 21 Jul 2020 17:40:06 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 1A29E1BFE7 for ; Tue, 21 Jul 2020 17:40:04 +0200 (CEST) IronPort-SDR: +bd/FHa/tFuSIaZSaR0RMXAZqXfFsSKUZv9jzt5qtiBw/S77T++invAaPrf/pu9edHjEPgUZo2 EyP99Z8Om6cA== X-IronPort-AV: E=McAfee;i="6000,8403,9689"; a="130231795" X-IronPort-AV: E=Sophos;i="5.75,379,1589266800"; d="scan'208";a="130231795" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2020 08:40:04 -0700 IronPort-SDR: ykEQ2Ho6dab6R3FqFtUJvkdqqa2B8sXbD9L8y7DF65fTT8+lSiG+fjxZgySexy5P90GQiGRMrR 7LsQUjpcb2fg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,379,1589266800"; d="scan'208";a="270470455" Received: from silpixa00399126.ir.intel.com ([10.237.222.36]) by fmsmga007.fm.intel.com with ESMTP; 21 Jul 2020 08:40:03 -0700 From: Bruce Richardson To: John McNamara , Marko Kovacevic Cc: dev@dpdk.org, Bruce Richardson Date: Tue, 21 Jul 2020 16:39:50 +0100 Message-Id: <20200721153950.748927-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [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" 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'