Imported from /home/lorry/working-area/delta_gcc-tarball/gcc-5.1.0.tar.bz2.gcc-5.1.0

6 files changed, 161 insertions, 32 deletions

diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index c25c092a66..9a1610f7a5 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,14 +1,60 @@
-2014-10-30  Release Manager
+2015-04-22  Release Manager
 
-	* GCC 4.9.2 released.
+	* GCC 5.1.0 released.
 
-2014-07-16  Release Manager
+2015-04-07  Gerald Pfeifer  <gerald@pfeifer.com>
 
-	* GCC 4.9.1 released.
+	* update_web_docs_libstdcxx_svn (FILTER): Introduce.
+	Use to filter output of the copying process.
 
-2014-04-22  Release Manager
+2015-02-25  Arnaud Charlet  <charlet@adacore.com>
 
-	* GCC 4.9.0 released.
+	* update_web_docs_svn: Preserve gcc/ada/*.png. Update comments.
+
+2015-02-25  Arnaud Charlet  <charlet@adacore.com>
+
+	* update_web_docs_svn: Add -I gcc/gcc/ada/doc/gnat_ugn for gnat_ugn
+
+2015-02-06  David Malcolm  <dmalcolm@redhat.com>
+
+	PR jit/64257
+	* update_web_docs_svn: When copying up files for the built jit
+	documentation, also copy up .txt files.
+
+2015-02-04  David Malcolm  <dmalcolm@redhat.com>
+
+	PR jit/64257
+	* update_web_docs_svn: Update build of jit docs to use EPEL6
+	variant install of sphinx 1.0.8, rather than 0.6.6.
+
+2015-01-26  David Malcolm  <dmalcolm@redhat.com>
+
+	PR jit/64257
+	* update_web_docs_svn: Don't delete gcc/jit/docs or
+	gcc/jit/jit-common.h, gcc/jit/notes.txt. Special case the
+	building of the JIT docs (using sphinx-build).  Special case
+	copying them up.
+
+2014-08-14  Richard Biener  <rguenther@suse.de>
+
+	* crontab: Change trunk snapshots from 4.10 to 5.
+
+2014-08-01  Arnaud Charlet  <charlet@adacore.com>
+
+	* update_web_docs_svn: Simplify build of gnat_ugn.
+
+2014-06-12  Richard Biener  <rguenther@suse.de>
+
+	* crontab: Remove 4.7 snapshot entry.
+	* update_version_svn: Update IGNORE_BRANCHES.
+
+2014-05-30  Jonathan Wakely  <jwakely@redhat.com>
+
+	* generate_libstdcxx_web_docs: New script.
+
+2014-04-11  Jakub Jelinek  <jakub@redhat.com>
+
+	* crontab: Enable snapshots from gcc-4_9-branch.
 
 2014-02-01  Dmitry Gorbachev  <d.g.gorbachev@gmail.com>
 
diff --git a/maintainer-scripts/crontab b/maintainer-scripts/crontab
index 9f644496a8..663858ff75 100644
--- a/maintainer-scripts/crontab
+++ b/maintainer-scripts/crontab
@@ -1,6 +1,6 @@
 16  0 * * * sh /home/gccadmin/scripts/update_version_svn
 50  0 * * * sh /home/gccadmin/scripts/update_web_docs_svn
 55  0 * * * sh /home/gccadmin/scripts/update_web_docs_libstdcxx_svn
+32 22 * * 3 sh /home/gccadmin/scripts/gcc_release -s 4.9:branches/gcc-4_9-branch -l -d /sourceware/snapshot-tmp/gcc all
 32 22 * * 4 sh /home/gccadmin/scripts/gcc_release -s 4.8:branches/gcc-4_8-branch -l -d /sourceware/snapshot-tmp/gcc all
-32 22 * * 6 sh /home/gccadmin/scripts/gcc_release -s 4.7:branches/gcc-4_7-branch -l -d /sourceware/snapshot-tmp/gcc all
-32 22 * * 7 sh /home/gccadmin/scripts/gcc_release -s 4.9:trunk -l -d /sourceware/snapshot-tmp/gcc all
+32 22 * * 7 sh /home/gccadmin/scripts/gcc_release -s 5:trunk -l -d /sourceware/snapshot-tmp/gcc all
diff --git a/maintainer-scripts/generate_libstdcxx_web_docs b/maintainer-scripts/generate_libstdcxx_web_docs
new file mode 100755
index 0000000000..700e522e25
--- /dev/null
+++ b/maintainer-scripts/generate_libstdcxx_web_docs
@@ -0,0 +1,56 @@
+#!/bin/bash
+# Generate the libstdc++ onlinedocs for a GCC release
+# i.e. http://gcc.gnu.org/onlinedocs/gcc-x.y.z/libstdc++*
+
+SRCDIR=${1}
+DOCSDIR=${2}
+
+if ! [ $# -eq 2 -a -x "${SRCDIR}/configure" -a -d "${DOCSDIR}" ]
+then
+  echo "Usage: $0 <gcc src dir> <doc output dir>" >&2
+  exit 1
+fi
+
+set -e
+
+# Check we have some of the required tools
+for i in doxygen dot dblatex pdflatex makeindex
+do
+  echo -n "Checking for $i... "
+  which $i
+done
+
+start=$PWD
+WORKDIR=`mktemp -d $PWD/build.XXXXXX`
+DESTDIR=`mktemp -d $PWD/dest.XXXXXX`
+cd $WORKDIR
+disabled_libs=
+for dir in ${SRCDIR}/lib*
+do
+  dir="${dir##*/}"
+  [ $dir == 'libstdc++-v3' ] || disabled_libs="$disabled_libs --disable-$dir"
+done
+set -x
+${SRCDIR}/configure --enable-languages=c,c++ --disable-gcc $disabled_libs --docdir=/docs
+eval `grep '^target=' config.log`
+make configure-target
+make -C $target/libstdc++-v3 doc-install-html doc-install-xml doc-install-pdf DESTDIR=$DESTDIR
+cd $DESTDIR/docs
+mkdir libstdc++
+for which in api manual
+do
+  if [ -f libstdc++-$which-single.xml ] # Only needed for GCC 4.7.x
+  then
+    mv libstdc++-$which-single.xml libstdc++-$which.xml
+  fi
+  gzip --best libstdc++-$which.xml
+  gzip --best libstdc++-$which.pdf
+  mv libstdc++-$which{.html,-html}
+  tar czf libstdc++-$which-html.tar.gz libstdc++-$which-html
+  mv libstdc++-$which-html libstdc++/$which
+done
+mv *.gz libstdc++ $DOCSDIR/
+cd $start
+rm -r $WORKDIR
+rm -r $DESTDIR
+
diff --git a/maintainer-scripts/update_version_svn b/maintainer-scripts/update_version_svn
index e4a738ad72..800a70e894 100755
--- a/maintainer-scripts/update_version_svn
+++ b/maintainer-scripts/update_version_svn
@@ -6,7 +6,7 @@
 # in the space separated list in $ADD_BRANCHES.
 
 SVNROOT=${SVNROOT:-"file:///svn/gcc"}
-IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1|4_2|4_3|4_4|4_5|4_6)-branch'
+IGNORE_BRANCHES='gcc-(2_95|3_0|3_1|3_2|3_3|3_4|4_0|4_1|4_2|4_3|4_4|4_5|4_6|4_7)-branch'
 ADD_BRANCHES='HEAD'
 
 # Run this from /tmp.
diff --git a/maintainer-scripts/update_web_docs_libstdcxx_svn b/maintainer-scripts/update_web_docs_libstdcxx_svn
index 10d45f5c4e..efceaf9a2c 100755
--- a/maintainer-scripts/update_web_docs_libstdcxx_svn
+++ b/maintainer-scripts/update_web_docs_libstdcxx_svn
@@ -19,6 +19,7 @@ WWWDIR=/www/gcc/htdocs/onlinedocs/libstdc++
 ## 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
@@ -38,8 +39,7 @@ cd doc
 rm -f Makefile
 
 # copy the tree to the onlinedocs area, preserve directory structure
-#find . -depth -print | cpio -pdv $WWWDIR
-find . -depth -print | cpio -pd $WWWDIR 2>&1 | grep -v "newer or same age version exists"
+find . -depth -print | cpio -pd $WWWDIR 2>&1 | egrep -v "$FILTER"
 
 err=${PIPESTATUS[1]}
 if [ $err -gt 0 ]; then
diff --git a/maintainer-scripts/update_web_docs_svn b/maintainer-scripts/update_web_docs_svn
index 8a5883eeca..46e34d10fe 100755
--- a/maintainer-scripts/update_web_docs_svn
+++ b/maintainer-scripts/update_web_docs_svn
@@ -20,11 +20,7 @@ MANUALS="cpp
   gcj
   gfortran
   gfc-internals
-  gnat_ug_unx
-  gnat_ug_vms
-  gnat_ug_vxw
-  gnat_ug_wnt
-  gnat_ugn_unw
+  gnat_ugn
   gnat-style
   gnat_rm
   libgomp
@@ -111,17 +107,21 @@ else
   svn -q export $SVNROOT/tags/$RELEASE gcc
 fi
 
