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/ChangeLog b/maintainer-scripts/ChangeLog
index d616cacb2fc5a45e2558e5766e9712a909897796..4fca86975e4ad92587ce88003d9d83f4416e3c2a 100644 (file)
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,9 @@
+2020-01-13  Jonathan Wakely  <jwakely@redhat.com>
+
+       * update_web_docs_libstdcxx_git: New file.
+       * update_web_docs_libstdcxx_svn: Remove.
+       * crontab: Use update_web_docs_libstdcxx_git.
+
 2020-01-13  Joseph Myers  <joseph@codesourcery.com>
 
        * update_web_docs_git: New file.

diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab
index 64edcc126fb84b831e56bb9440446729a5d0d86b..9470f3345bb8484c40f7cd4848ebe63650c86cb5 100644 (file)
--- 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_git b/maintainer-scripts/update_web_docs_libstdcxx_git
new file mode 100755 (executable)
index 0000000..570e7ff
--- /dev/null
+++ b/maintainer-scripts/update_web_docs_libstdcxx_git
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+
+# "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
+#####################################################################
+
+GITROOT=${GITROOT:-"/git/gcc.git"}
+GETTHIS='libstdc++-v3/doc/html'
+WWWDIR=/www/gcc/htdocs/onlinedocs/libstdc++
+#WWWDIR=/tmp/fake-onlinedocs-testing
+
+
+## No more changes should be needed.  Ha, right, whatever.
+#####################################################################
+
+FILTER="newer or same age version exists|0 blocks"
+
+PATH=/usr/local/bin:$PATH
+export GITROOT
+
+test -d $WWWDIR || /bin/mkdir $WWWDIR
+test -d $WWWDIR || { echo something is very wrong ; exit 1; }
+
+WORKDIR=/tmp/v3-doc-update.$$
+/bin/rm -rf $WORKDIR
+/bin/mkdir $WORKDIR
+cd $WORKDIR
+
+
+# checkout all the HTML files, get down into an interesting directory
+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"
+
+err=${PIPESTATUS[1]}
+if [ $err -gt 0 ]; then
+    printf "\nCopying failed with error code %d.\n" $err
+fi
+
+cd /
+/bin/rm -rf $WORKDIR
+

diff --git a/maintainer-scripts/update_web_docs_libstdcxx_svn b/maintainer-scripts/update_web_docs_libstdcxx_svn
deleted file mode 100755 (executable)
index efceaf9..0000000
--- a/maintainer-scripts/update_web_docs_libstdcxx_svn
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-
-# "sh update_web_docs_libstdcxx.sh"
-# 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"}
-GETTHIS='libstdc++-v3/doc/html'
-WWWDIR=/www/gcc/htdocs/onlinedocs/libstdc++
-#WWWDIR=/tmp/fake-onlinedocs-testing
-
-
-## No more changes should be needed.  Ha, right, whatever.
-#####################################################################
-
-FILTER="newer or same age version exists|0 blocks"
-
-PATH=/usr/local/bin:$PATH
-export SVNROOT
-
-test -d $WWWDIR || /bin/mkdir $WWWDIR
-test -d $WWWDIR || { echo something is very wrong ; exit 1; }
-
-WORKDIR=/tmp/v3-doc-update.$$
-/bin/rm -rf $WORKDIR
-/bin/mkdir $WORKDIR
-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
-
-# copy the tree to the onlinedocs area, preserve directory structure
-find . -depth -print | cpio -pd $WWWDIR 2>&1 | egrep -v "$FILTER"
-
-err=${PIPESTATUS[1]}
-if [ $err -gt 0 ]; then
-    printf "\nCopying failed with error code %d.\n" $err
-fi
-
-cd /
-/bin/rm -rf $WORKDIR
-