os/doc
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Improve latest revision detection based on mat's work. This clarifies

Browse source 
the code, reduces dependencies, and removes a lot of quotes by using
--stringparam.

Differential Revision:	https://reviews.freebsd.org/D6902
This commit is contained in:
Warren Block 2016-07-04 14:56:42 +00:00
parent 0cbb4c2e32
commit bc9859bd07
Notes: svn2git 2020-12-08 03:00:23 +00:00 
svn path=/head/; revision=49051
2 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
share/mk/doc.commands.mk
View file

@ -32,11 +32,17 @@ SED?= /usr/bin/sed
SETENV?= /usr/bin/env
SH?= /bin/sh
SORT?= /usr/bin/sort
STAT?= /usr/bin/stat
TAIL?= /usr/bin/tail
TOUCH?= /usr/bin/touch
TRUE?= /usr/bin/true
XARGS?= /usr/bin/xargs
#
# Version control
#
GIT?= /usr/local/bin/git
#
# Compession and decompression
#

39
share/mk/doc.docbook.mk
View file

@ -88,33 +88,38 @@ NO_SUBDIR= YES
# Determine latest revision
#
# This needs to contain all of:
# --param latestrevision.timestamp "'timestamp'"
# --param latestrevision.committer "'committer'"
# --param latestrevision.number "'revision id'"
# --stringparam latestrevision.timestamp "timestamp"
# --stringparam latestrevision.committer "committer"
# --stringparam latestrevision.number "revision id"
# If using git, use git log. The revision won't work with the generated links,
# because it is a hash, and git log doesn't know about git svn find-rev.
.if exists(${DOC_PREFIX}/.git)
LATESTREVISION!=cd ${.CURDIR} && git log -1 \
--pretty=format:'--param latestrevision.timestamp "'\''%ci'\''" --param latestrevision.committer "'\''%cn'\''" --param latestrevision.number "'\''%h'\''"' \
${SRCS}
.if exists(${DOC_PREFIX}/.git) && exists(${GIT})
LATESTREVISION!=cd ${.CURDIR} && ${GIT} log -1 --pretty=format:'\
--stringparam latestrevision.timestamp "%ci" \
--stringparam latestrevision.committer "%cn" \
--stringparam latestrevision.number "%h"' ${SRCS}
.else
# svn doesn't allow multiple files passed to it, so try to get the latest with grep
# 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 \
" --param latestrevision.timestamp \"'\''"$$4" "$$5"'\''\"" \
" --param latestrevision.committer \"'\''"$$6"'\''\"" \
" --param latestrevision.number \"'\''"$$3"'\''\"" \
"--stringparam latestrevision.timestamp \""$$4" "$$5"\" " \
"--stringparam latestrevision.committer \""$$6"\" " \
"--stringparam latestrevision.number \""$$3"\" " \
}' | ${SORT} | ${TAIL} -n1
.endif
# And sometime, strange things happen, so let's try to be a bit clever so that
# we always have something to output, so use file on the file modified last,
# and use its changed timestamp, user. Leave the revision as blank.
# if neither Subversion nor Git revision numbers are available, use
# the revision date from the timestamp of the most recent file and
# set the revision number to "filedate"
.if empty(LATESTREVISION)
LATESTREVISION!=stat -t '%F %T %Z' \
-f '--param latestrevision.timestamp "'\''%Sc'\''" --param latestrevision.committer "'\''%Su'\''" --param latestrevision.number "'\'''\''"' \
$(ls -t1 ${SRCS}|head -1)
LATESTREVISION!=${STAT} 2>/dev/null -t '%F %T %Z' -f '\
--stringparam latestrevision.timestamp "%Sc" \
--stringparam latestrevision.committer "%Su" \
--stringparam latestrevision.number "filedate"' \
${SRCS} | ${SORT} -r | ${TAIL} -n1
.endif
XSLTPROCOPTS+= ${LATESTREVISION}