From patchwork Wed May 12 22:27:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254913 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.7 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 DB0FCC433B4 for ; Wed, 12 May 2021 23:22:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB09B613EB for ; Wed, 12 May 2021 23:22:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231316AbhELXXf (ORCPT ); Wed, 12 May 2021 19:23:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55506 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349215AbhELWas (ORCPT ); Wed, 12 May 2021 18:30:48 -0400 Received: from mail-oi1-x22b.google.com (mail-oi1-x22b.google.com [IPv6:2607:f8b0:4864:20::22b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90BDFC061343 for ; Wed, 12 May 2021 15:28:22 -0700 (PDT) Received: by mail-oi1-x22b.google.com with SMTP id d21so23598272oic.11 for ; Wed, 12 May 2021 15:28:22 -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=CRi2466CP0cJlmOzkeREA0c0wT/A3WjK/P+oCXNI5xY=; b=k8XNLjnXjvIhYuwtUaOv8D/2eR9YfKTvPjPzkVJNE2B68hz3szTlABxPaQpiSSkQy/ ajxsWy39qqUSBfQhsmNGK2FlLR+HxW3GUlgYfbvLNwQYkX3UT696TvDZrW8CvbktAs6i WT7xX8w5UUy7mC4ikw4glzz1cMU1AucWevf/6MUC5vBLQ4R+Fh3qlXPlwLdd3LsZKfpn p4l4Nv9hwgGIujflu7wmGfSbF2FrZv7IVkrfy9xJn/McQOSx1H7PvPLWcBhNUpKg1dCX oUgR2yCi31skrirbtwHkutnoFvX6JNRjYwZtuPJq+fQVfhOD4qaqflg5kadd9vDgxwSz xDUQ== 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=CRi2466CP0cJlmOzkeREA0c0wT/A3WjK/P+oCXNI5xY=; b=fouq2mLX2vgdDZA3cdmJEgHb6v6dlewg+Pmk1OpoUSIHsvReQfFHIC4OVwxwQvB/CD fZccriqzKSNmIlkpdNuiXbIRd+AcnE3FRw4rkh+98WTyEyHkkcXq2je+AKZz9LX9Uj6M ZGDkUAeWcZt3XY9cffMYnmUz/zqa+0/cFw1QsIdPKXdjAzlIN3wxuwyAe53SFlnfWyKO uki/AEwuAvYVmHMq279959ihPQA/VAV/Qlbmj8J2Ms77Le69ZpdghIunJIsfcFRnucHS 5fJDBPinREW+UnVdl4Am/tA5omYxOsYPkwwWJpNEpikqewGGTVbrAVt27vRKYCQ4SS79 k5Lw== X-Gm-Message-State: AOAM530q41r9gbmrn5lnIHZEjob3iX6bYz4diSYZHAoX8mmwLrhhHKsU xQLRmfnp/t+si87jv4qgYPOgye6zF3Y5gw== X-Google-Smtp-Source: ABdhPJx+DEonGkO5Xom/HQwJr5FAwZEgM0h+v6AIDbjwArZOoNR6GoH5IYYLl7CjzlP8KVAbQkFzhA== X-Received: by 2002:aca:44a:: with SMTP id 71mr26590061oie.39.1620858501804; Wed, 12 May 2021 15:28:21 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id w10sm216030ott.75.2021.05.12.15.28.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:21 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 1/8] doc: standardize asciidoc calls Date: Wed, 12 May 2021 17:27:56 -0500 Message-Id: <20210512222803.508446-2-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org By always specifying the output file it will be possible to refactor all the calls in a future helper. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 2aae4c9cbb..3d282a2797 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -388,7 +388,7 @@ technical/api-index.txt: technical/api-index-skel.txt \ technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt \ asciidoc.conf GIT-ASCIIDOCFLAGS - $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< SubmittingPatches.txt: SubmittingPatches $(QUIET_GEN) cp $< $@ @@ -442,7 +442,7 @@ howto-index.txt: howto-index.sh $(HOWTO_TXT) mv $@+ $@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt - $(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< WEBDOC_DEST = /pub/software/scm/git/docs @@ -450,7 +450,7 @@ howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ sed -e '1,/^$$/d' $< | \ - $(TXT_TO_HTML) - >$@+ && \ + $(TXT_TO_HTML) -o $@+ - && \ mv $@+ $@ install-webdoc : html From patchwork Wed May 12 22:27:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254911 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=-20.7 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,MENTIONS_GIT_HOSTING,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 32DFAC433B4 for ; Wed, 12 May 2021 23:22:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 091C2613DA for ; Wed, 12 May 2021 23:22:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231660AbhELXXJ (ORCPT ); Wed, 12 May 2021 19:23:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55964 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349212AbhELWas (ORCPT ); Wed, 12 May 2021 18:30:48 -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 4E040C061344 for ; Wed, 12 May 2021 15:28:24 -0700 (PDT) Received: by mail-oi1-x233.google.com with SMTP id u16so23630671oiu.7 for ; Wed, 12 May 2021 15:28:24 -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=IQUbAJpIfKCqyhmMMkSofwbkE4A7fU4XRzVJLwEwgdA=; b=cOnrEtd9cE989Q5GDsQVadUjNPuRkGuUiPXQn8pTuQjqvUpC3+/nyBk04P0yOE8h/c 8Fv8EgJyxNOVBqEdxHH81FTC/bz6oPRTNinZlv6UdpySRKpS8oLpUfrrIJHP1DTlzU01 ttVPg4BIexaamgdsMJeHeVlhqBxOWqaqFHQb52u71229sjAl+LQ8GKjQdlLAcugqJWYD U8mlVklRxd3M09RDKMCZFwr3clYzi8+t3YEBsMu8u73e4ReaQSefPOMGHMrYlU50gHQ8 utHyEBWE/8ghnUTPwgUu0k5GUbcIaG+ud3fESyIAiIq5zLknWaqiz6cCnmNjp26NNnVy 8/rw== 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=IQUbAJpIfKCqyhmMMkSofwbkE4A7fU4XRzVJLwEwgdA=; b=iM50z/0SieE6shThDmiu1cNFy8cNsB7zzforlGFEZMS0stWORCGp95S20/IA40PlIn F9+ATfAyiHqOyCQBZXtPRmzTa2hviQa4C5rLLiCkjwf8s61PSA/pQ3+z+ufPv8LfrrNw rtMoXWfLMtNlcbp2UK3YG+D4aS4o/ZiXWiirgmaOGMjSaiwWNJLqyl9icc7FMGV0z/mb DdtSmFcHFdE4pnyFzM3/M00d92J0VAL9kMtpKA6YSxg08/AaerYNuiYXEWVp6vCw/jAy l41ax9Hy5qXn89ErB5qkStSCsJu9OGOvnJhDsxahIW61pVU8HlkmmLnunUdXjGCf8AD7 Y3pQ== X-Gm-Message-State: AOAM530l0Ef1SW4lKXHo6YlkE/pdL49x5NzwpsUr/T0YsX7oPHsSYjYr ZMnl9D/nhZJiVuVw9aVsUUPW/X3gfcEjZw== X-Google-Smtp-Source: ABdhPJz9VaLRFwZ4E+BnBA8+c3Kt629jzO96VgwUj/A9EejS0xxgfw4zEhqiDI8qQcxxGant80JZoA== X-Received: by 2002:a05:6808:8c4:: with SMTP id k4mr28120593oij.40.1620858503423; Wed, 12 May 2021 15:28:23 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id f13sm275237ote.46.2021.05.12.15.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:23 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 2/8] doc: add an asciidoc helper Date: Wed, 12 May 2021 17:27:57 -0500 Message-Id: <20210512222803.508446-3-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org The hacks to deal with interrupted builds is scattered throughout the Makefile, but not everywhere (it's not done for techical/ and articles). It originally comes from f9dae0d3e6 (Documentation/Makefile: fix interrupted builds of user-manual.xml, 2010-04-21), however, that description is not correct. asciidoc does actually remove the output file in case of an exception, but there was a bug that handled keyboard interruptions through a different path, and thus in that particular case the file is not removed[1]. We shouldn't overly complicate the Makefile due to bugs in asciidoc. In order to keep the Makefile clean this commit creates an asciidoc wrapper that does the job of tracking the intermediary output. Once asciidoc is fixed this helper can be safely removed and there would be minimal changes elsewhere. It's written for bash, but could easily be modified for something more portable. [1] https://github.com/asciidoc-py/asciidoc-py/pull/195 Signed-off-by: Felipe Contreras --- Documentation/Makefile | 27 +++++++++------------------ Documentation/asciidoc-helper.sh | 18 ++++++++++++++++++ 2 files changed, 27 insertions(+), 18 deletions(-) create mode 100755 Documentation/asciidoc-helper.sh diff --git a/Documentation/Makefile b/Documentation/Makefile index 3d282a2797..5c2a3df24a 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -139,8 +139,9 @@ ASCIIDOC_CONF = -f asciidoc.conf ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' -TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML) -TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK) +ASCIIDOC_BASE = '$(SHELL_PATH_SQ)' ./asciidoc-helper.sh $(ASCIIDOC_COMMON) +TXT_TO_HTML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_HTML) +TXT_TO_XML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl XMLTO = xmlto XMLTO_EXTRA = @@ -355,14 +356,10 @@ clean: $(RM) GIT-ASCIIDOCFLAGS $(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS - $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ - $(TXT_TO_HTML) -d manpage -o $@+ $< && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $< $(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS - $(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 +369,10 @@ manpage-base-url.xsl: manpage-base-url.xsl.in $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< %.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS - $(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)) @@ -448,10 +441,8 @@ 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) $@+ $@ && \ - sed -e '1,/^$$/d' $< | \ - $(TXT_TO_HTML) -o $@+ - && \ - mv $@+ $@ + $(QUIET_ASCIIDOC)sed -e '1,/^$$/d' $< | \ + $(TXT_TO_HTML) -o $@ - install-webdoc : html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) diff --git a/Documentation/asciidoc-helper.sh b/Documentation/asciidoc-helper.sh new file mode 100755 index 0000000000..ae16cf9288 --- /dev/null +++ b/Documentation/asciidoc-helper.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +# This helper is a workaround for an interruption bug in asciidoc: +# https://github.com/asciidoc-py/asciidoc-py/pull/195 + +args=() + +while [ $# -gt 1 ]; do + case $1 in + -o) shift; out="$1" ;; + *) args+=("$1") + esac + shift +done + +rm -f "$out+" "$out" && +"${args[@]}" -o "$out+" "$1" && +mv "$out+" "$out" From patchwork Wed May 12 22:27:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254909 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.7 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 CB4EAC433B4 for ; Wed, 12 May 2021 23:22:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC18C613CD for ; Wed, 12 May 2021 23:22:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230519AbhELXWk (ORCPT ); Wed, 12 May 2021 19:22:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349214AbhELWas (ORCPT ); Wed, 12 May 2021 18:30:48 -0400 Received: from mail-oi1-x22f.google.com (mail-oi1-x22f.google.com [IPv6:2607:f8b0:4864:20::22f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BEF63C061355 for ; Wed, 12 May 2021 15:28:25 -0700 (PDT) Received: by mail-oi1-x22f.google.com with SMTP id f184so3417365oig.3 for ; Wed, 12 May 2021 15:28:25 -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=BHMEP9kDb3ZmLN9AvcA+uxl5MPYwU7VXbQkvAkXisHc=; b=J6Op2i5/RFTCdfevdvQp9sn0hPFTg+nbyUrfpvu14dgfahOVUIwEXOSgRgIlbyeqVa ZIMmC/BUmb7nAH7DLqr+/k02Sn/LlzgNd/+g+eoVboKl2d9nDBeFHiE4Dhks5Hh5tNJk lndGO4AimN8pAUSFRRAZTglyh9MLK0ogxBNYh3fFmLKAt2ndA10AGp3k1X9oim92wcfg UVJN0qRXThaaWH0OeeSZCzVlKDACGMmZxn7zPLChF5is4MSXLLDwO2d+O9PaF3x/v1Ak EyQ0bNZeIOfP20xeSrgWgeA1pWDqZeJUMpZ00S9GUqzbFv3fL885U1l4p7OMa7jgmIWF OWFw== 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=BHMEP9kDb3ZmLN9AvcA+uxl5MPYwU7VXbQkvAkXisHc=; b=ZScbhb34S7rX4QhgFXjhEqxeP/cyjrTg3H5KVkltsa6Idi3FSFI6LFmaPalqoEvnQw HAyUCUEFZPNquHW1xN9mFoPtK3t20tIfLQOY8/pYNy7aExc/9GkVGReKmrYs5aOMrK0p yYKV0Cq586Oc6chqjl9YCyqEUXWC5mv/fR1wSh5ScoWXGIw0SW6QmfxAnbgubN7BFDlb MlpRvV9Hb8BqZYch+jpGvIq7x+ejZaBEqcwteMBqkUidow7xn3F+ntj8L1Xs2OSiCgAF JLpgCeSEUoOwI1k8RVZVUG2nUfdEsjNT+/eQtmnFGADYvCBm2v4nd1zy6uYXzAHNEfFu 2LUw== X-Gm-Message-State: AOAM533F9a14W2FDMSVtos3M2LE8SGEekFL1LD6pYCNWb9XVrdkEJpVL AxdbZ/BkfsMEBrjI8iyR30efTvGQeX5j/Q== X-Google-Smtp-Source: ABdhPJyjcYNwX6QfqqbqWBLiofqW9Koe3f8SU4/nuqJHJGnef2cLp99K0LcHkh3FkQaLJeEg1biRSw== X-Received: by 2002:aca:dc07:: with SMTP id t7mr595794oig.164.1620858505047; Wed, 12 May 2021 15:28:25 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id o6sm285603ote.14.2021.05.12.15.28.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:24 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 3/8] doc: disable asciidoc-helper for asciidoctor Date: Wed, 12 May 2021 17:27:58 -0500 Message-Id: <20210512222803.508446-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org asciidoctor handles interruptions correctly, no need for the helper. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/Makefile b/Documentation/Makefile index 5c2a3df24a..956cfabadd 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -194,6 +194,7 @@ ASCIIDOC_DOCBOOK = docbook5 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' +ASCIIDOC_BASE = $(ASCIIDOC_COMMON) DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += -x manpage.xsl From patchwork Wed May 12 22:27:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254951 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.7 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 1F512C433B4 for ; Wed, 12 May 2021 23:27:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E5DD5613FB for ; Wed, 12 May 2021 23:27:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235693AbhELXYF (ORCPT ); Wed, 12 May 2021 19:24:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349219AbhELWa4 (ORCPT ); Wed, 12 May 2021 18:30:56 -0400 Received: from mail-oi1-x22a.google.com (mail-oi1-x22a.google.com [IPv6:2607:f8b0:4864:20::22a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A38DBC061357 for ; Wed, 12 May 2021 15:28:27 -0700 (PDT) Received: by mail-oi1-x22a.google.com with SMTP id u16so23630787oiu.7 for ; Wed, 12 May 2021 15:28:27 -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=w5yCjefqlW2W/Uce4VfyAcpbxBUdAvp/O6mcRa7cNvQ=; b=dsIRmSsLm00jW3rQfeOWSv916GN5nO3eQ6T8otku21Q5vYskSt7zwb4Ak1uztFHMNV Xu+5/5pP+3xzZ8IAuP5+mmam7VRj0qRbQkmpYf6sJj1up51ZFd3Imcepl1Q2Xdu3mSmD JHDz3G7uFnJ5f4Wde4iHEEW+fYsD43ovc0bCCagCjp+ULTOHVklmaRIJrlzdrqIMtn3T wnx7kZQGB2ZsYYoECGeHOzVTCQ0Hy1X72dsTEBSW/EXvSOt8YgcIe1gQVZqiVB69AbWq BsaFg6tIy3Llt29kOe2QKd/EQYOQxEJqGgFzF7xFYoBd2ktk7VV5aFUsXrpvKJ76/LL6 7Aug== 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=w5yCjefqlW2W/Uce4VfyAcpbxBUdAvp/O6mcRa7cNvQ=; b=rUQSzH8IECGT0JLt5i9dj9fcj5KjEB0s9+3uxhnyHi8TmvSnvELjk8+2HkBX+gl0dL 2sbgNe+Gxg2KHlcp5B2dme/rb36Mk7ZVjaMaZ/lLnpHaLRCBBTZdYwIh9KUlcaUiI4D9 LkCCh9JvYpKxsrCqczRuP+NeQ04GFQlk93pFcWJpEHeZgnD1lEPAwcgx18mVKt1o61HH P2YPwUpKzPfoss2NvCDSO7W85C1EIDhBzmUGpZ5glMhi1HgGMre89UBUOJJIx3Z9jGqR q+9BGnp5huINKZcZ+Gq/4xF7FmXTGlBainrI1Fghr1RbOD5H9OefQeSvHbgfhZmrcoAN Jq1A== X-Gm-Message-State: AOAM533SeDSCGejOLopnvoxHoMUR/lFkHwA179TL6bmES57KUyKbSYh3 Ed5cvPhIiQ1GDIerpqZ5mpp0QFsA+7WsZg== X-Google-Smtp-Source: ABdhPJzipU2aYy8zLl1JHLwWxix29Qwr4k2MUI3XXWyDjS+c22T4ftRzNo0aDZ3HcKvm3DTCDFQgCw== X-Received: by 2002:aca:3986:: with SMTP id g128mr23211393oia.126.1620858506459; Wed, 12 May 2021 15:28:26 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id i2sm242886oto.66.2021.05.12.15.28.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:26 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 4/8] doc: simplify the handling of interruptions Date: Wed, 12 May 2021 17:27:59 -0500 Message-Id: <20210512222803.508446-5-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org There's no need to have an intermediary file. Signed-off-by: Felipe Contreras --- Documentation/asciidoc-helper.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/asciidoc-helper.sh b/Documentation/asciidoc-helper.sh index ae16cf9288..8dbe4fc372 100755 --- a/Documentation/asciidoc-helper.sh +++ b/Documentation/asciidoc-helper.sh @@ -13,6 +13,5 @@ while [ $# -gt 1 ]; do shift done -rm -f "$out+" "$out" && -"${args[@]}" -o "$out+" "$1" && -mv "$out+" "$out" +"${args[@]}" -o "$out" "$1" || +{ rm -f "$out"; false; } From patchwork Wed May 12 22:28:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254953 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.7 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 77074C433B4 for ; Wed, 12 May 2021 23:27:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4DBDE61417 for ; Wed, 12 May 2021 23:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235896AbhELXYM (ORCPT ); Wed, 12 May 2021 19:24:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349221AbhELWa4 (ORCPT ); Wed, 12 May 2021 18:30:56 -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 BCA3FC061358 for ; Wed, 12 May 2021 15:28:28 -0700 (PDT) Received: by mail-ot1-x333.google.com with SMTP id u19-20020a0568302493b02902d61b0d29adso21321925ots.10 for ; Wed, 12 May 2021 15:28:28 -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=GV/uhR53OLHdyJng5q/OHhEJqkdcUpl+wvhx9tE92D0=; b=QJQPvINkSgAD0zupl5Zr1zfICvPDf0Vate9W0jkLr9cGd2MXje9sTHbGquXsYuuycn BUym/ec2tPpXL2BUcOfqyoR3yNRDOWxuaBTLqA6XFavDrHU/y2UPrmErPorcQnPMF4xj A+LWFOuv749BJkCtKccfCFTrNiSnlt6IjjwslGjuF1LkV4POc33apu1ZZvlDeSmk1zqr oh9hw6QNji9SWFKocUyAQrPSncAErzZdDqKGsqtN9+7N2+XYv31hBzx58zm+zPceUR0J b83RXi09fFwwTv2+ygRYsDP4L6crFmMKCYCoHA2yKSiZDRw9OvObJFAjKFpF2XOq/9NC f/hg== 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=GV/uhR53OLHdyJng5q/OHhEJqkdcUpl+wvhx9tE92D0=; b=WMYSR/lv+gJl23Qt3qDAiUp9Q9MPbjIcJuBASuLQctvuYawKJ4UGwrk1nOJuGVZ+40 qkHAFr7uDDtAnSuzgKzHmzbLFAs74Vu0BB8Sqi8WfIfKdtAAZr7EHEr/MZHqmqeM9Sqz qSd3nh/dr8Z1ALqilGYoQhGR+ggyE5cVbenhJ7x2i94XUIsFyyZ5lAvttjAdPtUfQw3w 3AB3t46ONsJUm8CNcAhhxCHDfAF3g8as4zhZw8bR8YU8Ft4RTL3qB446yVfCh5EbbHks rGtddwDGMvSuSxo6ZTrtZAWxbY87ZPXjURntTQvL5ikkXjDQYFZajOXT3NvgZ5A6eA/e WT9w== X-Gm-Message-State: AOAM531DIDiFVUS4KA5QDpIGa8L5whj6BhPvvoz98FOe/zJqVYgUYLiM xFLELh/64+nYifg4aDJXsmqa4ZjE1bfIsg== X-Google-Smtp-Source: ABdhPJx+If3cIKAtohZ+emtY/xRmZDrOJ/lPEUkR306lOemmzwHpQVv3Q9YEi0SzzESdzHvWuc/GqQ== X-Received: by 2002:a9d:3bcb:: with SMTP id k69mr33710145otc.206.1620858507937; Wed, 12 May 2021 15:28:27 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id v28sm318451ood.27.2021.05.12.15.28.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:27 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 5/8] doc: remove redundant rm Date: Wed, 12 May 2021 17:28:00 -0500 Message-Id: <20210512222803.508446-6-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org It's not clear what it was supposed to achieve. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 956cfabadd..d02bd848e8 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -366,8 +366,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.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $< From patchwork Wed May 12 22:28:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254959 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.7 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 B0B35C433B4 for ; Wed, 12 May 2021 23:27:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 88383613F7 for ; Wed, 12 May 2021 23:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237058AbhELXYz (ORCPT ); Wed, 12 May 2021 19:24:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55558 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349231AbhELWbA (ORCPT ); Wed, 12 May 2021 18:31:00 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E10AC061359 for ; Wed, 12 May 2021 15:28:30 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id r26-20020a056830121ab02902a5ff1c9b81so22101814otp.11 for ; Wed, 12 May 2021 15:28:30 -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=JxnRqq8v5j8Tz2qY3lw6NlZB75V+PHc0wJz/O5JYQ/8=; b=KivIM+Z4FPMlfyATCpOCWisuZLxnLTnRpo7SAOTX83zSXl8+SlcBE6F006h6BHN768 ThoV2/zr42dQXqIi+olWEfiLhdMTqu3JEwbNSevlB/Jzrkl1qWt4if3i5wUzWvKs+fWH 6+ZzRHLguvaKaG55FTMDJH8uvK4/d2dDKeTzAvvmfMj78bQnwg/OGLuV2AIu7qJODwBs x1N2jWUJEMblb0saNi5afSINv1glrdjGgwfqdBYx1idXY4ZaBw8mjHaIDajHjTPdrDt8 GaFU5qUJ0gW9voJ/sYJGFGg+fZWH470Cfq3nw3oZbKZoorji/Zrrp67ZdoBOPAHrTJ71 KtXg== 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=JxnRqq8v5j8Tz2qY3lw6NlZB75V+PHc0wJz/O5JYQ/8=; b=FIMM98PT2UeRy5X/4m2IJyo2hpbQzkQpytn8TJ3JU+qsP2rAGMWr8fvI71f4ZmMFEK DomA2pM1R+JBlRX91q7Og1bnMqo5N/8kJzKYlbft+eGhdJuyMcAI/O3SAXNdM3fYZ4rL OfKD4tfPSEhYXJhlXCooE5J+Uo3U6mPrh0UMIqqUHn4vzKD0+7i/WcErMyHmSy1xIjuT nPwI+Bwn4G8gxynpIU2bBGNNlG/z7eXm+Pd6LK6olMxV3gDBCraHXe8iLojhFX9iEA3E lXgjdnXFUluB8RwVgr+i/x1xgGQqz+fMzQuHg33rmKH4vqvS3rs6Gq35jsdd9E7TqCrD EEPA== X-Gm-Message-State: AOAM531+Vr9J1q8ZkrnXq+s9nfIMvkCQLo4E+7Peqt67invVVLdarCYG 1slSoby3HmA6KAEjwHrNyJUrhIrSmztVbg== X-Google-Smtp-Source: ABdhPJxUym3GwVYD26p1RtM3mRmQ4BiKFjalScgD+6P00sftBzMvcyzJfWAAGQrWS0EnOrcHTk4UTg== X-Received: by 2002:a9d:7a99:: with SMTP id l25mr256053otn.97.1620858509749; Wed, 12 May 2021 15:28:29 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id t39sm299652ooi.42.2021.05.12.15.28.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:29 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 6/8] doc: refactor common dependencies Date: Wed, 12 May 2021 17:28:01 -0500 Message-Id: <20210512222803.508446-7-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-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 d02bd848e8..f846bb91ee 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -140,6 +140,7 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' ASCIIDOC_BASE = '$(SHELL_PATH_SQ)' ./asciidoc-helper.sh $(ASCIIDOC_COMMON) +ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -356,10 +357,10 @@ 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)$(TXT_TO_HTML) -d manpage -o $@ $< -$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $< manpage-base-url.xsl: manpage-base-url.xsl.in @@ -368,7 +369,7 @@ manpage-base-url.xsl: manpage-base-url.xsl.in %.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl) $(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< -%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +%.xml : %.txt $(ASCIIDOC_DEPS) $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $< user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS From patchwork Wed May 12 22:28:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254957 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.7 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 C4972C43462 for ; Wed, 12 May 2021 23:27:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A00F9613FC for ; Wed, 12 May 2021 23:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237268AbhELXZE (ORCPT ); Wed, 12 May 2021 19:25:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349244AbhELWbD (ORCPT ); Wed, 12 May 2021 18:31:03 -0400 Received: from mail-oo1-xc2e.google.com (mail-oo1-xc2e.google.com [IPv6:2607:f8b0:4864:20::c2e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63E61C06135B for ; Wed, 12 May 2021 15:28:31 -0700 (PDT) Received: by mail-oo1-xc2e.google.com with SMTP id j17-20020a4ad6d10000b02901fef5280522so5302560oot.0 for ; Wed, 12 May 2021 15:28:31 -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=ym+MWgF924aCoZ51mW3fCtqE76Q4XN3TZOt/auLypzs=; b=C5nZE24d1kqyhttw1bU91Rz3hKWhxfGxLFdMrOyyIJCHmoq9EyIgplPV49ddYLUOzY ZeVa6xMp7AOhR7ImczB/UXKurL1NgIfoij9cVJM7pFwYBKQJ8Vm+Syn+AEO19+W6LNAi VPglRNT1ifo+FCfMLE0YL+D05hrBakJIpZ7jYdGV5UyRAS70G73O2b39smSikq2DY4j/ UjoSaTW9SvU99sXc80tCKZXrmOenk8B2UKwVJ0JzF/r5oQL86Qe612ktpCkTNrXQjUTG saSNTiHfC2ZTV4ld0kgY8RVc7KOFZ8+bQtN1UB1Qn/qre1hJyPlADujtXt9WutM3PnZL X9rw== 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=ym+MWgF924aCoZ51mW3fCtqE76Q4XN3TZOt/auLypzs=; b=ZrSCHBV6Q0r0U5Ac5WS9C7sTMD5EtXeLJrXjZ6buKWhPYRDHwoKBOSPnEJtH2zHhpW 3/rF3XRgj7mNHzk2AJw/gENWJiiMtbmeDVWe2823DB2zxFcJA/z1kCQ7ZhbNs9mp6G1V TqIpx2mkbKVaOeZJt7xlL6Y+kqeskh5+3DboY3UG6x4N2hzOx9b/FlVxC+PtkVbYj0kj /vNq1hM+6rGgo4v0MNV2Q1AUyCfZpmtoqoetAhISfbxIJWgvJ2tcifnQksOiF4LqFLPU KJ+783CtxqfavIdi9/+QZE2+nmH+ui+FkwXEnd6y5UIEpHTkz+AD/d3SHmVWa82ZdORM A5/w== X-Gm-Message-State: AOAM530HGUMoIiv+XwVT374Kw5tXk70eUp+QRDLcFsnCgayZQwKLGV/o PC0LRyLLkUarrGaPQe26F7w6oqZwUAGP3g== X-Google-Smtp-Source: ABdhPJyBX7moUuAYD9UotojfHbnKbZkGrgzz8Xsz7rZUSspdf9n6E4O/yMLTd23XTyDxdENh8Iqjyg== X-Received: by 2002:a4a:e715:: with SMTP id y21mr29587911oou.54.1620858511162; Wed, 12 May 2021 15:28:31 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id k16sm253666otp.19.2021.05.12.15.28.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:30 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 7/8] doc: improve asciidoc dependencies Date: Wed, 12 May 2021 17:28:02 -0500 Message-Id: <20210512222803.508446-8-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-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 f846bb91ee..ba0c947d0d 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -140,7 +140,7 @@ ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \ -amanversion=$(GIT_VERSION) \ -amanmanual='Git Manual' -amansource='Git' ASCIIDOC_BASE = '$(SHELL_PATH_SQ)' ./asciidoc-helper.sh $(ASCIIDOC_COMMON) -ASCIIDOC_DEPS = asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS +ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS TXT_TO_HTML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_HTML) TXT_TO_XML = $(ASCIIDOC_BASE) -b $(ASCIIDOC_DOCBOOK) MANPAGE_XSL = manpage-normal.xsl @@ -196,6 +196,7 @@ ASCIIDOC_EXTRA += -acompat-mode -atabsize=8 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;' ASCIIDOC_BASE = $(ASCIIDOC_COMMON) +ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS DBLATEX_COMMON = XMLTO_EXTRA += --skip-validation XMLTO_EXTRA += -x manpage.xsl From patchwork Wed May 12 22:28:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Contreras X-Patchwork-Id: 12254955 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.7 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 98B65C43461 for ; Wed, 12 May 2021 23:27:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A58F61419 for ; Wed, 12 May 2021 23:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236665AbhELXYb (ORCPT ); Wed, 12 May 2021 19:24:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349236AbhELWbA (ORCPT ); Wed, 12 May 2021 18:31:00 -0400 Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA506C06135C for ; Wed, 12 May 2021 15:28:33 -0700 (PDT) Received: by mail-ot1-x331.google.com with SMTP id t10-20020a05683022eab0290304ed8bc759so965169otc.12 for ; Wed, 12 May 2021 15:28:33 -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=nqw2y/pqNvSLw3F8UEyGa8EcMg68LKfAI9NUur5dpcg=; b=WKNlfzqybgmIzsO8ijop1uphKUbJafqQFTd2jeBVf1C6x56sc3lEv97DaU5po9J5SC nP/2feQ4wsW+giT5KHI+dObnOlCVFwTZdmQJYGa9CWHSTXarc6wf8Sab/8h3dWJTRgoH Pc6OJuQCLtT7u4SgX/xc++esF44vj+c79C8/y9VSZ5udZGYMfx7KXwlwzx+VLJh+8Trx ScVqTLsnRBQ38MCSHqSolf081xAHUY6XQaaeQ/+mOEnsCkYhutMyRDw/FrMQacalOJW8 thM6VBV5wl4VdYV0BBu6fnSgf6L6HoMu0bDNvjsYlhePKXzoZe9uPnxMxrxx+24HGyV/ Ni5w== 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=nqw2y/pqNvSLw3F8UEyGa8EcMg68LKfAI9NUur5dpcg=; b=kDqJvC1xapIO/a5dtL/zA5G2rUfJDVOpHNA6j0xs6NnMzaR3wYkMGVwXE0bZftoRb2 rNOWFepJgVa0CYSEq4xXGp1+7bUaJPQy1Ed44aDW0UExkpFiT0nMsWsXU+mF3E+P7QN1 FkAkJkwz6JeEV2QmFJSSTMrJ1UX71aWaO/hBHrfkW5LVpxfou3T2Nkde93NmfuMvMhxh 3lwbaNhY/xJHuXQR/d4maK7wPV9FJdcSjvdP75whdcjWX567ca9HEfpL8BF5+0frI5Mu RMnn0RNAhYFvMctHGOfFOGqSJkM+uzfHgIxcVQjDroFikugkQ2y/OO05CrWy4nqk3kqB mwPQ== X-Gm-Message-State: AOAM531pEK+uW1gkMInubdW/QyMgSYLPUpYvUcz2y9NQZKl5NTSEyYiM e72Pcqrvgn6SJHuEcmhvjsRFhzNi+ZHBew== X-Google-Smtp-Source: ABdhPJzZjDTbjref70GyZAfRhTBhQHfmSEveb4fkISmd8OSNAMd7k5XEysbnViSpfCVSjKTyGGOmRg== X-Received: by 2002:a9d:68d8:: with SMTP id i24mr31488120oto.347.1620858512973; Wed, 12 May 2021 15:28:32 -0700 (PDT) Received: from localhost ([2806:2f0:4060:638f:a2c5:89ff:fe0c:1151]) by smtp.gmail.com with ESMTPSA id c18sm266919otm.1.2021.05.12.15.28.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 May 2021 15:28:32 -0700 (PDT) From: Felipe Contreras To: git@vger.kernel.org Cc: Jeff King , =?utf-8?q?Martin_=C3=85gren?= , "brian m . carlson" , Junio C Hamano , Felipe Contreras Subject: [PATCH 8/8] doc: join xml and man rules Date: Wed, 12 May 2021 17:28:03 -0500 Message-Id: <20210512222803.508446-9-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210512222803.508446-1-felipe.contreras@gmail.com> References: <20210512222803.508446-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Will be useful later with asciidoctor that can do both at the same time. Signed-off-by: Felipe Contreras --- Documentation/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index ba0c947d0d..d5ea05295d 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -367,11 +367,9 @@ $(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS) 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)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $< - -%.xml : %.txt $(ASCIIDOC_DEPS) - $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $< +%.1 %.5 %.7 : %.txt $(ASCIIDOC_DEPS) manpage-base-url.xsl $(wildcard manpage*.xsl) + $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $*.xml $< && \ + $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $*.xml user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS $(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $<