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 8A7BBA0C4C; Tue, 23 Nov 2021 11:55:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4B08940040; Tue, 23 Nov 2021 11:55:37 +0100 (CET) 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 9FE3B4003C for ; Tue, 23 Nov 2021 11:55:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1637664935; 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: in-reply-to:in-reply-to:references:references; bh=Rto7wYW2X5Nv1jaa/hw+3NZPVBZyLWapoonQuGyBcWo=; b=JIS/jpWk7OJGNYmG0Ngnmi+ulfMZ6jQnbAsvw4zrunHdHcQNK6KA1oA/C1Cixie4IHzTzT PdQMZWugQlYBLDR++FIU6fTMz1h1p9Sqn4Yyc3n8CN3Bh5HjfNUfqC4LqvWv6aZrMbTAFT eQWEQ/qZC+N0jq8atq1M31xlAZeezI0= Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-518--qKVyuDUPaKcqkksLvvCCQ-1; Tue, 23 Nov 2021 05:55:12 -0500 X-MC-Unique: -qKVyuDUPaKcqkksLvvCCQ-1 Received: by mail-lj1-f198.google.com with SMTP id j11-20020a2ea90b000000b00218c174bb5dso979456ljq.22 for ; Tue, 23 Nov 2021 02:55:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Rto7wYW2X5Nv1jaa/hw+3NZPVBZyLWapoonQuGyBcWo=; b=PLq33f/LOEzSkmvrBBrEBx3orpIQUuGZNCu/HZ3mXTT6E/lErX4Ben4kIzCYNI8pnZ g9vwwVm3bnkYiN5nzvyN3n08PrrgDC9gkcs17RLj2lps6o9xK56bmADyP6voqWDOEccX lpyj1C2/Y+6qKc+yKyYqdRH1qwHMOHSPUNZd0spLEThHySJyyWiJA3IAACsvigENq65R vvBeF0Y/Qp8scCY11mz3y1VuC0KBmahpp62eshE8BDNNmXvajU5oYJGvbvDAY9eu9kWG wdDMuje2A49t3ZODK7hcGjOYYbRKixzkKmvHHLyFqcrlVFqDtWdrcAe9qjA3IHQFo/Sn 3LLQ== X-Gm-Message-State: AOAM531sUkMzPJZZLGEPl/J8OX2TErGeXP15ygsi6M6257Tjwiup3XAl Si56XbezEC9d/meTSbWVbwBvy5eWACB/BUsnHn+NPctoVhXz/6Ji8YPLKV4PP9kUuWD5LYKUTc6 vAXS3W7BAFCgwVvxzyDs= X-Received: by 2002:a19:e00b:: with SMTP id x11mr3766030lfg.217.1637664911124; Tue, 23 Nov 2021 02:55:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmUQDzi13JS6YhiIpRFvA9YXRDaIIzywppuDgVOOSWarvRXfcxgoFbIha7FPasqbSjbJ3X6RnhhbO+fC8KWPQ= X-Received: by 2002:a19:e00b:: with SMTP id x11mr3766005lfg.217.1637664910886; Tue, 23 Nov 2021 02:55:10 -0800 (PST) MIME-Version: 1.0 References: <1f6e95f1c4e148a18d8de8dc25d8bb63c094af60.1637612120.git.tredaelli@redhat.com> In-Reply-To: <1f6e95f1c4e148a18d8de8dc25d8bb63c094af60.1637612120.git.tredaelli@redhat.com> From: David Marchand Date: Tue, 23 Nov 2021 11:54:59 +0100 Message-ID: Subject: Re: [PATCH] doc: add build_root to STRIP_FROM_PATH To: Timothy Redaelli Cc: Ferruh Yigit , Thomas Monjalon , dev Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dmarchan@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="UTF-8" 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 Hello Timothy, On Mon, Nov 22, 2021 at 9:17 PM Timothy Redaelli wrote: > > examples.dox is built inside builddir and so doxygen generates some > dir_HASH.html that includes the builddir name and this may prevent DPDK > documentation to be correctly generated in some distributions, for > example CentOS Stream 9 and RHEL9, since the builddir includes the > architecture. > > This commit adds builddir to STRIP_FROM_PATH in order to avoid > generating html files that includes it. > > Fixes: a6090630f4e5 ("doc: automate examples file list for API") I think we want it in LTS branches, so: Cc: stable@dpdk.org > Signed-off-by: Timothy Redaelli > --- > doc/api/doxy-api.conf.in | 1 + > doc/api/meson.build | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in > index db2ca9b6ed..a668cad687 100644 > --- a/doc/api/doxy-api.conf.in > +++ b/doc/api/doxy-api.conf.in > @@ -112,6 +112,7 @@ EXAMPLE_RECURSIVE = YES > > OUTPUT_DIRECTORY = @OUTPUT@ > STRIP_FROM_PATH = @STRIP_FROM_PATH@ > +STRIP_FROM_PATH += @BUILDDIR@ > GENERATE_HTML = YES > HTML_OUTPUT = @HTML_OUTPUT@ > GENERATE_LATEX = NO > diff --git a/doc/api/meson.build b/doc/api/meson.build > index d34c383694..6dda9bec46 100644 > --- a/doc/api/meson.build > +++ b/doc/api/meson.build > @@ -37,6 +37,7 @@ cdata.set('OUTPUT', join_paths(meson.build_root(), 'doc', 'api')) > cdata.set('HTML_OUTPUT', 'html') > cdata.set('TOPDIR', meson.source_root()) > cdata.set('STRIP_FROM_PATH', meson.source_root()) > +cdata.set('BUILDDIR', meson.build_root()) You don't need this new variable, something like below is enough: -cdata.set('STRIP_FROM_PATH', meson.source_root()) +cdata.set('STRIP_FROM_PATH', ' '.join([meson.source_root(), meson.build_root()])) WDYT? > cdata.set('WARN_AS_ERROR', 'NO') > if get_option('werror') > cdata.set('WARN_AS_ERROR', 'YES') > -- > 2.33.1 > -- David Marchand