From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 67827 invoked by alias); 13 Jan 2020 21:39:47 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 67818 invoked by uid 89); 13 Jan 2020 21:39:47 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-17.5 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,URI_NOVOWEL autolearn=ham version=3.3.1 spammy=online X-HELO: us-smtp-delivery-1.mimecast.com Received: from us-smtp-1.mimecast.com (HELO us-smtp-delivery-1.mimecast.com) (205.139.110.61) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 13 Jan 2020 21:39:45 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578951583; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=AeCKYyj7i+otsQp2MivW54gkWnYfhUohg5bdJxCYAiI=; b=MnFWqEabp8YIwhVGvTC9rl5JlmOhOo76PE+jyK63L1X05eFK8ZZyynmAdS/R2jls27JcSM h5pvuYJrNuXcMkAoNsWyplSytNf/JtEiwKlY1aev8eDQICrZS9qtZY/O3tv1Hlkj66iaaz kxdCz1jhjXg/l2e4Vbo/wZK2wneDFNc= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-UwPZJRe1OMeINodsajjAJg-1; Mon, 13 Jan 2020 16:39:41 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3F5671005516; Mon, 13 Jan 2020 21:39:40 +0000 (UTC) Received: from localhost (unknown [10.33.36.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1CEB50A8F; Mon, 13 Jan 2020 21:39:39 +0000 (UTC) Date: Mon, 13 Jan 2020 21:53:00 -0000 From: Jonathan Wakely To: Joseph Myers Cc: gcc-patches@gcc.gnu.org Subject: Re: Replace update_web_docs_svn with update_web_docs_git Message-ID: <20200113213938.GA283800@redhat.com> References: MIME-Version: 1.0 In-Reply-To: X-Clacks-Overhead: GNU Terry Pratchett X-Mimecast-Spam-Score: 0 Content-Type: multipart/mixed; boundary="jI8keyz6grp/JLjh" Content-Disposition: inline X-SW-Source: 2020-01/txt/msg00751.txt.bz2 --jI8keyz6grp/JLjh Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-length: 420 On 13/01/20 17:46 +0000, Joseph Myers wrote: >This patch replaces the update_web_docs_svn script, that updates >online documentation from its sources in the GCC repository, run once >a day from cron, with update_web_docs_git. > >Applied to mainline. And this does the same for the update_web_docs_libstdcxx_svn script. OK for trunk? Should I do a `git pull` in the gcc-checkout dir on sourceware after pushing this? --jI8keyz6grp/JLjh Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-Transfer-Encoding: quoted-printable Content-length: 3072 commit 837a33b15533232bf8c86b794e824be32899c2c4 Author: Jonathan Wakely Date: Mon Jan 13 21:26:54 2020 +0000 Replace update_web_docs_libstdcxx_svn with update_web_docs_libstdcxx_git =20=20=20=20 This patch replaces the update_web_docs_libstdcxx_svn script, that updates online documentation from its sources in the GCC repository, run once a day from cron, with update_web_docs_libstdcxx_git. =20=20=20=20 * update_web_docs_libstdcxx_git: New file. * update_web_docs_libstdcxx_svn: Remove. * crontab: Use update_web_docs_libstdcxx_git. diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab index 64edcc126fb..9470f3345bb 100644 --- a/maintainer-scripts/crontab +++ b/maintainer-scripts/crontab @@ -1,6 +1,6 @@ 16 0 * * * sh /home/gccadmin/scripts/update_version_git 50 0 * * * sh /home/gccadmin/scripts/update_web_docs_git -55 0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn +55 0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_git 32 22 * * 5 sh /home/gccadmin/scripts/gcc_release -s 8:releases/gcc-8 -l -= d /sourceware/snapshot-tmp/gcc all 32 22 * * 6 sh /home/gccadmin/scripts/gcc_release -s 9:releases/gcc-9 -l -= d /sourceware/snapshot-tmp/gcc all 32 22 * * 7 sh /home/gccadmin/scripts/gcc_release -s 10:master -l -d /sour= ceware/snapshot-tmp/gcc all diff --git a/maintainer-scripts/update_web_docs_libstdcxx_svn b/maintainer-= scripts/update_web_docs_libstdcxx_git similarity index 84% rename from maintainer-scripts/update_web_docs_libstdcxx_svn rename to maintainer-scripts/update_web_docs_libstdcxx_git +++ b/maintainer-scripts/update_web_docs_libstdcxx_git @@ -1,16 +1,14 @@ #!/bin/bash =20 =20 -# "sh update_web_docs_libstdcxx.sh" +# "sh update_web_docs_libstdcxx_git" # Checks out a copy of the libstdc++-v3 "inner" documentation and puts # it in the onlinedocs area. For an initial description of "inner" # docs, see the thread starting with=20 # http://gcc.gnu.org/ml/libstdc++/2000-11/msg00475.html -# -# Id: update_v3_web_docs.sh,v 1.4 2000/12/25 05:02:14 pedwards Exp ##################################################################### =20 -SVNROOT=3D${SVNROOT:-"file:///svn/gcc"} +GITROOT=3D${GITROOT:-"/git/gcc.git"} GETTHIS=3D'libstdc++-v3/doc/html' WWWDIR=3D/www/gcc/htdocs/onlinedocs/libstdc++ #WWWDIR=3D/tmp/fake-onlinedocs-testing @@ -22,7 +20,7 @@ WWWDIR=3D/www/gcc/htdocs/onlinedocs/libstdc++ FILTER=3D"newer or same age version exists|0 blocks" =20 PATH=3D/usr/local/bin:$PATH -export SVNROOT +export GITROOT =20 test -d $WWWDIR || /bin/mkdir $WWWDIR test -d $WWWDIR || { echo something is very wrong ; exit 1; } @@ -34,9 +32,8 @@ cd $WORKDIR =20 =20 # checkout all the HTML files, get down into an interesting directory -svn -q export $SVNROOT/trunk/$GETTHIS doc -cd doc -rm -f Makefile +git -C $GITROOT archive master $GETTHIS | tar xf - +cd $GETTHIS =20 # copy the tree to the onlinedocs area, preserve directory structure find . -depth -print | cpio -pd $WWWDIR 2>&1 | egrep -v "$FILTER" --jI8keyz6grp/JLjh--