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?
commit 837a33b15533232bf8c86b794e824be32899c2c4
Author: Jonathan Wakely <jwak...@redhat.com>
Date: Mon Jan 13 21:26:54 2020 +0000
Replace update_web_docs_libstdcxx_svn with update_web_docs_libstdcxx_git
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.
* 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 /sourceware/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
-# "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
# 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
#####################################################################
-SVNROOT=${SVNROOT:-"file:///svn/gcc"}
+GITROOT=${GITROOT:-"/git/gcc.git"}
GETTHIS='libstdc++-v3/doc/html'
WWWDIR=/www/gcc/htdocs/onlinedocs/libstdc++
#WWWDIR=/tmp/fake-onlinedocs-testing
@@ -22,7 +20,7 @@ WWWDIR=/www/gcc/htdocs/onlinedocs/libstdc++
FILTER="newer or same age version exists|0 blocks"
PATH=/usr/local/bin:$PATH
-export SVNROOT
+export GITROOT
test -d $WWWDIR || /bin/mkdir $WWWDIR
test -d $WWWDIR || { echo something is very wrong ; exit 1; }
@@ -34,9 +32,8 @@ cd $WORKDIR
# 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
# copy the tree to the onlinedocs area, preserve directory structure
find . -depth -print | cpio -pd $WWWDIR 2>&1 | egrep -v "$FILTER"
