From owner-dev-commits-doc-all@freebsd.org Wed Dec 30 16:53:30 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 9E2344C8C0F for ; Wed, 30 Dec 2020 16:53:30 +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 4D5cmp44k2z3t9V; Wed, 30 Dec 2020 16:53:30 +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 7F68221736; Wed, 30 Dec 2020 16:53:30 +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 0BUGrU7f003599; Wed, 30 Dec 2020 16:53:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 0BUGrUfp003598; Wed, 30 Dec 2020 16:53:30 GMT (envelope-from git) Date: Wed, 30 Dec 2020 16:53:30 GMT Message-Id: <202012301653.0BUGrUfp003598@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Glen Barber Subject: git: e9a6e6f104 - main - docbuild: update PDF file build scripts to use Git MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9a6e6f104b7706ad46bc7b3d88536d3e57902f7 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, 30 Dec 2020 16:53:30 -0000 The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/doc/commit/?id=e9a6e6f104b7706ad46bc7b3d88536d3e57902f7 commit e9a6e6f104b7706ad46bc7b3d88536d3e57902f7 Author: Glen Barber AuthorDate: 2020-12-30 16:52:21 +0000 Commit: Glen Barber CommitDate: 2020-12-30 16:52:21 +0000 docbuild: update PDF file build scripts to use Git Remove references to CVS/SVN and replace with Git equivalents. Note the files are not automatically updated on the builder after a change is committed. Remove RCSIDs. Sponsored by: Rubicon Communications, LLC (netgate.com) --- share/tools/dobuild.sh | 15 +++++++-------- share/tools/dobuild_wrap.sh | 10 ++++------ 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/share/tools/dobuild.sh b/share/tools/dobuild.sh index a2ae5c092d..9e16187121 100755 --- a/share/tools/dobuild.sh +++ b/share/tools/dobuild.sh @@ -3,14 +3,13 @@ # Copyright (c) 2001 Dima Dorfman # Copyright (c) 2004 Simon L. Nielsen # -# Build the FreeBSD docs from the CVS^WSVN repository. +# Build the FreeBSD docs from the Git repository. # # # Major variables: # # PATH - The search path as interpreted by the shell. -# CVSROOT - Path to the FreeBSD CVS repository (obsolete) -# DOCSVN - Url to the FreeBSD doc SVN repository. +# DOCGIT - Url to the FreeBSD doc Git repository. # BUILDDIR - Where the checked out copies of the files are stored. # DESTDIR - Where the rendered copies should wind up. # BUILDARGS - Arguments to pass to make(1) when {build,install}ing. @@ -29,13 +28,14 @@ # # 0 - success # 1 - unknown failure -# 2 - failure in CVS^SVN operations +# 2 - failure in Git operations # 3 - failure in make operations # -# $FreeBSD: www/tools/webupdate,v 1.10 2003/11/18 11:00:54 kuriyama Exp $ -# # +# NOTE: This script is not automatically updated on the builder. +# + # WARNING! This script depend on dobuild_wrap.sh setting the # configuration variables in the enviroment. # @@ -61,8 +61,7 @@ if [ -z "${NOCLEAN}" ]; then rm -Rf doc out 2>/dev/null echo "===> Check out the new doc" - #cvs -qR checkout -P doc || exit 2 - svn checkout ${DOCSVN} doc || exit 2 + git clone -b main ${DOCGIT} doc || exit 2 fi cd $BUILDDIR/doc || exit 1 diff --git a/share/tools/dobuild_wrap.sh b/share/tools/dobuild_wrap.sh index d0bdf3e246..c62dfa7bfc 100755 --- a/share/tools/dobuild_wrap.sh +++ b/share/tools/dobuild_wrap.sh @@ -24,18 +24,17 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD$ -# +# # Wrapper around doc build. Simplifies main build script. +# NOTE: This script is not automatically updated on the builder. # # Default configuration. # DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin DEFAULT_BUILDROOT=/local0/docbuild -DEFAULT_CVSROOT=/home/dcvs -DEFAULT_DOCSVN="svn://svn.freebsd.org/doc/head" +DEFAULT_DOCGIT="https://git.freebsd.org/doc.git" DEFAULT_BUILDARGS="NO_JPMAN=yes GEN_INDEX=yes" DEFAULT_INSTARGS="NO_JPMAN=yes GEN_INDEX=yes INSTALL_ONLY_COMPRESSED=yes" # Must keep space between addresses. @@ -51,8 +50,7 @@ DEFAULT_COMPTYPES="bz2 zip" # BUILDROOT=${BUILDROOT:-${DEFAULT_BUILDROOT}}; export BUILDROOT PATH="${PATH}:${DEFAULT_PATH}"; export PATH -CVSROOT=${CVSROOT:-${DEFAULT_CVSROOT}}; export CVSROOT -DOCSVN=${DOCSVN:-${DEFAULT_DOCSVN}}; export DOCSVN +DOCGIT=${DOCGIT:-${DEFAULT_DOCGIT}}; export DOCGIT BUILDDIR=${BUILDDIR:-${BUILDROOT}/build}; export BUILDDIR DOCDIR=${DOCDIR:-${BUILDROOT}/build/out}; export DOCDIR FORMATS=${FORMATS:-${DEFAULT_FORMATS}}; export FORMATS