From patchwork Fri May 14 11:56:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12257555 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A5F81C43460 for ; Fri, 14 May 2021 11:56:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8131B6145B for ; Fri, 14 May 2021 11:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232386AbhENL5s (ORCPT ); Fri, 14 May 2021 07:57:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46350 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232134AbhENL5q (ORCPT ); Fri, 14 May 2021 07:57:46 -0400 Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68645C061574 for ; Fri, 14 May 2021 04:56:35 -0700 (PDT) Received: by mail-oi1-x233.google.com with SMTP id d21so28191888oic.11 for ; Fri, 14 May 2021 04:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vM2nExltCWHwJPmH7xMl/ZfvBQfSvcO2uafEBnoTvk4=; b=NvJ2+9WFCFSt9oPtdq6bX52qZpB6Hbiw9aQ5gdeSC58UJW1adMwEn+iK8z85ZcnQXg EIe9MYlc/DPwCl4mB24OxDaMB75+M6NAt0SMzXVY/hunxMlaho03TulCrzlV0OIy+Dbu L9k9Lusm9gXsNH8EsKplbuXBoZ36Hfxy/jb+WOkOhaWEhSzwWN7wyZ1In+tGv4UnCfCN cQ22F6ToUYjIUodRS6Rj4uyn1+kdUqOCTNpEiUjEypbuActUABGKk7Q/zPzQ0rjb7zZP AmtEKjV5q5gcI0WGQXnpk83kGM7Nspg9PIx46Wa/1tDhof8SrJwXKLaUL/aWenAam/ab 8r3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vM2nExltCWHwJPmH7xMl/ZfvBQfSvcO2uafEBnoTvk4=; b=fsrTRA9QgjMEh64JVadjXYexmtdhlqro8kch9dzm0Y6Ui0Gn5zMv9HKBYIfhMexw/R cM3aLSRkWsfmN8shzUxSVaR6JTzhUus/z6tZObsuvfzmvEMeekd5fRpN8+FLnncAutI2 PFiCvaqqkormuJ1e/+KDnLeSF6LU0P1yxPBvkyUaxVlLInXrazoldrqBXGowZhAnfQ7A 6OWanjXcqnDQbWB+m8YlKFwxo70Deqojv80CasATg/l2fsbpNqcSb8ZQEUC/5q36ymQz LqWsk3GqgMSQuZ8whtZje9wtLngJeYW4oQe27BOk95m0maVrXP4QC8umMvk22KeXugvy kB9w== X-Gm-Message-State: AOAM533fQQ5um2xTOaWcyShFFVk8aLzICInP59uCbqHTp36CgiOLb9LK wdCs8fxz7yFggBnUb40pIM4O7CHoOk4NFQ== X-Google-Smtp-Source: ABdhPJw+eHxInavleCl3TaYABT+E3vDt+oS2KGNZb4L5zZAYkOCPhBs7LidTgiujQgWSNUUX8vGh6A== X-Received: by 2002:a05:6808:90d:: with SMTP id w13mr19109304oih.71.1620993394642; Fri, 14 May 2021 04:56:34 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id i18sm1251122oot.48.2021.05.14.04.56.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 04:56:34 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v2 1/5] doc: refactor common asciidoc dependencies Date: Fri, 14 May 2021 06:56:27 -0500 Message-Id: <20210514115631.503276-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210514115631.503276-1-felipe.contreras@gmail.com> References: <20210514115631.503276-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Signed-off-by: Felipe Contreras --- Documentation/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 2aae4c9cbb..46d9b98dac 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -139,6 +139,7 @@ ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' +ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -354,12 +355,12 @@ clean: $(RM) manpage-base-url.xsl $(RM) GIT-ASCIIDOCFLAGS -$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -d manpage -o $@+ $< && \ mv $@+ $@ -$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_HTML) -o $@+ $< && \ mv $@+ $@ @@ -371,7 +372,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_XMLTO)$(RM) $@ && \ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< -%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +%.xml : %.txt $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ $(TXT_TO_XML) -d manpage -o $@+ $< && \ mv $@+ $@ From patchwork Fri May 14 11:56:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12257557 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66678C433B4 for ; Fri, 14 May 2021 11:56:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4653861406 for ; Fri, 14 May 2021 11:56:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232564AbhENL5u (ORCPT ); Fri, 14 May 2021 07:57:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46358 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232409AbhENL5t (ORCPT ); Fri, 14 May 2021 07:57:49 -0400 Received: from mail-ot1-x32d.google.com (mail-ot1-x32d.google.com [IPv6:2607:f8b0:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52235C061574 for ; Fri, 14 May 2021 04:56:37 -0700 (PDT) Received: by mail-ot1-x32d.google.com with SMTP id v19-20020a0568301413b0290304f00e3d88so5084253otp.4 for ; Fri, 14 May 2021 04:56:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5RFBlhMgpyZpA/ZONYGLWsJTLeqpmosbKmwfuSpvfoc=; b=j2jYYmLcXbTSVtXcnVWvdee7OF8QnZoe64larvxlzh6/BOQd8DEchhgv5zFEXIU29r uSu6oBZIAUEHpS5+lveMEoDVks8jT4GYUSXiEQM4l6QBCX4ByNzrlV/uOIuZl4Qoqt4a /Icw+7TWAbThAn81sQ3VP16LSnn3NINwmUQ8VyipCKyN/7iExOFP4Zk7EFcda5/vFOco JGo4qOHJ+nBYhpvf4NLoXAY5++yzT3CpspQyVUlXlkL8dCfWfA4zTKGUUTo8jTl0zc/q aS4lzYEm7vMI6s41x1xRFIWQvctw9bb+Cug7xBe5ylrWBZyY/ruApxNVZtLmA1gCWj8U SxUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5RFBlhMgpyZpA/ZONYGLWsJTLeqpmosbKmwfuSpvfoc=; b=W0LU89MIgBSmMbL5oADBBQD1mo1ToALw3VaJpsacqIQzebVY8qGV9Bta1sTvnpezr6 oqQ5Lzi6fFC9XYGTeYA8f6onbWKPpEJbPSY8VaAUSZjV9cZNIk1oKd3S/GWK/rM9Ni2S erUa1xZzzzq1oD2mpXy4Blt7fgq2fRpwQL/Z8nHoOnqaptQCuz0Dhs/3G3SdXqcJtSbB DkgbiCn1l94xGt9p45OM7qszIhHetTiZASlwuY/1gSeexkXrfoPAUlqnlWGGVvFI5zKo iAYoESDg+2as9HA9gTZZlKNqfoPmJ7ZH87efjkaBu6MFSIBFePK5POa72d8F6K5QxypD c/Ig== X-Gm-Message-State: AOAM530uKdsZ5J4e5L/T7nF51F6VyNMT093PwTU1NNpA4sF+Ad1A/VD5 SfuMHTS+as+rcHuwhc05hoHlUoQ+UGgY6A== X-Google-Smtp-Source: ABdhPJzfC6CDjFuXuIYumDnCT/bLLfmQDPx7P7S4NdZvfcvvTggZ1IORqaVzi5c5s1uLJ5GMLInTZQ== X-Received: by 2002:a05:6830:4014:: with SMTP id h20mr39633756ots.62.1620993396568; Fri, 14 May 2021 04:56:36 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id j26sm749863otk.11.2021.05.14.04.56.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 04:56:36 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v2 2/5] doc: improve asciidoc dependencies Date: Fri, 14 May 2021 06:56:28 -0500 Message-Id: <20210514115631.503276-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210514115631.503276-1-felipe.contreras@gmail.com> References: <20210514115631.503276-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org asciidoc needs asciidoc.conf, asciidoctor asciidoctor-extensions.rb. Neither needs the other. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 46d9b98dac..0f59cc0853 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -139,7 +139,7 @@ ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' -ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -194,6 +194,7 @@ ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += -x manpage.xsl From patchwork Fri May 14 11:56:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12257559 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6AFADC433B4 for ; Fri, 14 May 2021 11:56:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 445D761406 for ; Fri, 14 May 2021 11:56:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232658AbhENL5v (ORCPT ); Fri, 14 May 2021 07:57:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232428AbhENL5u (ORCPT ); Fri, 14 May 2021 07:57:50 -0400 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1544DC06174A for ; Fri, 14 May 2021 04:56:39 -0700 (PDT) Received: by mail-ot1-x333.google.com with SMTP id q7-20020a9d57870000b02902a5c2bd8c17so26244803oth.5 for ; Fri, 14 May 2021 04:56:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eELljfT6wicp9sMuiJj+IVC8he2MZfvlcRihzftFcsE=; b=fsEv/2qTiwodQCZlC+waPW/2ZRkiAhKukZK7hsi1MTz4ryeUbuh6J8Zy5i4Q1+sBF9 cYocDQ67t2+DZprOBNm5gwHyIq5+JywtIdLUle9Xv2dKqwASCuN2xddLFDR/Yaniz3kY hIEiiO/ZRS5HXa0jdOl1SGBhLxvOGqouDSFfWcPSEzX0m2cj1i+IctQNcRWeRlgZyB8z Oanq+a6uxvK8Ann7lj2XpnqlyYo9m+VF6AX62p7wZ1BGT8OgI08hXCjHP9MbhLQQ5ypX BhyMUcLtPna25ooMfqmo3ami2P96skLQLyaMa/xbAUhp0oEz/1MrkTAQ6SntBN5coP/8 AHxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eELljfT6wicp9sMuiJj+IVC8he2MZfvlcRihzftFcsE=; b=QrBQQqRIbsuVV4bW6j/fpoWd5svWMZNre1g/vNzywpZpm/jtbVyWfMH5O5RRMKVDDT SDPTDusUq4iR0OF2GgmXfAJAVgWo5CXdSSwVBSW1DZFGd5P4srJm4b3LLJw5yjKlv/80 GnONcONkCv4ZK9RA/sxDREZh8AClBctqO9l+ANVfTOjyxiK2uqXRzTNdjxQ5wLsqUdA3 7O7+wMVxl9cc+RJfgzyxF/g/e5A1J6Xs5HpHzQ83vwtZuCWBTyujWJMNddcCbxZ4odk3 ndE9yGF6/ksEYfI8PkBBXQ8Ll5hEBy955+ekhRuJu7klAwtxO9QHb1ctf8IZOJGh862s eKtA== X-Gm-Message-State: AOAM531V68XV0krAw1IzX5Qulx/R4catnrg5nO6fvqxe0c94/6vEM58F MRe7kmaVY47+UZny8oIh3KeOK3JMV5iZeQ== X-Google-Smtp-Source: ABdhPJxqhr5OWbz7h84wVO8FW3HkbPNrVrqACjDgBQiz2zGi8/iDaniN9EOJm7nQT/g9Algn5GlLFg== X-Received: by 2002:a9d:7d8d:: with SMTP id j13mr18830353otn.208.1620993398315; Fri, 14 May 2021 04:56:38 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id s6sm1262669otk.71.2021.05.14.04.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 04:56:37 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v2 3/5] doc: remove unnecessary rm instances Date: Fri, 14 May 2021 06:56:29 -0500 Message-Id: <20210514115631.503276-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210514115631.503276-1-felipe.contreras@gmail.com> References: <20210514115631.503276-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Commits 50cff52f1a (When generating manpages, delete outdated targets first., 2007-08-02) and f9286765b2 (Documentation/Makefile: remove cmd-list.made before redirecting to it., 2007-08-06) created these rm instances for a very rare corner-case: building as root by mistake. It's odd to have workarounds here, but nowhere else in the Makefile-- which already fails in this stuation, starting from Documentation/technical/. We gain nothing but complexity, so let's remove them. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 0f59cc0853..aae8803e4c 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -318,8 +318,7 @@ cmds_txt = cmds-ancillaryinterrogators.txt \ $(cmds_txt): cmd-list.made cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) - $(QUIET_GEN)$(RM) $@ && \ - $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \ + $(QUIET_GEN)$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \ date >$@ mergetools_txt = mergetools-diff.txt mergetools-merge.txt @@ -327,7 +326,7 @@ mergetools_txt = mergetools-diff.txt mergetools-merge.txt $(mergetools_txt): mergetools-list.made mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*) - $(QUIET_GEN)$(RM) $@ && \ + $(QUIET_GEN) \ $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ . ../git-mergetool--lib.sh && \ show_tool_names can_diff "* " || :' >mergetools-diff.txt && \ @@ -370,8 +369,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ %.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl) - $(QUIET_XMLTO)$(RM) $@ && \ - $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< + $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.xml : %.txt $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ From patchwork Fri May 14 11:56:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12257561 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 86D35C433ED for ; Fri, 14 May 2021 11:56:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6B2E161406 for ; Fri, 14 May 2021 11:56:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232715AbhENL56 (ORCPT ); Fri, 14 May 2021 07:57:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232471AbhENL5x (ORCPT ); Fri, 14 May 2021 07:57:53 -0400 Received: from mail-oi1-x236.google.com (mail-oi1-x236.google.com [IPv6:2607:f8b0:4864:20::236]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D3041C061574 for ; Fri, 14 May 2021 04:56:40 -0700 (PDT) Received: by mail-oi1-x236.google.com with SMTP id x15so14459167oic.13 for ; Fri, 14 May 2021 04:56:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zOzyT6er0Jctzqpnov4b9afyc2jWpUib2d/MkYbNbeQ=; b=XEIlCSxKZNWOzkh+HDr5Yb9GYusySA6R41ILKWUEO8sTg0NZy1FdBdbA+kGeHH9202 7t6I7241zhAaSgoqJpL2kAH4xOrE6wHFFamEqRkSQwNARN3o0ZpN+KTd1EPVxSb+dl2a XPtR21UohU3tQGj1y2mc8iezeOLfouFTyVnfzQ3h0Z84/3iwB3eqdwblJCTe1yRq12gg LxeipAWU0q8XIyPD0JzaHepXK2aOZu76LYFrAJcf1rPYvm+9Oi4yu+Gf/tRr2c+uls9M QEsN/LDbYsdZeUtWh7mHWJc1/sO8wTtK9KgEqdmsuNrpopSA0Tb4k7JBWRGB/i43yerW 83ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zOzyT6er0Jctzqpnov4b9afyc2jWpUib2d/MkYbNbeQ=; b=amBIShwMmNRFJQn5KOXVgD2igvoOtaragKZFCBUS7+15GR+CnEdV3dNoV2keipJF5+ mHRqYXzj/XkVwfgH5KZ3pnHO/K/WGmZhyeTKo+rVhf6kG+Q1BVCzjBa4Y5VZjeqlvHhg Mof8UZutklhZRtq+Xeqae5ItmDZCICLqi4437wk9qQvOU7B3SsDHhZHpnm9pYvIPhSMB M2UrDC8VAf0lLi/lRmHquvGYCE1mT8VkBwyNFRqdYBbPyiYYh+ZKOEjIpuYEPmH6409e lNbB+IdhBMry1dvkMsWX6EK1xtmeI/2btbKwW3O4xzvqfBzBq7KdqKIsR17lkYNPDCkb dpfg== X-Gm-Message-State: AOAM533+mpFB7IvLSlVV67sGUlav5SnD+GjONI6JdQEYONGlcP/rvod9 AT83xfprv4ZqQqe29qNwRzi5ObW8C5i/UA== X-Google-Smtp-Source: ABdhPJwHQ4zHpkmFbmT6zILqGQq6+tPQwAkKHUHYrWMqAma4W5cGQObNXgQUBsYJ39lMlTbIxMsucg== X-Received: by 2002:a05:6808:3a3:: with SMTP id n3mr30406770oie.157.1620993399827; Fri, 14 May 2021 04:56:39 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id y14sm981759otq.4.2021.05.14.04.56.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 04:56:39 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v2 4/5] doc: simplify Makefile using .DELETE_ON_ERROR Date: Fri, 14 May 2021 06:56:30 -0500 Message-Id: <20210514115631.503276-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210514115631.503276-1-felipe.contreras@gmail.com> References: <20210514115631.503276-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Currently GNU make already removes files when catching an interruption signal, however, in order to deal with other kinds of errors a workaround is in place to store target output to a temporary file, and only move it to its right place on success. By enabling the built-in .DELETE_ON_ERROR we let make do this task, so we don't have to. This way the rules can be simplified a lot. Suggested-by: Ævar Arnfjörð Bjarmason Signed-off-by: Felipe Contreras --- Documentation/Makefile | 61 +++++++++++++++--------------------------- 1 file changed, 21 insertions(+), 40 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index aae8803e4c..eaff97dcb8 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -296,9 +296,7 @@ docdep_prereqs = \ cmd-list.made $(cmds_txt) doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl - $(QUIET_GEN)$(RM) $@+ $@ && \ - $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ - mv $@+ $@ + $(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@ $(QUIET_STDERR) ifneq ($(MAKECMDGOALS),clean) -include doc.dep @@ -356,14 +354,10 @@ clean: $(RM) GIT-ASCIIDOCFLAGS $(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_HTML) -d manpage -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $< $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_HTML) -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ @@ -372,14 +366,10 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.xml : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_XML) -d manpage -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $< user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_XML) -d book -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $< technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) @@ -400,46 +390,35 @@ XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css XSLTOPTS += --param generate.consistent.ids 1 user-manual.html: user-manual.xml $(XSLT) - $(QUIET_XSLTPROC)$(RM) $@+ $@ && \ - xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \ - mv $@+ $@ + $(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $< git.info: user-manual.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi user-manual.texi: user-manual.xml - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ - $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \ - $(PERL_PATH) fix-texi.perl <$@++ >$@+ && \ - rm $@++ && \ - mv $@+ $@ + $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@+ && \ + $(PERL_PATH) fix-texi.perl <$@+ >$@ && \ + rm $@+ user-manual.pdf: user-manual.xml - $(QUIET_DBLATEX)$(RM) $@+ $@ && \ - $(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \ - mv $@+ $@ + $(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $< gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ + $(QUIET_DB2TEXI) \ ($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \ $(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \ - rm $(xml)+ &&) true) > $@++ && \ - $(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \ - rm $@++ && \ - mv $@+ $@ + rm $(xml)+ &&) true) > $@+ && \ + $(PERL_PATH) cat-texi.perl $@ <$@+ >$@ && \ + rm $@+ gitman.info: gitman.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml - $(QUIET_DB2TEXI)$(RM) $@+ $@ && \ - $(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \ - mv $@+ $@ + $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@ howto-index.txt: howto-index.sh $(HOWTO_TXT) - $(QUIET_GEN)$(RM) $@+ $@ && \ - '$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@+ && \ - mv $@+ $@ + $(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt @@ -448,10 +427,9 @@ WEBDOC_DEST = /pub/software/scm/git/docs howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ + $(QUIET_ASCIIDOC) \ sed -e '1,/^$$/d' $< | \ - $(TXT_TO_HTML) - >$@+ && \ - mv $@+ $@ + $(TXT_TO_HTML) - >$@ install-webdoc : html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) @@ -492,4 +470,7 @@ doc-l10n install-l10n:: $(MAKE) -C po $@ endif +# Delete the target file on error +.DELETE_ON_ERROR: + .PHONY: FORCE From patchwork Fri May 14 11:56:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12257563 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9A44FC433B4 for ; Fri, 14 May 2021 11:56:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 76EBE6145B for ; Fri, 14 May 2021 11:56:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232753AbhENL57 (ORCPT ); Fri, 14 May 2021 07:57:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46390 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232428AbhENL5x (ORCPT ); Fri, 14 May 2021 07:57:53 -0400 Received: from mail-ot1-x333.google.com (mail-ot1-x333.google.com [IPv6:2607:f8b0:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F85CC06174A for ; Fri, 14 May 2021 04:56:42 -0700 (PDT) Received: by mail-ot1-x333.google.com with SMTP id 36-20020a9d0ba70000b02902e0a0a8fe36so19913355oth.8 for ; Fri, 14 May 2021 04:56:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=drGtLuFRBaz3x+0qNIPi2JxkgIsAzz1gR4HjqlfeXgU=; b=l95mZD0IAf/GgjDCt2eJN4tipiKEGmJXYtU58xFLslymdmtUE4bsuAudMD2E52xP8s DOr+qiI6gHHWb17Vt8Sd2j+TbEXvCV/tVdstaX8G18CUNAxyl7w48S4w5n50BCjZpeQw /r14UgPtXOLS8rLXpXZB+CqDqc6enYaKsYCa3+6CpX19kppJCa5jmT8gHabDzswf+km5 ZqdoyXiTGLHNfpfyFZT/++DUGFdZn2u033M4WjB1RG5AQ7qOgPvhOjcRbFtK/mgAOBPs 9/5wcB3KpsmWStNiAud3yH7YMrsutrC0T8oejQ0BqEo5//8cr+DnpujACSAZ0qG5fEMN Bk9A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=drGtLuFRBaz3x+0qNIPi2JxkgIsAzz1gR4HjqlfeXgU=; b=EbVcHtP3F1M/yfP0PLNKbxNrqfcdoTofPJkvgjbp8WsK2z6bavvpTJvJUqnFldaQtZ uhnBQWL42eQKMYcz/vx5QZjw+15FSnEUqZM3GACO7iH/s0T7CDnMri8rlVsWpoSRUmsZ LHKuELOkIqDChZCxXRrHdpEm2hDrgmhltrF32IT/5+ggfX3utZ4Ni+pHldczrGgy70ht i3dnBCNnqQjd9XXmrq5dzJLS2CfYEr/yFLZYKNdkAXDefhOg6Odf+rXO6YvSYPID5Q2O XXAcY86ONSBWBHl35FgAM55doGTg3HXtJzheqLiNVaX9NRDsshQuXlZUkyV/tt4cvDXF 8buQ== X-Gm-Message-State: AOAM531tNtGTu3Wtn5+WbE+sHmuanJe+atyWbzABd9qrKU3dqPWxQ8cF fdtxA/bPfz88FwHfAztJRp5opesFMW/byQ== X-Google-Smtp-Source: ABdhPJxTG2Bij9iV2jnwCPF7dRNRdVdZ6X8z4RqANeunceXpOicP2qpiQ82KikSNeXw9Ng3NGgetqA== X-Received: by 2002:a9d:470e:: with SMTP id a14mr5518981otf.236.1620993401458; Fri, 14 May 2021 04:56:41 -0700 (PDT) Received: from localhost (fixed-187-190-78-172.totalplay.net. [187.190.78.172]) by smtp.gmail.com with ESMTPSA id y14sm981768otq.4.2021.05.14.04.56.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 May 2021 04:56:41 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Junio C Hamano , "brian m . carlson" , =?utf-8?q?Martin_=C3=85?= =?utf-8?q?gren?= , Jeff King , =?utf-8?b?w4Z2YXIgQXJuZmrDtnLDsCBCamFybWFzb24=?= , Felipe Contreras Subject: [PATCH v2 5/5] doc: avoid using rm directly Date: Fri, 14 May 2021 06:56:31 -0500 Message-Id: <20210514115631.503276-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210514115631.503276-1-felipe.contreras@gmail.com> References: <20210514115631.503276-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org That's what we have $(RM) for. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index eaff97dcb8..f5605b7767 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -398,7 +398,7 @@ git.info: user-manual.texi user-manual.texi: user-manual.xml $(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@+ && \ $(PERL_PATH) fix-texi.perl <$@+ >$@ && \ - rm $@+ + $(RM) $@+ user-manual.pdf: user-manual.xml $(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $< @@ -407,9 +407,9 @@ gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl $(QUIET_DB2TEXI) \ ($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \ $(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \ - rm $(xml)+ &&) true) > $@+ && \ + $(RM) $(xml)+ &&) true) > $@+ && \ $(PERL_PATH) cat-texi.perl $@ <$@+ >$@ && \ - rm $@+ + $(RM) $@+ gitman.info: gitman.texi $(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi