Date: Fri, 5 May 2017 13:50:57 +0000 (UTC) From: Warren Block <wblock@FreeBSD.org> To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r50233 - head/share/mk Message-ID: <201705051350.v45DovZj075247@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: wblock Date: Fri May 5 13:50:57 2017 New Revision: 50233 URL: https://svnweb.freebsd.org/changeset/doc/50233 Log: Use Subversion metadata for version information rather than grepping for $FreeBSD$ version strings. Modified: head/share/mk/doc.commands.mk head/share/mk/doc.docbook.mk Modified: head/share/mk/doc.commands.mk ============================================================================== --- head/share/mk/doc.commands.mk Fri May 5 10:33:47 2017 (r50232) +++ head/share/mk/doc.commands.mk Fri May 5 13:50:57 2017 (r50233) @@ -42,6 +42,7 @@ XARGS?= /usr/bin/xargs # Version control # GIT?= /usr/local/bin/git +SVN?= /usr/local/bin/svn # # Compession and decompression Modified: head/share/mk/doc.docbook.mk ============================================================================== --- head/share/mk/doc.docbook.mk Fri May 5 10:33:47 2017 (r50232) +++ head/share/mk/doc.docbook.mk Fri May 5 13:50:57 2017 (r50233) @@ -100,15 +100,21 @@ LATESTREVISION!=cd ${.CURDIR} && ${GIT} --stringparam latestrevision.committer "%cn" \ --stringparam latestrevision.number "%h"' ${SRCS} .else -# version numbers are expected to be in Subversion, but we cannot -# require Subversion to be installed just to build the documents, -# so use grep to find the version strings -LATESTREVISION!=${GREP} -Ehos '\$$[F]reeBSD: ([^\$$ ]+ ){5}\$$' ${SRCS} | \ - ${AWK} '{ print \ - "--stringparam latestrevision.timestamp \""$$4" "$$5"\" " \ - "--stringparam latestrevision.committer \""$$6"\" " \ - "--stringparam latestrevision.number \""$$3"\" " \ - }' | ${SORT} | ${TAIL} -n1 +# if using Subversion, get information from metadata +# rather than embedded version strings +.if exists(${DOC_PREFIX}/.svn) && exists(${SVN}) +LATESTREVISION!=cd ${.CURDIR} && ${SVN} info ${SRCS} 2>/dev/null | \ + ${AWK} 'BEGIN { genfmt="--stringparam latestrevision."; \ + timefmt=genfmt"timestamp \"%s %s\""; \ + comtfmt=genfmt"committer \"%s\""; \ + revnfmt=genfmt"number \"%u\""; \ + fmt=timefmt" "comtfmt"\t\t"revnfmt"\n"; } \ + /^Last Changed Author:/ { committer=$$4 } \ + /^Last Changed Rev:/ { number=$$4 } \ + /^Last Changed Date:/ { date=$$4; time=$$5; \ + printf(fmt, date, time, committer, number) }' \ + | ${SORT} | ${TAIL} -n1 +.endif .endif # if neither Subversion nor Git revision numbers are available, use @@ -336,7 +342,7 @@ POSET_CMD= ${SED} -i '' -e '1s,^,\#${IDS -e 's,^\(\"Language-Team:.*\\n\"\),\1\${.newline}\"Language: ${PO_LANG}\\n\",' \ -e 's,^\"Content-Type: text/plain; charset=.*\\n,\"Content-Type: text/plain; charset=${PO_CHARSET}\\n,' -.if ${.TARGETS:Mpo} || ${.TARGETS:Mtran} +.if ${.TARGETS:Mpo} || ${.TARGETS:Mtran} || ${.TARGETS:M${DOC}.translate.xml} MASTER_SRCS!= ${MAKE} -C ${EN_DIR} -V SRCS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201705051350.v45DovZj075247>