From patchwork Mon Sep 7 22:06:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Monjalon X-Patchwork-Id: 76783 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 97423A04AA; Tue, 8 Sep 2020 00:07:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BE5971C0DB; Tue, 8 Sep 2020 00:07:25 +0200 (CEST) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by dpdk.org (Postfix) with ESMTP id 26EF81C0CD for ; Tue, 8 Sep 2020 00:07:22 +0200 (CEST) Received: from compute7.internal (compute7.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id E4FD65C0098; Mon, 7 Sep 2020 18:07:20 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute7.internal (MEProxy); Mon, 07 Sep 2020 18:07:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=fm2; bh=C4IlhCW6PhD9o synNYnqPamADJ+1jHGtGHGTKy0M8Zs=; b=kQGuvHQtGlEJ+IiDE4jOKSQw7+amM haZvufmvdWxxq1iqW2IxOoE0mlHH+6a27VZYqAxOggPXOw1u3JbdGefXodyyDJvA rLWfOFdzr1T+1YMPPDAWO82MJmYUgvAnilJoYoh3sXkogt4Yg4c9xbCAGqCK6kXu f90CJ7JuCGXhzHuavtbFKYvdMh8drLlcmzw+AMkYQNWC2aZzJBDllkrAS+WaocRT lfi930BP0RJZAFZ6uCO08AZFMB7S/vQpqIksZZq1iZ4aa/aoggwbJzmshI/szU3J eb45wYVFzN4SIYJSPjd66sMmXFz67p/LlAyIl7ciQFavu3SjlxRx80DXg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; bh=C4IlhCW6PhD9osynNYnqPamADJ+1jHGtGHGTKy0M8Zs=; b=HS1FPSko WOxtzd87GKOHEeic9CFFJZxpbrVlUEXh0imAfHG9RukrBFvZOuVC57lj1RatxvYl shlFSixfubGIHCxtaOAkxyFe7UiLzdTOeKBFxyeycxYYNL4dGMXBq5UfMWGOp0FD zUZoEvIZV8yg7bQ2ticHMQVQQTUSOXmZN0MthGlI3LspK4N0GqtPEZq8/lOXd6qB 3zAoh2JtrJBUiBGss3VreK/S55YWmz0SI1k1wmWIRRD7GvtpcUOauhaBFW6bXoeL /I5C38rfcPWxwaVblg8CbUwTo5P+w7CqAtCQIgbEhd2Oho32/CculswEPpRIuQSd hhBqU8x8ztGMXg== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduiedrudehuddgtdefucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgjfhgggfestdekre dtredttdenucfhrhhomhepvfhhohhmrghsucfoohhnjhgrlhhonhcuoehthhhomhgrshes mhhonhhjrghlohhnrdhnvghtqeenucggtffrrghtthgvrhhnpedvhefgiedvjeegtdevhe efhfetleefgfeivefgffevfeejgedtgfeutdehtdegveenucfkphepjeejrddufeegrddv tdefrddukeegnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrh homhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvth X-ME-Proxy: Received: from xps.monjalon.net (184.203.134.77.rev.sfr.net [77.134.203.184]) by mail.messagingengine.com (Postfix) with ESMTPA id 1237A328005D; Mon, 7 Sep 2020 18:07:19 -0400 (EDT) From: Thomas Monjalon To: dev@dpdk.org Cc: david.marchand@redhat.com, bruce.richardson@intel.com, ciara.power@intel.com Date: Tue, 8 Sep 2020 00:06:41 +0200 Message-Id: <20200907220711.437405-2-thomas@monjalon.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200907220711.437405-1-thomas@monjalon.net> References: <20200903152717.42095-1-ciara.power@intel.com> <20200907220711.437405-1-thomas@monjalon.net> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 01/31] doc: build without using make 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'),