From patchwork Thu Aug 20 12:41:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Power, Ciara" X-Patchwork-Id: 75757 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 5D115A04AF; Thu, 20 Aug 2020 14:56:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B0E271C1C8; Thu, 20 Aug 2020 14:52:25 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 135BF1C0B6 for ; Thu, 20 Aug 2020 14:52:18 +0200 (CEST) IronPort-SDR: TdgLrRHC86VsKwUNNfCQaGgTjK1VwO5arzFh7BAJnt/2sjnp8r+YbNKNF7JDa4fqt9TYCFhyOR 1H71EgRS5nCA== X-IronPort-AV: E=McAfee;i="6000,8403,9718"; a="219594340" X-IronPort-AV: E=Sophos;i="5.76,332,1592895600"; d="scan'208";a="219594340" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Aug 2020 05:52:18 -0700 IronPort-SDR: IHGxbuGqCeBVCxi7Foy54u6rWbPhNZAmsn/q6qLnpPboZigjpXAzf6lSOP9pe8BYZHd+Is/ecA gDO+W8wEs2/g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,332,1592895600"; d="scan'208";a="498130737" Received: from silpixa00399953.ir.intel.com (HELO silpixa00399953.ger.corp.intel.com) ([10.237.222.53]) by fmsmga005.fm.intel.com with ESMTP; 20 Aug 2020 05:52:17 -0700 From: Ciara Power To: dev@dpdk.org Cc: Bruce Richardson , John McNamara , Marko Kovacevic Date: Thu, 20 Aug 2020 13:41:21 +0100 Message-Id: <20200820124140.13451-19-ciara.power@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200820124140.13451-1-ciara.power@intel.com> References: <20200807123009.21266-1-ciara.power@intel.com> <20200820124140.13451-1-ciara.power@intel.com> Subject: [dpdk-dev] [PATCH v2 18/37] doc/guides: remove use of DPDK 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" From: Bruce Richardson 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 have the version info passed in from meson itself. Signed-off-by: Bruce Richardson --- buildtools/call-sphinx-build.py | 5 ++++- doc/guides/conf.py | 7 +------ doc/guides/meson.build | 3 ++- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index 85c9e01563..fa6f26b376 100755 --- a/buildtools/call-sphinx-build.py +++ b/buildtools/call-sphinx-build.py @@ -9,7 +9,10 @@ from subprocess import run, PIPE, STDOUT from distutils.version import StrictVersion -(sphinx, src, dst) = sys.argv[1:] # assign parameters to variables +(sphinx, version, src, dst) = sys.argv[1:] # assign parameters to variables + +# set the version in environment for sphinx to pick up +os.environ['DPDK_VERSION'] = version # for sphinx version >= 1.7 add parallelism using "-j auto" ver = run([sphinx, '--version'], stdout=PIPE, diff --git a/doc/guides/conf.py b/doc/guides/conf.py index d8fe5cccd7..9ebc26ed3f 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,11 +37,7 @@ 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() -release = version +release = environ['DPDK_VERSION'] master_doc = 'index' diff --git a/doc/guides/meson.build b/doc/guides/meson.build index 732e7ad3a9..daab139c4e 100644 --- a/doc/guides/meson.build +++ b/doc/guides/meson.build @@ -11,7 +11,8 @@ htmldir = join_paths(get_option('datadir'), 'doc', 'dpdk') html_guides = custom_target('html_guides', input: files('index.rst'), output: 'html', - command: [sphinx_wrapper, sphinx, meson.current_source_dir(), meson.current_build_dir()], + command: [sphinx_wrapper, sphinx, meson.project_version(), + meson.current_source_dir(), meson.current_build_dir()], depfile: '.html.d', build_by_default: get_option('enable_docs'), install: get_option('enable_docs'),