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 6385A45DCC; Fri, 29 Nov 2024 12:55:43 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDB41402AE; Fri, 29 Nov 2024 12:55:42 +0100 (CET) Received: from fout-b7-smtp.messagingengine.com (fout-b7-smtp.messagingengine.com [202.12.124.150]) by mails.dpdk.org (Postfix) with ESMTP id 7DEDE4014F for ; Fri, 29 Nov 2024 12:55:41 +0100 (CET) Received: from phl-compute-12.internal (phl-compute-12.phl.internal [10.202.2.52]) by mailfout.stl.internal (Postfix) with ESMTP id C37561140077; Fri, 29 Nov 2024 06:55:40 -0500 (EST) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-12.internal (MEProxy); Fri, 29 Nov 2024 06:55:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=monjalon.net; h= cc:cc:content-transfer-encoding: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=1732881340; x= 1732967740; bh=8yzkN8TSONeMCIcYm26664vDv/SqHPjlSxFSmFT89ZY=; b=e xyVmpd29hiNmKtdTNlQLEaLwXYGPUPbjWqEITpJIgLswQ8H2wUHtiBFd72FVEBVe NXs3LLn7A1/9cpBPtwKzouTdJtnG0jYxxLb+7UwnX1ohB5DoGOmg+fPmLjQkFrD+ 5MTXwW0PKlPcg0STz2aa/VYvXQXv4tL/Y57E1pFQWR5zbuCHq/zfBLQ7VriRRxPU oJ44UBG4VKYstmlGyxFxtoMQgGg8M/InsI2dk+fYkhdNEkxWEAvS4yu2Sd6we476 SrRGprrVXQCrJ8WoXo1TzFsLp7iBMpxR8IpB2osO4AWSC+ul3AXfhRoo2q+lH6z2 WP4DOb4kvECYonW7+BieA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :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=1732881340; x=1732967740; bh=8 yzkN8TSONeMCIcYm26664vDv/SqHPjlSxFSmFT89ZY=; b=34vccBtQQDymmHJhQ vkc5CsST/fsnANAOTdrf/xHgkPbRb3CbMFVbbGDG/qh8sfO6Hh/+y+oquzl9idtj mb2/cOLXK5amTUuW/sYX3F+wcpnnWXFp8z3RdF+PcdEkmbu4e1rJQP3jGzeMPzy4 /WXNk4T1/5aEUGhurQKnqVhN/Gqf2Hfw2kTFlzjPnQ4bmspUNj6TjRtBHJXs0Wia mmJp967g9wlQSkoJS9X/K7aVbUjQ0TCokzQ8/IeO7ya1oWev51lVlZ4tmgOPgSEr exh2yDJOEa7ruc04L0F/HWwmQr3WRsVmukH3J/5C941SEfx2ATKbH5BSaZA3bcSP 2xEqA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeefuddrheefgdefvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpggftfghnshhusghstghrihgsvgdpuffr tefokffrpgfnqfghnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnth hsucdlqddutddtmdenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecu hfhrohhmpefvhhhomhgrshcuofhonhhjrghlohhnuceothhhohhmrghssehmohhnjhgrlh honhdrnhgvtheqnecuggftrfgrthhtvghrnhepvdejhfdugeehvddtieejieegteeuudfg jeeukeeiledthfetveekhefhieelhfdtnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepthhhohhmrghssehmohhnjhgrlhhonhdrnhgvthdpnhgs pghrtghpthhtohepgedpmhhouggvpehsmhhtphhouhhtpdhrtghpthhtohepuggvvhesug hpughkrdhorhhgpdhrtghpthhtohepphgruhhlrdhsiigtiigvphgrnhgvkhesrghrmhdr tghomhdprhgtphhtthhopehluhgtrgdrvhhiiiiirghrrhhosegrrhhmrdgtohhmpdhrtg hpthhtohepsghruhgtvgdrrhhitghhrghrughsohhnsehinhhtvghlrdgtohhm X-ME-Proxy: Feedback-ID: i47234305:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 29 Nov 2024 06:55:39 -0500 (EST) From: Thomas Monjalon To: dev@dpdk.org Cc: Paul Szczepanek , Luca Vizzarro , Bruce Richardson Subject: [PATCH v4] dts: remove nested html dir for API doc Date: Fri, 29 Nov 2024 12:54:26 +0100 Message-ID: <20241129115528.194137-1-thomas@monjalon.net> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241126162506.1074550-1-paul.szczepanek@arm.com> References: <20241126162506.1074550-1-paul.szczepanek@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 From: Paul Szczepanek To facilitate deploying docs to the website and make paths more consistent remove the html directory from docs nested in API html directory. Signed-off-by: Paul Szczepanek Reviewed-by: Luca Vizzarro Signed-off-by: Thomas Monjalon --- v4: fix custom.css path and reword a little --- buildtools/call-sphinx-build.py | 8 +++++--- doc/api/meson.build | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/buildtools/call-sphinx-build.py b/buildtools/call-sphinx-build.py index 2c7de54285..c891f68ae4 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 + last_two_dirs = os.path.join(*os.path.normpath(dst).split(os.path.sep)[-2:]) + html_dst = dst if 'html' in last_two_dirs else join(dst, 'html') + process = run(sphinx_cmd + ['-b', 'html', src, html_dst], stdout=out) # create a gcc format .d file giving all the dependencies of this doc build with open(join(dst, '.html.d'), 'w') as d: @@ -40,7 +42,7 @@ # copy custom CSS file css = 'custom.css' src_css = join(src, css) -dst_css = join(dst, 'html', '_static', 'css', css) +dst_css = join(html_dst, '_static', 'css', css) if not os.path.exists(dst_css) or not filecmp.cmp(src_css, dst_css): os.makedirs(os.path.dirname(dst_css), exist_ok=True) shutil.copyfile(src_css, dst_css) diff --git a/doc/api/meson.build b/doc/api/meson.build index f9f1326bbd..ac6eb8236d 100644 --- a/doc/api/meson.build +++ b/doc/api/meson.build @@ -37,7 +37,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('.', 'dts', 'html', 'index.html')) +cdata.set('DTS_API_MAIN_PAGE', join_paths('.', 'dts', 'index.html')) if get_option('werror') cdata.set('WARN_AS_ERROR', 'YES') endif -- 2.47.1