From owner-svn-doc-head@freebsd.org Sat Feb 3 12:05:31 2018 Return-Path: Delivered-To: svn-doc-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 37DC3EE1774; Sat, 3 Feb 2018 12:05:31 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: from mail-yw0-x241.google.com (mail-yw0-x241.google.com [IPv6:2607:f8b0:4002:c05::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9D25F851F5; Sat, 3 Feb 2018 12:05:30 +0000 (UTC) (envelope-from wschnr@googlemail.com) Received: by mail-yw0-x241.google.com with SMTP id b16so12407052ywh.12; Sat, 03 Feb 2018 04:05:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc; bh=MRjv25fI+JDcy/JcSkTm7POxO6iSLV/Ue/rEo7jC3BA=; b=RCJCyj47DgzkNh8FwIywRsTyVEkgYAB0/R+HssTpEMz7+8BcolwkchRannMsUqkSVB pSkVyVvr7KWj7kQQ14Xj+xw55A6BavKqS44A0+PI5pS3D4Oe7rl2tYvovWqj5FXLOjgC S9pnTaslFMNbxFKCytbQ8HJy3eaDSoUiZ6zj0yYGiIp0w82psVUd/j1AL6zZH+etRlrc aaaQPFwFwKZUkOoO4hkVxfLOZE1E9pIOlMf7hH/1ecWgotlCfWC/oCbWrn52pU0/konz TnCVpFWm+xL4B/xk3HEhiu0GWoj6gLG2hOq2G9s7L7Yh19Y8HdYWsuO5s+2A6b+p/NEU L+CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc; bh=MRjv25fI+JDcy/JcSkTm7POxO6iSLV/Ue/rEo7jC3BA=; b=FKWxdnEu/KPekh2WlRCN7OdtfVnNRWMvdczMd8uoTfqrb0zPqXOv+lr1wJ5MFJwzAK CnlQK23I4rHjAShPj1zmJdzLYg/zGDBOKx0wzYrmiPWK544aiB3np39bSLXgcxxoJLxu ebsH0K/1g3qQUotW5YcTj5fxFH0o1Yv+faWG09P+ehm/4gA6pSTmaFuRHUALLSXLeyRf 50h5Q8FSeJMenYy7U9W9e0CSPoqV7Kq+FJkrZrw1zD7GsDlRfA5kH5tZBwn0M2THY2wj Y6IlUZeYQoxKr9stmcxVGuwDfCocUWR4X7adianIa0PO8SZ5BHipuYKTxBPjpKmEksap WEUw== X-Gm-Message-State: AKwxytcwSp7ODgolbpB9nHA34eXip62WxO5sozg+IC0GuQz0VS23qzGF QGInFGuRE2ivJdFVPmtlEUP/1Ql0/wkevO63Qy3g2g== X-Google-Smtp-Source: AH8x224WieeafhdACAWcd2lukco94M7rZhNcqiCN0uHKCKLpTlNLSsc/Nf/VesyMNdDAXZk/gknXG1EVc3Yl64HBbZE= X-Received: by 10.129.199.73 with SMTP id i9mr14664417ywl.66.1517659529960; Sat, 03 Feb 2018 04:05:29 -0800 (PST) MIME-Version: 1.0 Sender: wschnr@googlemail.com Received: by 10.37.77.87 with HTTP; Sat, 3 Feb 2018 04:05:14 -0800 (PST) In-Reply-To: <201802021655.w12GtODA074724@repo.freebsd.org> References: <201802021655.w12GtODA074724@repo.freebsd.org> From: Wolfram Schneider Date: Sat, 3 Feb 2018 13:05:14 +0100 X-Google-Sender-Auth: 5W3uIqtPtIHIU3CAdSRn9Tcpjx4 Message-ID: Subject: Re: svn commit: r51402 - head/share/mk To: Warren Block , Wolfram Schneider Cc: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Content-Type: text/plain; charset="UTF-8" X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the doc tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Feb 2018 12:05:31 -0000 On 2 February 2018 at 17:55, Warren Block wrote: > Author: wblock > Date: Fri Feb 2 16:55:24 2018 > New Revision: 51402 > URL: https://svnweb.freebsd.org/changeset/doc/51402 > > Log: > Unbreak building of translated PO files. Also intentionally hide make(1) > output. This is not only unhelpful for translators, it is distracting > from the already difficult job of translation. If verbose output is > desired, 'make -l' can be used. This commit is hard to read. As far as I understand, the "Unbreak building of translated PO files" part is a single line change, removing some bytes (keep ${DOC}.translate.xml) git diff -b -U1 2ac5931a3c38a2d8eaebfa3140a51bfb7750d56e doc.translate.mk diff --git a/share/mk/doc.translate.mk b/share/mk/doc.translate.mk index 0030211929..a878adfca2 100644 --- a/share/mk/doc.translate.mk +++ b/share/mk/doc.translate.mk @@ -72,3 +72,3 @@ ${PO_LANG}.po: ${DOC}.translate.xml ${MV} ${PO_LANG}.po.new ${PO_LANG}.po - ${RM} ${PO_LANG}.po.tmp ${DOC}.translate.xml + ${RM} ${PO_LANG}.po.tmp .else all the rest is cosmetic or spell checking. Can we please not mix bugfixes with cosmetic changes? Thanks. -Wolfram > > Modified: > head/share/mk/doc.translate.mk > > Modified: head/share/mk/doc.translate.mk > ============================================================================== > --- head/share/mk/doc.translate.mk Thu Feb 1 15:33:28 2018 (r51401) > +++ head/share/mk/doc.translate.mk Fri Feb 2 16:55:24 2018 (r51402) > @@ -43,16 +43,16 @@ MASTER_SRCS!= ${MAKE} -C ${EN_DIR} -V SRCS > > ${DOC}.translate.xml: > .if ${TRAN_DIR} == ${EN_DIR} > - @${ECHO} "Please build PO file only in a non-English dir, ignored" > + @${ECHO} "Please build PO file only in a non-English directory, ignored" > .else > # some SRCS files might need to be generated, make sure they exist > - ${MAKE} -C ${EN_DIR} ${MASTER_SRCS} > /dev/null > + @${MAKE} -C ${EN_DIR} ${MASTER_SRCS} > /dev/null > # normalize the English original into a single file > - ${PO_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp > + @${PO_XMLLINT} --nonet --noent --valid --xinclude ${MASTERDOC_EN} > ${.TARGET}.tmp > # remove redundant namespace attributes > - ${PO_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} > - ${RM} ${.TARGET}.tmp > - ${MAKE} -C ${EN_DIR} clean > /dev/null > + @${PO_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} > + @${RM} ${.TARGET}.tmp > + @${MAKE} -C ${EN_DIR} clean > /dev/null > .endif > > .if ${TRAN_DIR} == ${EN_DIR} > @@ -64,27 +64,27 @@ po: ${PO_LANG}.po > .PHONY: po > > ${PO_LANG}.po: ${DOC}.translate.xml > - ${ITSTOOL} -o ${PO_LANG}.po.tmp ${DOC}.translate.xml > + @${ITSTOOL} -o ${PO_LANG}.po.tmp ${DOC}.translate.xml > .if exists(${PO_LANG}.po) > @${ECHO} "${PO_LANG}.po exists, merging" > - ${MSGMERGE} -o ${PO_LANG}.po.new ${PO_LANG}.po ${PO_LANG}.po.tmp > - ${MSGATTRIB} --no-obsolete -o ${PO_LANG}.po.new ${PO_LANG}.po > - ${MV} ${PO_LANG}.po.new ${PO_LANG}.po > - ${RM} ${PO_LANG}.po.tmp ${DOC}.translate.xml > + @${MSGMERGE} -o ${PO_LANG}.po.new ${PO_LANG}.po ${PO_LANG}.po.tmp > + @${MSGATTRIB} --no-obsolete -o ${PO_LANG}.po.new ${PO_LANG}.po > + @${MV} ${PO_LANG}.po.new ${PO_LANG}.po > + @${RM} ${PO_LANG}.po.tmp > .else > @${ECHO} "${PO_LANG}.po created, please check and correct the settings in the header" > - ${MV} ${PO_LANG}.po.tmp ${PO_LANG}.po > - ${POSET_CMD} ${.TARGET} > + @${MV} ${PO_LANG}.po.tmp ${PO_LANG}.po > + @${POSET_CMD} ${.TARGET} > .endif > > ${PO_LANG}.mo: ${PO_LANG}.po > - ${MSGFMT} -o ${.TARGET} ${.ALLSRC} > + @${MSGFMT} -o ${.TARGET} ${.ALLSRC} > > tran ${DOC}.xml: ${DOC}.translate.xml ${PO_LANG}.mo > .if ${TRAN_DIR} == ${EN_DIR} > - @${ECHO} "Please build translation only in a non-English dir, ignored" > + @${ECHO} "Please build translation only in a non-English directory, ignored" > .else > - ${ITSTOOL} -l ${PO_LANG} -m ${PO_LANG}.mo -o ${DOC}.xml ${DOC}.translate.xml > + @${ITSTOOL} -l ${PO_LANG} -m ${PO_LANG}.mo -o ${DOC}.xml ${DOC}.translate.xml > .endif > .endif > > -- Wolfram Schneider https://wolfram.schneider.org