-# Remove all unwanted files.  This is needed (a) to build the Ada
-# generator programs with the installed library, not the new one and
-# (b) to avoid packaging all the sources instead of only documentation
-# sources.
+# Remove all unwanted files.  This is needed to avoid packaging all the
+# sources instead of only documentation sources.
+# Note that we have to preserve gcc/jit/docs since the jit docs are
+# not .texi files (Makefile, .rst and .png), and the jit docs use
+# include directives to pull in content from jit/jit-common.h and
+# jit/notes.txt, so we have to preserve those also.
 find gcc -type f \( -name '*.texi' \
   -o -path gcc/gcc/doc/install.texi2html \
   -o -path gcc/gcc/doc/include/texinfo.tex \
-  -o -path gcc/gcc/ada/xgnatugn.adb \
-  -o -path gcc/gcc/ada/ug_words \
   -o -path gcc/gcc/BASE-VER \
   -o -path gcc/gcc/DEV-PHASE \
+  -o -path "gcc/gcc/ada/doc/gnat_ugn/*.png" \
+  -o -path "gcc/gcc/jit/docs/*" \
+  -o -path "gcc/gcc/jit/jit-common.h" \
+  -o -path "gcc/gcc/jit/notes.txt" \
   -o -print0 \) | xargs -0 rm -f
 
 # Build a tarball of the sources.
@@ -131,14 +131,6 @@ tar cf docs-sources.tar gcc
 # and fdl.texi.
 includedir=gcc/gcc/doc/include
 
-# Generate gnat_ugn_unw
-
-if [ -f gcc/gcc/ada/xgnatugn.adb ]; then
-   gnatmake -q gcc/gcc/ada/xgnatugn
-   ./xgnatugn unw gcc/gcc/ada/gnat_ugn.texi \
-     gcc/gcc/ada/ug_words gnat_ugn_unw.texi
-fi
-
 # Generate gcc-vers.texi.
 (
    echo "@set version-GCC $(cat gcc/gcc/BASE-VER)"
@@ -161,8 +153,8 @@ for file in $MANUALS; do
   filename=`find . -name ${file}.texi`
   if [ "${filename}" ]; then
     includes="-I ${includedir} -I `dirname ${filename}`"
-    if [ "$file" = "gnat_ugn_unw" ]; then
-      includes="$includes -I gcc/gcc/ada"
+    if [ "$file" = "gnat_ugn" ]; then
+      includes="$includes -I gcc/gcc/ada -I gcc/gcc/ada/doc/gnat_ugn"
     fi
     makeinfo --html $includes -o ${file} ${filename}
     tar cf ${file}-html.tar ${file}/*.html
@@ -172,6 +164,26 @@ for file in $MANUALS; do
   fi
 done
 
+# The jit is a special-case, using sphinx rather than texinfo.
+# Specifically, the jit docs need sphinx 1.0 or later.
+#
+# The jit/docs Makefile uses the executable $(SPHINXBUILD),
+# defaulting to "sphinx-build".
+#
+# sphinx is packaged in Fedora and EPEL 6 within "python-sphinx",
+# and in openSUSE within "python-Sphinx".
+#
+# For EPEL6, python-sphinx is sphinx 0.6.6, which is missing various
+# directives (e.g. ":c:macro:"), so we need the variant
+# python-sphinx10 package.  The latter installs its executable as
+#   /usr/bin/sphinx-1.0-build
+# so we need to override SPHINXBUILD with this when invoking "make".
+pushd gcc/gcc/jit/docs
+make SPHINXBUILD=/usr/bin/sphinx-1.0-build html
+popd
+cp -a gcc/gcc/jit/docs/_build/html jit
+mkdir -p $DOCSDIR/jit
+
 # Work around makeinfo generated file names and references with
 # "_002d" instead of "-".
 find . -name '*.html' | while read f; do
@@ -218,6 +230,21 @@ for file in */*.html *.ps *.pdf *.tar; do
   fi
 done
 
+# Again, the jit is a special case, with nested subdirectories
+# below "jit", and with some non-HTML files (.png images from us,
+# plus .css and .js supplied by sphinx, and source files, renamed
+# from .rst to .txt).
+find jit \
+    -name "*.html" -o -name "*.png" \
+    -o -name "*.css" -o -name "*.js" \
+    -o -name "*.txt" |
+  while read file ; do
+    # Note that $file here will contain path fragments beginning
+    # with "jit/", e.g. "jit/cp/topics/functions.html"
+    mkdir -p $(dirname $DOCSDIR/$file)
+    cp $file $DOCSDIR/$file
+  done
+
 cd $DOCSDIR
 
 # Finally, generate the installation documentation