From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 301D83858C1F for ; Mon, 10 Apr 2023 22:23:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 301D83858C1F Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=aarsen.me Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=aarsen.me Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (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 4PwNln0Zgwz9sd1; Tue, 11 Apr 2023 00:23:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aarsen.me; s=MBO0001; t=1681165397; 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=BaI9RNUOZR86/3K8JLTxqJIAiD9Z7CjEc/qV7y6pAnk=; b=xFMTyvL/l24GJCuGnexeAkJsCFNfn76Z+ONISGKSBBW4T7qxmOw033cImyjF9aBhLvGN/T xPX+9ba0bG6LQG/D8dbnaVyLqn4vBwibh8j3MtjPmdNau1cV2ir1GbYpYxvHmaxf3k662l fcxwW5Zgtf0+CbH38cKsU67K+kufq9PZzPX0yx4eGfqSfrB/DhL9KSNPjP0LYRy+8bTeHp RFaUoDsD2/YHMoUf3HGoDTKcavFnfFHXBRdz8/q9YLDm+lPgi1FnSCcHuWGzTTnhX+cKEZ xke5ub3X5KIwZnv4ks91jy7uKOamaoo4BwgeEydtZGlSUCSOlJ1vSyyFV+4VrQ== References: <20230406103533.1087349-1-arsen@aarsen.me> From: Arsen =?utf-8?Q?Arsenovi=C4=87?= To: Gerald Pfeifer Cc: gcc-patches@gcc.gnu.org Subject: Re: [PATCH] update_web_docs_git: Add updated Texinfo to PATH Date: Tue, 11 Apr 2023 00:15:58 +0200 In-reply-to: Message-ID: <86a5zf2x7x.fsf@aarsen.me> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Rspamd-Queue-Id: 4PwNln0Zgwz9sd1 X-Spam-Status: No, score=-10.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_INFOUSMEBIZ,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 List-Id: --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Gerald Pfeifer writes: > On Thu, 6 Apr 2023, Arsen Arsenovi=C4=87 wrote: >> maintainer-scripts/ChangeLog: >>=20 >> * update_web_docs_git: Add updated Texinfo to PATH > > Do we really need to adjust PATH, or could we just introduce a MAKEINFO=20 > variable, something like > > if [ x${MAKEINFO}x =3D xx ]; then > if [ -x /home/gccadmin/texinfo/install-git/bin/makeinfo ]; then > MAKEINFO=3D/home/gccadmin/texinfo/install-git/bin/makeinfo; > else > MAKEINFO=3Dmakeinfo > fi > fi > > ? > > (This also still allows overriding upon invocation.) > > Gerald Ah! Good idea. What do you think of the following? --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0001-update_web_docs_git-Allow-setting-TEXI2-add-git-buil.patch Content-Transfer-Encoding: quoted-printable Content-Description: [PATCH] update_web_docs_git: Allow setting TEXI2*, add git build From=20ba00aa3882b7e0a5fa247f9fa824474e3ddc8102 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?Arsen=3D20Arsenovi=3DC4=3D87?=3D Date: Thu, 6 Apr 2023 12:20:57 +0200 Subject: [PATCH] update_web_docs_git: Allow setting TEXI2*, add git build default maintainer-scripts/ChangeLog: * update_web_docs_git: Add a mechanism to override makeinfo, texi2dvi and texi2pdf, and default them to /home/gccadmin/texinfo/install-git/bin/${tool}, if present. =2D-- maintainer-scripts/update_web_docs_git | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/maintainer-scripts/update_web_docs_git b/maintainer-scripts/up= date_web_docs_git index d44ab27c1b7..c651e567424 100755 =2D-- a/maintainer-scripts/update_web_docs_git +++ b/maintainer-scripts/update_web_docs_git @@ -14,6 +14,17 @@ export GITROOT =20 PATH=3D/usr/local/bin:$PATH =20 +makeinfo_git=3D/home/gccadmin/texinfo/install-git/bin/ +if [ -x "${makeinfo_git}"/makeinfo ]; then + : "${MAKEINFO:=3D${makeinfo_git}/makeinfo}" + : "${TEXI2DVI:=3D${makeinfo_git}/texi2dvi}" + : "${TEXI2PDF:=3D${makeinfo_git}/texi2pdf}" +else + : "${MAKEINFO:=3Dmakeinfo}" + : "${TEXI2DVI:=3Dtexi2dvi}" + : "${TEXI2PDF:=3Dtexi2pdf}" +fi + MANUALS=3D"cpp cppinternals fastjar @@ -174,10 +185,10 @@ for file in $MANUALS; do elif [ "$file" =3D "gnat_ugn" ]; then includes=3D"$includes -I gcc/gcc/ada -I gcc/gcc/ada/doc/gnat_ugn" fi =2D makeinfo --html -c CONTENTS_OUTPUT_LOCATION=3Dinline --css-ref $CSS = $includes -o ${file} ${filename} + "${MAKEINFO}" --html -c CONTENTS_OUTPUT_LOCATION=3Dinline --css-ref $C= SS $includes -o ${file} ${filename} tar cf ${file}-html.tar ${file}/*.html =2D texi2dvi $includes -o ${file}.dvi ${filename} /dev/null = && dvips -o ${file}.ps ${file}.dvi =2D texi2pdf $includes -o ${file}.pdf ${filename} /dev/nu= ll && dvips -o ${file}.ps ${file}.dvi + "${TEXI2PDF}" $includes -o ${file}.pdf ${filename}