From owner-svn-doc-all@freebsd.org Tue Jun 14 14:03:00 2016 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A30E7AF2801; Tue, 14 Jun 2016 14:03:00 +0000 (UTC) (envelope-from mat@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 mx1.freebsd.org (Postfix) with ESMTPS id 5C1CA2DDC; Tue, 14 Jun 2016 14:03:00 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5EE2x7m059643; Tue, 14 Jun 2016 14:02:59 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5EE2xcA059642; Tue, 14 Jun 2016 14:02:59 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201606141402.u5EE2xcA059642@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 14 Jun 2016 14:02:59 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r48924 - head/share/mk X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 14 Jun 2016 14:03:00 -0000 Author: mat Date: Tue Jun 14 14:02:59 2016 New Revision: 48924 URL: https://svnweb.freebsd.org/changeset/doc/48924 Log: Fix using LATESTREVISION when not using svn (or svn is broken) Kinda ok'ed by: wblock Sponsored by: Absolight Modified: head/share/mk/doc.docbook.mk Modified: head/share/mk/doc.docbook.mk ============================================================================== --- head/share/mk/doc.docbook.mk Mon Jun 13 19:03:06 2016 (r48923) +++ head/share/mk/doc.docbook.mk Tue Jun 14 14:02:59 2016 (r48924) @@ -87,12 +87,35 @@ 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'" + +# 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} +.else +# svn doesn't allow multiple files passed to it, so try to get the latest with grep LATESTREVISION!=${GREP} -Ehos '\$$[F]reeBSD: ([^\$$ ]+ ){5}\$$' ${SRCS} | \ ${AWK} '{ print \ " --param latestrevision.timestamp \"'\''"$$4" "$$5"'\''\"" \ " --param latestrevision.committer \"'\''"$$6"'\''\"" \ " --param 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 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) +.endif XSLTPROCOPTS+= ${LATESTREVISION}