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 inbox.dpdk.org (Postfix) with ESMTP id C1A69A04BF;
Thu, 3 Sep 2020 17:33:03 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 925C31C1BD;
Thu, 3 Sep 2020 17:28:54 +0200 (CEST)
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
by dpdk.org (Postfix) with ESMTP id 003BD1C1B3
for <dev@dpdk.org>; Thu, 3 Sep 2020 17:28:52 +0200 (CEST)
IronPort-SDR: RJs+90pE/6EHGiNTAbywYMx1Cc4++EXOiht0qUJT3Xx/U4KR8d/B3NWKm2pdS7Rqb+/p7z45+v
d8gIv2v96yAQ==
X-IronPort-AV: E=McAfee;i="6000,8403,9733"; a="145290643"
X-IronPort-AV: E=Sophos;i="5.76,387,1592895600"; d="scan'208";a="145290643"
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga006.jf.intel.com ([10.7.209.51])
by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
03 Sep 2020 08:28:52 -0700
IronPort-SDR: WfLtxcP/4zX+SEwhkZena0XaNBr8/wON/kzus2Tg7xlkSO+dIS9M33btQVY6jxQa7pMq4aBPWp
XQmTvMxBQa1g==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.76,387,1592895600"; d="scan'208";a="302244009"
Received: from silpixa00399953.ir.intel.com (HELO
silpixa00399953.ger.corp.intel.com) ([10.237.222.53])
by orsmga006.jf.intel.com with ESMTP; 03 Sep 2020 08:28:51 -0700
From: Ciara Power <ciara.power@intel.com>
To: dev@dpdk.org
Cc: Bruce Richardson <bruce.richardson@intel.com>,
John McNamara <john.mcnamara@intel.com>,
Marko Kovacevic <marko.kovacevic@intel.com>
Date: Thu, 3 Sep 2020 16:26:58 +0100
Message-Id: <20200903152717.42095-19-ciara.power@intel.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20200903152717.42095-1-ciara.power@intel.com>
References: <20200807123009.21266-1-ciara.power@intel.com>
<20200903152717.42095-1-ciara.power@intel.com>
Subject: [dpdk-dev] [PATCH v3 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 <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>
From: Bruce Richardson <bruce.richardson@intel.com>
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 <bruce.richardson@intel.com>
---
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'),
--
2.17.1