diff options
| -rw-r--r-- | maintainer-scripts/ChangeLog | 6 | ||||
| -rw-r--r-- | maintainer-scripts/crontab | 2 | ||||
| -rwxr-xr-x | maintainer-scripts/update_web_docs_git (renamed from maintainer-scripts/update_web_docs_svn) | 17 |
3 files changed, 16 insertions, 9 deletions
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog index cadcad3..d616cac 100644 --- a/maintainer-scripts/ChangeLog +++ b/maintainer-scripts/ChangeLog @@ -1,5 +1,11 @@ 2020-01-13 Joseph Myers <joseph@codesourcery.com> + * update_web_docs_git: New file. + * update_web_docs_svn: Remove. + * crontab: Use update_web_docs_svn. + +2020-01-13 Joseph Myers <joseph@codesourcery.com> + * gcc_release: Use git instead of SVN. * crontab: Update gcc_release calls. diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab index 0cf342f..64edcc1 100644 --- a/maintainer-scripts/crontab +++ b/maintainer-scripts/crontab @@ -1,5 +1,5 @@ 16 0 * * * sh /home/gccadmin/scripts/update_version_git -50 0 * * * sh /home/gccadmin/scripts/update_web_docs_svn +50 0 * * * sh /home/gccadmin/scripts/update_web_docs_git 55 0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn 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 diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_git index 16abfee..d87a598 100755 --- a/maintainer-scripts/update_web_docs_svn +++ b/maintainer-scripts/update_web_docs_git @@ -3,14 +3,14 @@ # Generate HTML documentation from GCC Texinfo docs. # # If you want to run this on a machine different from gcc.gnu.org, you -# may need to adjust SVNROOT and WWWBASE below (or override them via the +# may need to adjust GITROOT and WWWBASE below (or override them via the # environment). set -e # Run this from /tmp. -SVNROOT=${SVNROOT:-"file:///svn/gcc"} -export SVNROOT +GITROOT=${GITROOT:-"/git/gcc.git"} +export GITROOT PATH=/usr/local/bin:$PATH @@ -104,7 +104,7 @@ if [ ! -d $DOCSDIR ]; then fi if [ -z "$RELEASE" ]; then - RELEASE=trunk + RELEASE=master fi WORKDIR=/tmp/gcc-doc-update.$$ @@ -112,11 +112,12 @@ WORKDIR=/tmp/gcc-doc-update.$$ rm -rf $WORKDIR mkdir $WORKDIR cd $WORKDIR -if [ "$RELEASE" = "trunk" ]; then - svn -q export $SVNROOT/$RELEASE gcc +if [ "$RELEASE" = "master" ]; then + git clone -q $GITROOT gcc else - svn -q export $SVNROOT/tags/$RELEASE gcc + git clone -q -b releases/gcc-$RELEASE $GITROOT gcc fi +rm -rf gcc/.git # Remove all unwanted files. This is needed to avoid packaging all the # sources instead of only documentation sources. @@ -259,7 +260,7 @@ find jit \ cd $DOCSDIR # Finally, generate the installation documentation -if [ "$RELEASE" = "trunk" ]; then +if [ "$RELEASE" = "master" ]; then SOURCEDIR=$WORKDIR/gcc/gcc/doc DESTDIR=$WWWBASE_PREFORMATTED/install export SOURCEDIR |