From patchwork Wed Nov 30 21:42:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Buclaw X-Patchwork-Id: 28022 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp1164795wrr; Wed, 30 Nov 2022 13:43:22 -0800 (PST) X-Google-Smtp-Source: AA0mqf5FXcRqTuz6krHYuzKHSxOYNcgsEC/6xkJt5cp6/ikC7AB9Uu5mdUXdMOhMfkvUhGOX4mQa X-Received: by 2002:a17:906:124d:b0:7ad:b822:d2e4 with SMTP id u13-20020a170906124d00b007adb822d2e4mr53443930eja.35.1669844601912; Wed, 30 Nov 2022 13:43:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669844601; cv=none; d=google.com; s=arc-20160816; b=tzcYwmam6Cy+OYezWqArp/AzKA6Xf4fY0ofo3b0C7fKhOLv0L07e5WObvfkqzzGoF6 NT+09IbxkW27Mpq+hipWFy9SBT80/oviNGulnS0WheaoSMNMzBXcw5Cv58rJ7UnEhk3O rPhfkE7upb4KcPj2RFVK0FCsw42Fb3qqQKo8vBtHPVOnRhBQmJhXyF8dy+Sq2ThmyHBV xFX/XmZHTQ4POpTXhZCXo0zPevkMLnq9e1rQolsbKY5jW4V7FS03UpGE0OUYHUVuWm0F vDMBC4yuX9770zDPbzy3IxorrRDYhmXJbnZWMsrGdqRiBxlSqjGc6hjbssjBuY0wJi9U KkQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=nSN2YpWdPYxvwNJgQH4LTdG/tbJdRjcSWY4XuZ3or+o=; b=PeF3MiMUHKchkfxKk1LxBHu0J84vN/L+KYt8iAj2IOVHghCE56bbESiU6yMDwQi5xw pI10xJEqEFqZTKSQ12f3BRyXB2sTxZhF3qFeCTNZB9rfmzWA+FLX3+oavDyZty3ujsjg kb90Y+jzQGZ24NvxOrUO8TgjVzjhZDrafX1tYAm/p8SqQA93+n2uR0CF5COcm36l53WC Huqtfq0Zqap5IaVUiTU5uGUHF4iK4Kp86GQbyhE/+ypImICtK6Lf69elTMfVBRmjBNTB +/If7yeUPMeUI9Xa2D/F7FCSP5LCiDxfpT5uqU+EYK2DjJs01eEg0sp1MuAqU3DMPar3 ncMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wKXrPNcy; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id ef11-20020a05640228cb00b004699f2ef797si1985776edb.73.2022.11.30.13.43.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Nov 2022 13:43:21 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=wKXrPNcy; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B4809385842E for ; Wed, 30 Nov 2022 21:43:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B4809385842E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1669844600; bh=nSN2YpWdPYxvwNJgQH4LTdG/tbJdRjcSWY4XuZ3or+o=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=wKXrPNcym4MonmXoqex3SOtJPiMqFY93nizFORF87/KC475C6H2yX4pUuTD/7hiN/ VnmDmnzZq6LkFHm5VmWjFEARSMrw6ztkLiF+SnU+7LzjOHEUSEpEOBY0A6eWkxgRmx Z9dOWiAG4+RlOjuNUCuzu7N/W9dC5SJZNjgs+R2k= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [IPv6:2001:67c:2050:0:465::102]) by sourceware.org (Postfix) with ESMTPS id 846683858D1E for ; Wed, 30 Nov 2022 21:42:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 846683858D1E Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4NMt3J5sTZz9sV1; Wed, 30 Nov 2022 22:42:36 +0100 (CET) To: gcc-patches@gcc.gnu.org Cc: Iain Buclaw Subject: [committed] d: Update recipes for building html and pdf documentation Date: Wed, 30 Nov 2022 22:42:34 +0100 Message-Id: <20221130214234.550547-1-ibuclaw@gdcproject.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4NMt3J5sTZz9sV1 X-Spam-Status: No, score=-13.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Iain Buclaw via Gcc-patches From: Iain Buclaw Reply-To: Iain Buclaw Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750958973387794604?= X-GMAIL-MSGID: =?utf-8?q?1750958973387794604?= Hi, This patch sorts out the include directories for building the gdc docs - we don't need to include anything from the toplevel docs directory. The html output directory has also been renamed from /d/ to /gdc/ to make it clearer that this is vendor-specific documentation. Tested by building and checking pdf/info/man/html pages, and committed to mainline. Regards, Iain. --- gcc/d/ChangeLog: * Make-lang.in: Only include doc/include when building documentation. (d.html): Rename html directory to $(build_htmldir)/gdc. --- gcc/d/Make-lang.in | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gcc/d/Make-lang.in b/gcc/d/Make-lang.in index 28313208ec9..b5264613db0 100644 --- a/gcc/d/Make-lang.in +++ b/gcc/d/Make-lang.in @@ -253,16 +253,15 @@ doc/gdc.info: $(D_TEXI_FILES) else true; fi doc/gdc.dvi: $(D_TEXI_FILES) - $(TEXI2DVI) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $< + $(TEXI2DVI) -I $(abs_docdir)/include -o $@ $< doc/gdc.pdf: $(D_TEXI_FILES) - $(TEXI2PDF) -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $< + $(TEXI2PDF) -I $(abs_docdir)/include -o $@ $< -$(build_htmldir)/d/index.html: $(D_TEXI_FILES) +$(build_htmldir)/gdc/index.html: $(D_TEXI_FILES) $(mkinstalldirs) $(@D) rm -f $(@D)/* - $(TEXI2HTML) -I $(gcc_docdir) -I $(gcc_docdir)/include \ - -I $(srcdir)/d -o $(@D) $< + $(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/d -o $(@D) $< .INTERMEDIATE: gdc.pod @@ -277,7 +276,7 @@ d.rest.encap: d.info: doc/gdc.info d.dvi: doc/gdc.dvi d.pdf: doc/gdc.pdf -d.html: $(build_htmldir)/d/index.html +d.html: $(build_htmldir)/gdc/index.html d.srcinfo: doc/gdc.info -cp -p $^ $(srcdir)/doc d.srcextra: @@ -341,10 +340,10 @@ d.install-dvi: doc/gdc.dvi $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(dvidir)/gcc/$$f"; \ done -d.install-html: $(build_htmldir)/d +d.install-html: $(build_htmldir)/gdc @$(NORMAL_INSTALL) test -z "$(htmldir)" || $(mkinstalldirs) "$(DESTDIR)$(htmldir)" - @for p in $(build_htmldir)/d; do \ + @for p in $(build_htmldir)/gdc; do \ if test -f "$$p" || test -d "$$p"; then d=""; else d="$(srcdir)/"; fi; \ f=$(html__strip_dir) \ if test -d "$$d$$p"; then \