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 8CAA645DCC; Fri, 29 Nov 2024 12:39:33 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 13866402AE; Fri, 29 Nov 2024 12:39:33 +0100 (CET) Received: from fhigh-b1-smtp.messagingengine.com (fhigh-b1-smtp.messagingengine.com [202.12.124.152]) by mails.dpdk.org (Postfix) with ESMTP id 0E70A4014F for ; Fri, 29 Nov 2024 12:39:31 +0100 (CET) Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfhigh.stl.internal (Postfix) with ESMTP id 30BFA254011C; Fri, 29 Nov 2024 06:39:30 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Fri, 29 Nov 2024 06:39:30 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm1; t=1732880370; x=1732966770; bh=E68bA4+GEqV2gH37MhOE+iC3/ljOHoCELMGYm4ZwFJM=; b= PIbdABjoyFELm8+eSBzTytJC1XPip5yHpuFj5C1O46Ia01QIC4jEAp6rloqDsy2l ANeGmOn9tSGNCoRLYWicl0r7YjZIrELs0VOYmPaIks8C/AC4AYrPSmWrtGk5EuZ3 h8mw23OGYyCbSzMkPWQrQfAE5Jfa8EZg4zTVbzvqhPI2ICVEQlry2EgZqvYMzp0G qFGzIP8EuNuNupOIkY9L115RWyIfSlrdcl+xOy2fI+rgkO75y3tRo9TdUwnCsNEo 4BmSyKUi5jeld4khmj6NTggLjcMRdLAE49Jhz645PRqbChwCQUhpHZuRerSWZZfN Lkeip9uF01c/n52h4M0MHg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1732880370; x= 1732966770; bh=E68bA4+GEqV2gH37MhOE+iC3/ljOHoCELMGYm4ZwFJM=; b=4 lMjMBdlRLKLG9WVSNuN0WvhYujm8MbaqejwfaUkD8j4W9tEDxAh3/ndg8zxAevHv Hq1PMFv2GAKvAXRkcDNHHE5+abzgZSXPIOfeKrIwXjFoXYVDgsrpy3VFGKnnHOwu qn/y9F5Y/C6Cj+6JX5Yg+d4A39kx/glBb4wx9Kd3v+DuoOQj3kpgXp0uxxDwIIDB BmgIEsZZDavo/SP11b3ZotLW6H+nXMBoX3BprFB7BYtdEfyLJr/RbH8q87nwSMuT Nnb5TNfV1lOi1iPs6nCB2aof+JGXq0tTtHumVvtjyRC3nUGS8319MOFoZGOWV5Kc s6zow9qmSJyrQUNtRydfQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrheefgddvlecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhvfevufffkfgjfhgggfgtsehtufertddttdejnecu hfhrohhmpefvhhhomhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlh honhdrnhgvtheqnecuggftrfgrthhtvghrnhepjeduveehieevuddutdevfffgtdegkeeu veejffejgedtgeegkefgvdeugfefkeejnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvthdpnhgs pghrtghpthhtohepfedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepphgruhhlrd hsiigtiigvphgrnhgvkhesrghrmhdrtghomhdprhgtphhtthhopeguvghvseguphgukhdr ohhrghdprhgtphhtthhopehluhgtrgdrvhhiiiiirghrrhhosegrrhhmrdgtohhm X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Nov 2024 06:39:28 -0500 (EST) From: Thomas Monjalon To: Paul Szczepanek Cc: dev@dpdk.org, Luca Vizzarro Subject: Re: [PATCH v3] dts: remove html dir from nested docs Date: Fri, 29 Nov 2024 12:39:26 +0100 Message-ID: <7740087.EvYhyI6sBW@thomas> In-Reply-To: <20241128230515.1125653-1-paul.szczepanek@arm.com> References: <20241126162506.1074550-1-paul.szczepanek@arm.com> <20241128230515.1125653-1-paul.szczepanek@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit 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 29/11/2024 00:05, Paul Szczepanek: > To facilitate deploying docs to the website > and make paths more consistent remove the html > directory from docs nested in html directories. > > Signed-off-by: Paul Szczepanek > Reviewed-by: Luca Vizzarro > --- > buildtools/call-sphinx-build.py | 6 ++++-- > doc/api/meson.build | 2 +- > 2 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py > index 2c7de54285..3e5fc813a2 100755 > --- a/buildtools/call-sphinx-build.py > +++ b/buildtools/call-sphinx-build.py > @@ -30,8 +30,10 @@ > > # run sphinx, putting the html output in a "html" directory > with open(join(dst, 'sphinx_html.out'), 'w') as out: > - process = run(sphinx_cmd + ['-b', 'html', src, join(dst, 'html')], > - stdout=out) > + # don't append html dir if dst is already nested in a html dir > + top_2_dirs = os.path.join(*os.path.normpath(dst).split(os.path.sep)[-2:]) > + html_dst = dst if 'html' in top_2_dirs else join(dst, 'html') > + process = run(sphinx_cmd + ['-b', 'html', src, html_dst], stdout=out) There is still a file in the extra html directory: build/doc/api/html/dts/html/_static/css/custom.css I suppose that we need to change this line: dst_css = join(dst, 'html', '_static', 'css', css) into dst_css = join(html_dst, '_static', 'css', css) Then it should become this path: build/doc/api/html/dts/_static/css/custom.css