X-Git-Url: https://gcc.gnu.org/git/?a=blobdiff_plain;f=contrib%2Fgcc_update;h=94b9843f07cc34408f1acb919d3c7a4f9c5181db;hb=9e953fed92f75f63acb652eb8b2c3b3245ca24fc;hp=c84eaffd6aa875d5605c9d052b2fdfed5e95f087;hpb=29a948c850fd52bed06295ac02c4bcfc72c5c095;p=gcc.git diff --git a/contrib/gcc_update b/contrib/gcc_update index c84eaffd6aa8..94b9843f07cc 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -29,7 +29,7 @@ # contrib/gcc_update --list # # -# (C) 1998, 1999, 2000, 2001 Free Software Foundation +# (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation # Originally by Gerald Pfeifer , August 1998. # # This script is Free Software, and it can be copied, distributed and @@ -37,6 +37,8 @@ # its license can be downloaded from http://www.gnu.org/copyleft/gpl.html +# CVS command +GCC_CVS=${GCC_CVS-${CVS-cvs}} # Default options used when updating via CVS. UPDATE_OPTIONS=-Pd # Use -P to prune empty directories. @@ -54,52 +56,49 @@ self=$0 # colon is stripped from the output. files_and_dependencies () { sed -e 's/ *#.*//' -e '/^$/d' -e 's/://' <<\EOF -# All automake dependencies within texinfo -# In fact, not all, since we do not care about sub-directories that -# we do not build. In particular, *.po and *.gmo are not touched. -texinfo/aclocal.m4: texinfo/configure.in texinfo/acinclude.m4 -texinfo/Makefile.in: texinfo/Makefile.am texinfo/configure.in texinfo/aclocal.m4 -texinfo/configure: texinfo/configure.in texinfo/aclocal.m4 -texinfo/stamp-h.in: texinfo/configure.in texinfo/aclocal.m4 texinfo/acconfig.h -texinfo/lib/Makefile.in: texinfo/lib/Makefile.am texinfo/configure.in texinfo/aclocal.m4 -texinfo/makeinfo/Makefile.in: texinfo/makeinfo/Makefile.am texinfo/configure.in texinfo/aclocal.m4 -texinfo/util/Makefile.in: texinfo/util/Makefile.am texinfo/configure.in texinfo/aclocal.m4 +# intl library +intl/plural.c: intl/plural.y +intl/configure: intl/configure.ac intl/aclocal.m4 +intl/config.h.in: intl/configure.ac intl/aclocal.m4 # Now, proceed to gcc automatically generated files -gcc/configure: gcc/configure.in -gcc/cstamp-h.in: gcc/configure.in gcc/acconfig.h +gcc/configure: gcc/configure.ac +gcc/cstamp-h.in: gcc/configure.ac gcc/config.in: gcc/cstamp-h.in gcc/fixinc/fixincl.x: gcc/fixinc/fixincl.tpl gcc/fixinc/inclhack.def # And then, language-specific files -gcc/f/intdoc.texi: gcc/f/intdoc.in gcc/f/intdoc.c gcc/f/intrin.h gcc/f/intrin.def -gcc/ada/treeprs.ads: gcc/ada/treeprs.adt gcc/ada/sinfo.ads gcc/ada/xtreeprs.adb -gcc/ada/einfo.h: gcc/ada/einfo.ads gcc/ada/einfo.adb gcc/ada/xeinfo.adb -gcc/ada/sinfo.h: gcc/ada/sinfo.ads gcc/ada/xsinfo.adb -gcc/ada/nmake.adb: gcc/ada/sinfo.ads gcc/ada/nmake.adt gcc/ada/xnmake.adb -gcc/ada/nmake.ads: gcc/ada/sinfo.ads gcc/ada/nmake.adt gcc/ada/xnmake.adb +gcc/cp/cfns.h: gcc/cp/cfns.gperf +gcc/java/keyword.h: gcc/java/keyword.gperf +# testsuite +# Without this, _Pragma3.c can have a false negative. +gcc/testsuite/gcc.dg/cpp/_Pragma3.c: gcc/testsuite/gcc.dg/cpp/mi1c.h # And libraries, at last -libf2c/configure: libf2c/configure.in -libf2c/libF77/configure: libf2c/libF77/configure.in -libf2c/libI77/configure: libf2c/libI77/configure.in -libf2c/libI77/stamp-h.in: libf2c/libI77/configure.in -libf2c/libI77/config.h.in: libf2c/libI77/configure.in libf2c/libI77/stamp-h.in -libf2c/libU77/configure: libf2c/libU77/configure.in -libf2c/libU77/stamp-h.in: libf2c/libU77/configure.in libf2c/libU77/acconfig.h -libobjc/configure: libobjc/configure.in -# fastjar -fastjar/aclocal.m4: fastjar/configure.in -fastjar/Makefile.in: fastjar/Makefile.am fastjar/configure.in fastjar/aclocal.m4 -fastjar/configure: fastjar/configure.in fastjar/aclocal.m4 -fastjar/stamp-h.in: fastjar/configure.in fastjar/aclocal.m4 +libbanshee/configure: libbanshee/configure.ac +libmudflap/configure: libmudflap/configure.in +libobjc/configure: libobjc/configure.ac +zlib/aclocal.m4: zlib/configure.ac zlib/acinclude.m4 +zlib/Makefile.in: zlib/Makefile.am zlib/configure.ac zlib/aclocal.m4 +zlib/configure: zlib/configure.ac zlib/aclocal.m4 +fastjar/aclocal.m4: fastjar/configure.ac +fastjar/Makefile.in: fastjar/Makefile.am fastjar/configure.ac fastjar/aclocal.m4 +fastjar/configure: fastjar/configure.ac fastjar/aclocal.m4 boehm-gc/aclocal.m4: boehm-gc/configure.in boehm-gc/acinclude.m4 boehm-gc/Makefile.in: boehm-gc/Makefile.am boehm-gc/configure.in boehm-gc/aclocal.m4 boehm-gc/configure: boehm-gc/configure.in boehm-gc/aclocal.m4 +libada/configure: libada/configure.ac +libffi/aclocal.m4: libffi/configure.ac libffi/acinclude.m4 +libffi/Makefile.in: libffi/Makefile.am libffi/configure.ac libffi/aclocal.m4 +libffi/configure: libffi/configure.ac libffi/aclocal.m4 +libffi/fficonfig.h.in: libffi/configure.ac libffi/aclocal.m4 libjava/aclocal.m4: libjava/configure.in libjava/acinclude.m4 libjava/Makefile.in: libjava/Makefile.am libjava/configure.in libjava/aclocal.m4 libjava/configure: libjava/configure.in libjava/aclocal.m4 -libjava/libltdl/aclocal.m4: libjava/libltdl/configure.in libjava/libltdl/acinclude.m4 -libjava/libltdl/Makefile.in: libjava/libltdl/Makefile.am libjava/libltdl/configure.in libjava/libltdl/aclocal.m4 -libjava/libltdl/configure: libjava/libltdl/configure.in libjava/libltdl/aclocal.m4 -libjava/libltdl/stamp-h.in: libjava/libltdl/configure.in libjava/libltdl/aclocal.m4 libjava/libltdl/acconfig.h +libjava/libltdl/aclocal.m4: libjava/libltdl/configure.ac libjava/libltdl/acinclude.m4 +libjava/libltdl/Makefile.in: libjava/libltdl/Makefile.am libjava/libltdl/configure.ac libjava/libltdl/aclocal.m4 +libjava/libltdl/configure: libjava/libltdl/configure.ac libjava/libltdl/aclocal.m4 +libjava/libltdl/config-h.in: libjava/libltdl/configure.ac libjava/libltdl/aclocal.m4 +# Top level +Makefile.in: Makefile.tpl Makefile.def +configure: configure.in config/acx.m4 EOF } @@ -119,7 +118,7 @@ touch_files () { echo ' echo Touching $@... 1>&2; \' >> Makefile.$$ echo ' touch $@' >> Makefile.$$ files_and_dependencies | sed 's,[^ ]* ,,;s,$, :,' >> Makefile.$$ - while ${MAKE-make} -f Makefile.$$ all | grep . > /dev/null; do + while ${MAKE-make} -s -f Makefile.$$ all | grep . > /dev/null; do sleep 1 done 2>&1 rm -f Makefile.$$ @@ -211,7 +210,7 @@ else fi echo "Updating CVS tree" -cvs -q update ${1+"$@"} +$GCC_CVS -q update ${1+"$@"} if [ $? -ne 0 ]; then (touch_files_reexec) echo "CVS update of full tree failed." >&2