From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 368B945BB3; Wed, 23 Oct 2024 17:31:09 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2905D40613; Wed, 23 Oct 2024 17:31:09 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C8EAC402DF for ; Wed, 23 Oct 2024 17:31:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729697467; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cJ96qXeyvCBgIZ3328fAygfAIedv8ybw+9UXvcd1bmY=; b=bFDpUnTFHuQ7ZFKF3XrW3O3TTh6SMmmmIYHe8ADE9Pxr5d1C55yagdKqsf5Ept47Jng+n3 SUFBBvD1B3/RYafKwmnrXQlWHyNBUIYnhzVYUVI7J8aNUyEiE5h+1ADgW4PEYQcTwqEq0/ zMjvBznWlSkJZNW1DTaBBUAo8A7B55U= Received: from mail-lf1-f70.google.com (mail-lf1-f70.google.com [209.85.167.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-336-NMY6XUGEPO2yT_cjkNKNvw-1; Wed, 23 Oct 2024 11:31:06 -0400 X-MC-Unique: NMY6XUGEPO2yT_cjkNKNvw-1 Received: by mail-lf1-f70.google.com with SMTP id 2adb3069b0e04-539ec1a590fso5619460e87.0 for ; Wed, 23 Oct 2024 08:31:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729697464; x=1730302264; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cJ96qXeyvCBgIZ3328fAygfAIedv8ybw+9UXvcd1bmY=; b=gcTqR08n3XQEzInPvKYCl+l7H46icMp85zGHRt5gtvvqThZEBdiPlGlGUh+0nnE6AF 2tK0iWKHBMkTawUTEtxz5vimj17tYqVtZ+k6TKhV5hJWjERi7ZoMG4TcwUFLUWTTdEKt vHsbMEyMhtD0vMGEHzoudP81J9QYLJY+H+aW45NzKhRVJs8Tt+x9S86mo0Zlztao+ReL 21AvzcHKQy6C65GhzfK7PvEM+GVB2Y6i4qCatlcOHfPz03sIOK8iqSd3RMpMOqKdw8JQ XKt2oEwJih+k5Wfc7hLDRglNByioR8Bq3fpyskVaJ0gNrDgKJqHA8RQsV0PwlWE+L0g7 XCPw== X-Gm-Message-State: AOJu0YwQsSlJFwWkuBFflcdd0nnm+4L8xp6Hu+AkBrx1eJhwBPLu80UM yvLym2rm+PoSqMXucz5zqPSS0wuKnnjLuBHh9OIn6eZtPCKDYq1147V5s1qQoUyQbs146Knazhz l4zCV0YL9hfuexaio5c47C/VVWLylbOx4FPaaiMn3gr+P2u4CztfegXoMr70R13tUJX1kGIx9pd mhplb0qWC2dzGQVZHSVM31TFSidQFj X-Received: by 2002:a05:6512:3350:b0:53b:2114:92a7 with SMTP id 2adb3069b0e04-53b21149579mr155475e87.52.1729697464568; Wed, 23 Oct 2024 08:31:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuw8mNwqXVBbnhX2Vwza5aC5Ypb0F3FVGxIEqzuD7Tsl2ersCudjoAcMFTobjgKJJsVId1GgPWPikzFt4YSlM= X-Received: by 2002:a05:6512:3350:b0:53b:2114:92a7 with SMTP id 2adb3069b0e04-53b21149579mr155447e87.52.1729697464053; Wed, 23 Oct 2024 08:31:04 -0700 (PDT) MIME-Version: 1.0 References: <20241023145732.286071-1-paul.szczepanek@arm.com> In-Reply-To: <20241023145732.286071-1-paul.szczepanek@arm.com> From: David Marchand Date: Wed, 23 Oct 2024 17:30:52 +0200 Message-ID: Subject: Re: [PATCH] dts: fix doxygen API link To: Paul Szczepanek , probb@iol.unh.edu Cc: dev@dpdk.org, Luca Vizzarro X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org On Wed, Oct 23, 2024 at 4:58=E2=80=AFPM Paul Szczepanek wrote: > > Alias used to produce the link to the DTS API docs uses config data. > The required value in config data was being added in the wrong scope. > This moves the key addition to where the config data object is created. > > Fixes: 7f9326423a04 ("dts: add API doc generation") > > Signed-off-by: Paul Szczepanek > Acked-by: Patrick Robb > --- > doc/api/dts/meson.build | 2 -- > doc/api/meson.build | 1 + > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/doc/api/dts/meson.build b/doc/api/dts/meson.build > index 5115df7095..5cb4a68dd4 100644 > --- a/doc/api/dts/meson.build > +++ b/doc/api/dts/meson.build > @@ -11,8 +11,6 @@ if python_ver_satisfied !=3D 0 > subdir_done() > endif > > -cdata.set('DTS_API_MAIN_PAGE', join_paths('..', 'dts', 'html', 'index.ht= ml')) > - > extra_sphinx_args =3D ['-E', '-c', join_paths(doc_source_dir, 'guides')] > if get_option('werror') > extra_sphinx_args +=3D '-W' > diff --git a/doc/api/meson.build b/doc/api/meson.build > index ae23e9825e..fdb04e0ec8 100644 > --- a/doc/api/meson.build > +++ b/doc/api/meson.build > @@ -40,6 +40,7 @@ cdata.set('OUTPUT', join_paths(dpdk_build_root, 'doc', = 'api')) > cdata.set('TOPDIR', dpdk_source_root) > cdata.set('STRIP_FROM_PATH', ' '.join([dpdk_source_root, join_paths(dpdk= _build_root, 'doc', 'api')])) > cdata.set('WARN_AS_ERROR', 'NO') > +cdata.set('DTS_API_MAIN_PAGE', join_paths(dpdk_build_root, 'doc', 'api',= 'dts', 'html', 'index.html')) > if get_option('werror') > cdata.set('WARN_AS_ERROR', 'YES') > endif Looking again while applying, something is fishy in doc/api/meson.build: if not doxygen.found() # process DTS API doc build even if DPDK API doc build can't be done cdata =3D configuration_data() subdir('dts') subdir_done() endif Should this cdata (unused afaics) object be removed too? --=20 David Marchand