From owner-dev-commits-doc-all@freebsd.org Wed Dec 23 19:06:16 2020 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B375C4C8D66 for ; Wed, 23 Dec 2020 19:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1N3D4WTlz3rW0; Wed, 23 Dec 2020 19:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8DD8923231; Wed, 23 Dec 2020 19:06:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 0BNJ6GYo052927; Wed, 23 Dec 2020 19:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BNJ6GSG052926; Wed, 23 Dec 2020 19:06:16 GMT (envelope-from git) Date: Wed, 23 Dec 2020 19:06:16 GMT Message-Id: <202012231906.0BNJ6GSG052926@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Rene Ladan Subject: git: eaf07aef56 - Update the build infrastructure to use Git instead of Subversion MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rene X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eaf07aef5605b8be7cb473b6eb860b2f65bc4c17 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the doc repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Dec 2020 19:06:16 -0000 The branch main has been updated by rene: URL: https://cgit.FreeBSD.org/doc/commit/?id=eaf07aef5605b8be7cb473b6eb860b2f65bc4c17 commit eaf07aef5605b8be7cb473b6eb860b2f65bc4c17 Author: Rene Ladan AuthorDate: 2020-12-19 11:33:43 +0000 Commit: Rene Ladan CommitDate: 2020-12-23 19:06:07 +0000 Update the build infrastructure to use Git instead of Subversion Summary: The doc repository is not mirrored to Subversion so updating the repository from Subversion does not make sense. Remove Subversion-specific files too. While here remove now defunct $FreeBSD$ markers in affected files. Test Plan: make clean make update make Reviewed by: bcr, ygy, doceng (gjb) Differential Revision: https://reviews.freebsd.org/D27678 Subscribers: drewery, emaste --- Makefile | 18 ++++-------- share/misc/svn_props.txt | 72 ------------------------------------------------ share/mk/doc.docbook.mk | 25 ++--------------- share/tools/webupdate | 6 ++-- 4 files changed, 10 insertions(+), 111 deletions(-) diff --git a/Makefile b/Makefile index a5cd379b0b..0ba06ce4e6 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,3 @@ -# $FreeBSD$ -# # The user can override the default list of languages to build and install # with the DOC_LANG variable. # @@ -35,25 +33,19 @@ SUBDIR+= share DOC_PREFIX?= ${.CURDIR} -.if exists(/usr/bin/svnlite) -SVN?= /usr/bin/svnlite -.elif exists(/usr/bin/svn) -SVN?= /usr/bin/svn -.else -SVN?= /usr/local/bin/svn -.endif +GIT?= /usr/local/bin/git update: -.if !exists(${SVN}) +.if !exists(${GIT}) @${ECHODIR} "--------------------------------------------------------------" - @${ECHODIR} ">>> ${SVN} is required to update ${.CURDIR}" + @${ECHODIR} ">>> ${GIT} is required to update ${.CURDIR}" @${ECHODIR} "--------------------------------------------------------------" @${EXIT} .else @${ECHODIR} "--------------------------------------------------------------" - @${ECHODIR} ">>> Updating ${.CURDIR} from svn repository" + @${ECHODIR} ">>> Updating ${.CURDIR} from git repository" @${ECHODIR} "--------------------------------------------------------------" - cd ${.CURDIR}; ${SVN} update + cd ${.CURDIR}; ${GIT} pull --ff-only .endif .include "${DOC_PREFIX}/share/mk/doc.project.mk" diff --git a/share/misc/svn_props.txt b/share/misc/svn_props.txt deleted file mode 100644 index a0293097ff..0000000000 --- a/share/misc/svn_props.txt +++ /dev/null @@ -1,72 +0,0 @@ -# Make sure you have a ~/.subversion/config. Simply using it (svn --help) -# will cause a default one to be created if you don't already have one. -# Add the following changes to ~/.subversion/config: -# -# -# Set: -# enable-auto-props = yes -# -# -# Append/edit auto-props section: -# - -[auto-props] -*.c = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.h = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.s = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.S = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.cc = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.cpp = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.cxx = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.in = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.sh = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable -*.pl = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain; svn:executable -*.pm = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.py = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.rb = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.awk = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.sed = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.txt = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.log = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.conf = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -Makefile* = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.1 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.2 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.3 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.4 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.5 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.6 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.7 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.8 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain -*.9 = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/plain - -*.css = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/css -*.docbook = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml -*.dtd = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd -*.ent = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xml-dtd -*.html = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html -*.mml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/mathml+xml -*.js = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/javascript -*.rss = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/rss+xml -*.sgml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/sgml -*.xhtml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/html+xml -*.xml = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml -*.xsd = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xml -*.xsl = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml -*.xslt = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=application/xslt+xml -*.xul = svn:eol-style=native; svn:keywords=FreeBSD=%H; svn:mime-type=text/xul - -*.bin = svn:mime-type=application/octet-stream -*.eps = svn:mime-type=application/postscript -*.exe = svn:mime-type=application/octet-stream -*.gz = svn:mime-type=application/gzip -*.pdf = svn:mime-type=application/pdf -*.ps = svn:mime-type=application/postscript - -*.gif = svn:mime-type=image/gif -*.ico = svn:mime-type=image/vnd.microsoft.icon -*.jpeg = svn:mime-type=image/jpeg -*.jpg = svn:mime-type=image/jpeg -*.png = svn:mime-type=image/png -*.svg = svn:mime-type=image/svg+xml -*.tiff = svn:mime-type=image/tiff diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index 44a46bbb16..bcab2d712d 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -1,6 +1,3 @@ -# -# $FreeBSD$ -# # This include file handles building and installing of # DocBook documentation in the FreeBSD Documentation Project. # @@ -99,25 +96,9 @@ LATESTREVISION!=cd ${.CURDIR} && ${GIT} log -1 --pretty=format:'\ --stringparam latestrevision.timestamp "%ci" \ --stringparam latestrevision.committer "%cn" \ --stringparam latestrevision.number "%h"' ${SRCS} -.else -# 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 +.endif + +# If the Git revision number is not available, use # the revision date from the timestamp of the most recent file and # set the revision number to "filedate" .if empty(LATESTREVISION) diff --git a/share/tools/webupdate b/share/tools/webupdate index 4b2322ab72..7c247a486c 100755 --- a/share/tools/webupdate +++ b/share/tools/webupdate @@ -2,7 +2,7 @@ # Copyright (c) 2001-2017 Wolfram Schneider # Copyright (c) 2001 Dima Dorfman # -# Update the FreeBSD web site from the SVN repository. +# Update the FreeBSD web site from the Git repository. # # # NOTE: Changes to this file is NOT automatically used for the web @@ -24,7 +24,7 @@ # INSTARGS - Arguments to pass to make(1) when installing. # WEBMAILTO - Address to send mail to if the build fails. # -# subtrees - List of directores in $BUILDDIR which are from SVN. +# subtrees - List of directories in $BUILDDIR which are from VCS. # # Variables which are in uppercase are derived from the environment # unless they don't exist, in which case a value suitable for @@ -39,8 +39,6 @@ # 2 - failure in VCS operations # 3 - failure in make operations # -# $FreeBSD$ -# # # Default configuration.