| Message ID | alpine.DEB.2.21.2001131746190.11452@digraph.polyomino.org.uk |
|---|---|
| State | New |
| Headers | show |
| Series | Replace update_web_docs_svn with update_web_docs_git | expand |
I've also applied this corresponding web page update. diff --git a/htdocs/releasing.html b/htdocs/releasing.html index 5d08550c..48853f9c 100644 --- a/htdocs/releasing.html +++ b/htdocs/releasing.html @@ -89,9 +89,9 @@ the main web page, and add a proper news item there as well.</li> and add a link from the main <code>buildstat.html</code> page.</li> <li>Generate online documentation for the new release with -<code>update_web_docs_svn</code>. The appropriate command to run (as gccadmin) -to generate the documentation would be <code>scripts/update_web_docs_svn --rgcc_3_0_2_release -dgcc-3.0.2</code> (with the current version +<code>update_web_docs_git</code>. The appropriate command to run (as gccadmin) +to generate the documentation would be <code>scripts/update_web_docs_git +-r3.0.2 -dgcc-3.0.2</code> (with the current version number inserted). Link to it from <code>onlinedocs/index.html</code> (but don't break URLs to documentation for previous releases even if you remove the links to it). Create additionally
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?
On Mon, 13 Jan 2020, Jonathan Wakely wrote: > 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? Yes. > Should I do a `git pull` in the gcc-checkout dir on sourceware after > pushing this? Yes, and install the new crontab (right now the installed crontab has the call to update_web_docs_libstdcxx_svn commented out, but with this patch we'll be able to use the checked-in crontab verbatim again).
On 13/01/20 21:42 +0000, Joseph Myers wrote: >On Mon, 13 Jan 2020, Jonathan Wakely wrote: > >> 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? > >Yes. > >> Should I do a `git pull` in the gcc-checkout dir on sourceware after >> pushing this? > >Yes, and install the new crontab (right now the installed crontab has the >call to update_web_docs_libstdcxx_svn commented out, but with this patch >we'll be able to use the checked-in crontab verbatim again). OK, that's done.
diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab index 0cf342fdf3a..64edcc126fb 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 similarity index 95% rename from maintainer-scripts/update_web_docs_svn rename to maintainer-scripts/update_web_docs_git index 16abfee3278..d87a5982f98 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