From owner-svn-doc-head@freebsd.org Tue Aug 28 23:52:44 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 31663109AF2B; Tue, 28 Aug 2018 23:52:44 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D75C973441; Tue, 28 Aug 2018 23:52:43 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B8888156FD; Tue, 28 Aug 2018 23:52:43 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w7SNqhgr073013; Tue, 28 Aug 2018 23:52:43 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w7SNqhjJ073012; Tue, 28 Aug 2018 23:52:43 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <201808282352.w7SNqhjJ073012@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Tue, 28 Aug 2018 23:52:43 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r52190 - head/share/mk X-SVN-Group: doc-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: head/share/mk X-SVN-Commit-Revision: 52190 X-SVN-Commit-Repository: doc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-head@freebsd.org X-Mailman-Version: 2.1.27 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: Tue, 28 Aug 2018 23:52:44 -0000 Author: dbaio (ports committer) Date: Tue Aug 28 23:52:43 2018 New Revision: 52190 URL: https://svnweb.freebsd.org/changeset/doc/52190 Log: share/mk/doc.translate.mk: Improve `make po` - Create .pot (Portable Object Template) files for the en_US documents Do not ignore en_US language and generate a `.pot` file instead of a `.po`. These are used as template for tools like Zanata. - Execute `msgattrib` even on a new `[.po|.pot]` file This will be useful to wrap long message lines and avoid bigger diffs in the future. Approved by: wosch Differential Revision: https://reviews.freebsd.org/D16726 Modified: head/share/mk/doc.translate.mk Modified: head/share/mk/doc.translate.mk ============================================================================== --- head/share/mk/doc.translate.mk Tue Aug 28 22:39:12 2018 (r52189) +++ head/share/mk/doc.translate.mk Tue Aug 28 23:52:43 2018 (r52190) @@ -42,9 +42,6 @@ POSET_CMD= ${SED} -i '' -e '1s,^,\#${IDSTR1}${IDSTR2}\ 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 directory, ignored" -.else # some SRCS files might need to be generated, make sure they exist @${MAKE} -C ${EN_DIR} ${MASTER_SRCS} > /dev/null # normalize the English original into a single file @@ -52,32 +49,34 @@ ${DOC}.translate.xml: # remove redundant namespace attributes @${PO_XMLLINT} --nsclean ${.TARGET}.tmp > ${.TARGET} @${RM} ${.TARGET}.tmp - @${MAKE} -C ${EN_DIR} clean > /dev/null -.endif .if ${TRAN_DIR} == ${EN_DIR} -po: +PO_FILE=${PO_LANG}.pot .else -po: ${PO_LANG}.po +PO_FILE=${PO_LANG}.po .endif +po: ${PO_FILE} .PHONY: po -${PO_LANG}.po: ${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.tmp ${PO_LANG}.po.new - @${RM} ${PO_LANG}.po.new - @${MV} ${PO_LANG}.po.tmp ${PO_LANG}.po +${PO_FILE}: ${DOC}.translate.xml + @${ITSTOOL} -o ${PO_FILE}.tmp ${DOC}.translate.xml +.if exists(${PO_FILE}) + @${ECHO} "${PO_FILE} exists, merging" + @${MSGMERGE} -o ${PO_FILE}.new ${PO_FILE} ${PO_FILE}.tmp + @${MSGATTRIB} --no-obsolete -o ${PO_FILE}.tmp ${PO_FILE}.new + @${RM} ${PO_FILE}.new + @${MV} ${PO_FILE}.tmp ${PO_FILE} .else - @${ECHO} "${PO_LANG}.po created, please check and correct the settings in the header" - @${MV} ${PO_LANG}.po.tmp ${PO_LANG}.po + @${ECHO} "${PO_FILE} created, please check and correct the settings in the header" + # Just to wrap long message lines + @${MSGATTRIB} -o ${PO_FILE} ${PO_FILE}.tmp + @${RM} ${PO_FILE}.tmp @${POSET_CMD} ${.TARGET} .endif + @${MAKE} -C ${EN_DIR} clean > /dev/null -${PO_LANG}.mo: ${PO_LANG}.po +${PO_LANG}.mo: ${PO_FILE} @${MSGFMT} -o ${.TARGET} ${.ALLSRC} tran ${DOC}.xml: ${DOC}.translate.xml ${PO_LANG}.mo