From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9982345741;
Mon, 5 Aug 2024 16:00:38 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 7A86740673;
Mon, 5 Aug 2024 16:00:09 +0200 (CEST)
Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com
[209.85.208.46]) by mails.dpdk.org (Postfix) with ESMTP id 941D24065F
for <dev@dpdk.org>; Mon, 5 Aug 2024 16:00:07 +0200 (CEST)
Received: by mail-ed1-f46.google.com with SMTP id
4fb4d7f45d1cf-5ab2baf13d9so14403599a12.2
for <dev@dpdk.org>; Mon, 05 Aug 2024 07:00:07 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=pantheon.tech; s=google; t=1722866407; x=1723471207; darn=dpdk.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=0u47czjlS8cKnnoOqEb2XC8dMYCEsM+tw4z0NtXvHgw=;
b=kQmr8boAOn+zSmFpTy+XwRZAHTqshqGoJOkpl/XM59k6mjzi8hW3dtBYVEy1b6LrnL
i7qfR7Uu6JZpAi4xH+PhnB7DKT9ZK86sD3ku8ryUnfDEDKsisHPWxXJ/wfUOowYxRbKe
Mo5qODxPGwGxjGLuJCC+bIUtCCova1uXmvkKG7kZ1ddBbiEOnSn4juTHelQTTQwE0Nwj
R9ZRGBlh4ZR6tOkAXKCjHVQaf4bLiTVQ/QaGPZ6JxvbfMjQp4Zqr5Xv2Z9tQJNnG59sv
m0BIIkv0u6Q5i+WwjsEH9n9+MqwqMFyJh++Lg0pkGX4W6uj6nnhXlReck2m+PWPlqjWg
iG3w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1722866407; x=1723471207;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=0u47czjlS8cKnnoOqEb2XC8dMYCEsM+tw4z0NtXvHgw=;
b=Ela2MtUaVdcOZnk44yZ41fCoXVGDayvjlxvoXpD01zwF8qXu4Weuo/7XkOLrj9c3S4
8/b9dpE6HdlFUpJaQIMA12tmwFP4jLf3AcIVujBSPvVqvtb8WpGWDyfkDa+JrXY3Frr4
+XZ4YStvXEb+4u0leTgLtYarRWnwOxC97dUvj32/RB9aqOfH/PFW+bxzXXlJb93wrHul
oJwpCL0M6gNJ0Q8ev65Zc6YOTx61THizSrGVWVERlIfn+keBI3bUtpeenhJvXFRjdIY5
KtLPAvBbVS0ZdgnPCryFtfXY+3kwEcJB3zKnfYdyF1GIhFziFW3vrkOQM0IThQt1pR4l
VsIw==
X-Gm-Message-State: AOJu0YzUHypzC56f9oHeDWf0Ehf7eYh4xmj1uo+jh7zIAauLV+XWRnLs
CSQh/mBi4UGOqiH9OvU41smVjWr87d3DRMGp8Z63nc6YpZEvtrdXGucggkaajF0=
X-Google-Smtp-Source: AGHT+IFTlOJG2DGvnmyCXHk2bNxuqZSZddBzIzWEy4gvj9vY0AIuYBb/OoL9QjC3Yq6xa8hVZ3/Xzw==
X-Received: by 2002:a05:6402:342:b0:5a1:eb48:2b9a with SMTP id
4fb4d7f45d1cf-5b7f56fe38dmr8726362a12.25.1722866407152;
Mon, 05 Aug 2024 07:00:07 -0700 (PDT)
Received: from localhost.localdomain ([84.245.121.236])
by smtp.gmail.com with ESMTPSA id
4fb4d7f45d1cf-5b839b2b556sm4939230a12.25.2024.08.05.07.00.06
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 05 Aug 2024 07:00:06 -0700 (PDT)
From: =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes@pantheon.tech>
To: thomas@monjalon.net, Honnappa.Nagarahalli@arm.com,
bruce.richardson@intel.com, jspewock@iol.unh.edu, probb@iol.unh.edu,
paul.szczepanek@arm.com, Luca.Vizzarro@arm.com, npratte@iol.unh.edu
Cc: dev@dpdk.org, =?UTF-8?q?Juraj=20Linke=C5=A1?= <juraj.linkes@pantheon.tech>,
Luca Vizzarro <luca.vizzarro@arm.com>
Subject: [PATCH v11 4/5] doc: meson doc API build dir variable
Date: Mon, 5 Aug 2024 15:59:58 +0200
Message-Id: <20240805135959.214457-5-juraj.linkes@pantheon.tech>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20240805135959.214457-1-juraj.linkes@pantheon.tech>
References: <20231115133606.42081-1-juraj.linkes@pantheon.tech>
<20240805135959.214457-1-juraj.linkes@pantheon.tech>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
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
The three instances of the path 'dpdk_build_root/doc/api' are replaced
with a variable, moving the definition to one place.
Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
Reviewed-by: Luca Vizzarro <luca.vizzarro@arm.com>
Reviewed-by: Jeremy Spewock <jspewock@iol.unh.edu>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Tested-by: Luca Vizzarro <luca.vizzarro@arm.com>
Tested-by: Nicholas Pratte <npratte@iol.unh.edu>
---
doc/api/meson.build | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/api/meson.build b/doc/api/meson.build
index 5b50692df9..b828b1ed66 100644
--- a/doc/api/meson.build
+++ b/doc/api/meson.build
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause
# Copyright(c) 2018 Luca Boccassi <bluca@debian.org>
+doc_api_build_dir = meson.current_build_dir()
doxygen = find_program('doxygen', required: get_option('enable_docs'))
if not doxygen.found()
@@ -32,10 +33,10 @@ example = custom_target('examples.dox',
# set up common Doxygen configuration
cdata = configuration_data()
cdata.set('VERSION', meson.project_version())
-cdata.set('API_EXAMPLES', join_paths(dpdk_build_root, 'doc', 'api', 'examples.dox'))
-cdata.set('OUTPUT', join_paths(dpdk_build_root, 'doc', 'api'))
+cdata.set('API_EXAMPLES', join_paths(doc_api_build_dir, 'examples.dox'))
+cdata.set('OUTPUT', doc_api_build_dir)
cdata.set('TOPDIR', dpdk_source_root)
-cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, join_paths(dpdk_build_root, 'doc', 'api')]))
+cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, doc_api_build_dir]))
cdata.set('WARN_AS_ERROR', 'NO')
if get_option('werror')
cdata.set('WARN_AS_ERROR', 'YES')
--
2.34.1