From owner-svn-doc-all@freebsd.org Fri Dec 4 23:13:25 2020 Return-Path: Delivered-To: svn-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 9C6D34AF016; Fri, 4 Dec 2020 23:13:25 +0000 (UTC) (envelope-from gjb@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 4CnpR93pPKz4QlQ; Fri, 4 Dec 2020 23:13:25 +0000 (UTC) (envelope-from gjb@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7543413C5F; Fri, 4 Dec 2020 23:13:25 +0000 (UTC) (envelope-from gjb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0B4NDPAH043787; Fri, 4 Dec 2020 23:13:25 GMT (envelope-from gjb@FreeBSD.org) Received: (from gjb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0B4NDPXu043786; Fri, 4 Dec 2020 23:13:25 GMT (envelope-from gjb@FreeBSD.org) Message-Id: <202012042313.0B4NDPXu043786@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gjb set sender to gjb@FreeBSD.org using -f From: Glen Barber Date: Fri, 4 Dec 2020 23:13:25 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r54730 - head/share/tools X-SVN-Group: doc-head X-SVN-Commit-Author: gjb X-SVN-Commit-Paths: head/share/tools X-SVN-Commit-Revision: 54730 X-SVN-Commit-Repository: doc 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.34 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: Fri, 04 Dec 2020 23:13:25 -0000 Author: gjb Date: Fri Dec 4 23:13:25 2020 New Revision: 54730 URL: https://svnweb.freebsd.org/changeset/doc/54730 Log: Update the webupdate script to uncomment git calls prior to the switchover for the repository. Sponsored by: Rubicon Communications, LLC (netgate.com) Modified: head/share/tools/webupdate Modified: head/share/tools/webupdate ============================================================================== --- head/share/tools/webupdate Fri Dec 4 18:55:43 2020 (r54729) +++ head/share/tools/webupdate Fri Dec 4 23:13:25 2020 (r54730) @@ -47,7 +47,7 @@ # DEFAULT_PATH=/bin:/usr/bin:/usr/local/bin; DEFAULT_SVNROOT=svn://svn.FreeBSD.org -#DEFAULT_GITROOT=https://cgit-beta.FreeBSD.org +DEFAULT_GITROOT=https://cgit-beta.FreeBSD.org DEFAULT_BUILDDIR=/usr/local/www/build; #DEFAULT_LOGDIR=/usr/local/www/build/log; DEFAULT_LOGDIR=/usr/local/www/logs/build; @@ -64,7 +64,7 @@ DEFAULT_WEBMAILTO=freebsd-doc; # PATH=${PATH:-${DEFAULT_PATH}}; export PATH; SVNROOT=${SVNROOT:-${DEFAULT_SVNROOT}}; export SVNROOT; -#GITROOT=${GITROOT:-${DEFAULT_GITROOT}}; export GITROOT; +GITROOT=${GITROOT:-${DEFAULT_GITROOT}}; export GITROOT; BUILDDIR=${BUILDDIR:-${DEFAULT_BUILDDIR}}; LOGDIR=${LOGDIR:-${DEFAULT_LOGDIR}}; DESTDIR=${DESTDIR:-${DEFAULT_DESTDIR}}; export DESTDIR @@ -129,8 +129,8 @@ if [ $cond ]; then rm -Rf $subtrees 2>/dev/null; # Check out the new copies. This creates all the $subtrees. - svn co $SVNROOT/doc/head head >> $LOGFILE 2>&1 || exit 2; - #git clone -b main $GITROOT/doc.git main >> $LOGFILE 2>&1 || exit 2; + #svn co $SVNROOT/doc/head head >> $LOGFILE 2>&1 || exit 2; + git clone -b main $GITROOT/doc.git main >> $LOGFILE 2>&1 || exit 2; test -d relnotes || mkdir relnotes; mkdir -p src/share/man/man4 @@ -142,10 +142,10 @@ if [ $cond ]; then rm -f $BUILDDIR/fullbuild-clean.flag else for dir in ${subtrees}; do - svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; - svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2; - #git -C main clean -f >> $LOGFILE 2>&1 || exit 2; - #git -C main pull >> $LOGFILE 2>&1 || exit 2; + #svn cleanup $dir >> $LOGFILE 2>&1 || exit 2; + #svn update --accept theirs-full $dir >> $LOGFILE 2>&1 || exit 2; + git -C main clean -f >> $LOGFILE 2>&1 || exit 2; + git -C main pull >> $LOGFILE 2>&1 || exit 2; done fi @@ -157,8 +157,8 @@ fi # # Build the web site. # -cd $BUILDDIR/head || exit 1; -#cd $BUILDDIR/main || exit 1; +#cd $BUILDDIR/head || exit 1; +cd $BUILDDIR/main || exit 1; # get latest revision LATESTREVISION=$LOGDIR/LATESTREVISION @@ -173,8 +173,8 @@ time make ${BUILDARGS} p-all >> $LOGFILE 2>&1 || | /usr/sbin/sendmail -oi -f www-data@freebsd.org ${WEBMAILTO}; exit 3) || exit 3; -cd $BUILDDIR/head/en_US.ISO8859-1/htdocs || exit 1; -#cd $BUILDDIR/main/en_US.ISO8859-1/htdocs || exit 1; +#cd $BUILDDIR/head/en_US.ISO8859-1/htdocs || exit 1; +cd $BUILDDIR/main/en_US.ISO8859-1/htdocs || exit 1; ( time make ${INSTARGS} -j8 all && time make ${INSTARGS} install ) >> $LOGFILE 2>&1 || (cat $LATESTREVISION >> $LOGFILE