X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=contrib%2Fgcc_update;h=dc12c602afac587b77243c860b889b2ff1aada24;hp=a5c16393e8ed3b500afef0b2ff571c27af8c05bd;hb=b2e02dcc7c5b43e5088291a6c6b4bb60f9c4ce3c;hpb=a494652684252d3a4fb762ec320ec5d582236821 diff --git a/contrib/gcc_update b/contrib/gcc_update index a5c16393e8e..dc12c602afa 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -1,10 +1,18 @@ #! /bin/sh # -# Update a local CVS tree from the GCC repository, with an emphasis +# Update a local Subversion tree from the GCC repository, with an emphasis # on treating generated files correctly, so that autoconf, gperf et # al are not required for the ``end'' user. # -# By default all command-line options are passed to `cvs update` in +# (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation +# Originally by Gerald Pfeifer , August 1998. +# +# This script is Free Software, and it can be copied, distributed and +# modified as defined in the GNU General Public License. A copy of +# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html +# +# +# By default all command-line options are passed to `svn update` in # addition to $UPDATE_OPTIONS (defined below). If the first parameter # reads --nostdflags, $UPDATE_OPTIONS as well as this parameter itself # are omitted. @@ -12,50 +20,51 @@ # If the first parameter reads --patch, the second parameter is considered # a patch file. # -# If the first parameter is --touch, no cvs operation will be performed, +# If the first parameter is --touch, no svn operation will be performed, # only generated files that appear to be out of date in the local tree # will be touched. # # If the first parameter is --list, a list of the generated files and # their dependencies will be printed; --help prints this message. # +# If the first parameter is --silent, this script prints nothing other +# than error messages; the second parameter is then interpreted as above. +# # Examples: # -# contrib/gcc_update -r gcc_latest_snapshot -# contrib/gcc_update -A -# contrib/gcc_update --nostdflags -P -r gcc-2_95-branch gcc/testsuite +# contrib/gcc_update -r 8712 # contrib/gcc_update --patch some-patch # contrib/gcc_update --touch # contrib/gcc_update --list -# -# -# (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 -# modified as defined in the GNU General Public License. A copy of -# 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. -# Use -d to create any directories that exist in the repository but not -# locally. -# Use -A to reset any sticky tags, dates, or `-k' options. +# SVN command +GCC_SVN=${GCC_SVN-${SVN-svn}} +# Default options used when updating via SVN (none). +UPDATE_OPTIONS="" ######## Anything below shouldn't be changed by regular users. # Arrange for the value of $0 to be available for functions self=$0 +# This function prints its arguments to standard output unless +# "silent" is set. +unset silent +chat () { + if [ -z "$silent" ]; then + echo "$@" + fi +} + # This function prints a list of all generated files, along with their # dependencies. Note that only one target is supported per line: the # colon is stripped from the output. files_and_dependencies () { sed -e 's/ *#.*//' -e '/^$/d' -e 's/://' <<\EOF +# fixincludes +fixincludes/configure: fixincludes/configure.ac fixincludes/aclocal.m4 +fixincludes/config.h.in: fixincludes/configure.ac fixincludes/aclocal.m4 # intl library intl/plural.c: intl/plural.y intl/configure: intl/configure.ac intl/aclocal.m4 @@ -72,6 +81,9 @@ 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 +# Similarly, without this, you will see: +# direct2s.c:35: warning: current file is older than direct2.c +gcc/testsuite/gcc.dg/cpp/direct2s.c: gcc/testsuite/gcc.dg/cpp/direct2.c # And libraries, at last libbanshee/configure: libbanshee/configure.ac libmudflap/configure: libmudflap/configure.ac @@ -82,7 +94,7 @@ 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.ac boehm-gc/acinclude.m4 +boehm-gc/aclocal.m4: boehm-gc/configure.ac boehm-gc/Makefile.in: boehm-gc/Makefile.am boehm-gc/configure.ac boehm-gc/aclocal.m4 boehm-gc/configure: boehm-gc/configure.ac boehm-gc/aclocal.m4 libada/configure: libada/configure.ac @@ -93,19 +105,24 @@ libffi/fficonfig.h.in: libffi/configure.ac libffi/aclocal.m4 libgfortran/aclocal.m4: libgfortran/configure.ac libgfortran/acinclude.m4 libgfortran/Makefile.in: libgfortran/Makefile.am libgfortran/configure.ac libgfortran/aclocal.m4 libgfortran/configure: libgfortran/configure.ac libgfortran/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/aclocal.m4: libjava/configure.ac +libjava/Makefile.in: libjava/Makefile.am libjava/configure.ac libjava/aclocal.m4 +libjava/configure: libjava/configure.ac libjava/aclocal.m4 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 libcpp/aclocal.m4: libcpp/configure.ac -libcpp/Makefile.in: libcpp/Makefile.am libcpp/configure.ac libcpp/aclocal.m4 +libcpp/Makefile.in: libcpp/configure.ac libcpp/aclocal.m4 libcpp/configure: libcpp/configure.ac libcpp/aclocal.m4 +libgomp/aclocal.m4: libgomp/configure.ac libgomp/acinclude.m4 +libgomp/Makefile.in: libgomp/Makefile.am libgomp/aclocal.m4 +libgomp/testsuite/Makefile.in: libgomp/Makefile.am libgomp/aclocal.m4 +libgomp/configure: libgomp/configure.ac libgomp/aclocal.m4 +libgomp/config.h.in: libgomp/configure.ac libgomp/aclocal.m4 # Top level Makefile.in: Makefile.tpl Makefile.def -configure: configure.in config/acx.m4 +configure: configure.ac config/acx.m4 EOF } @@ -122,10 +139,19 @@ touch_files () { echo ':' >> Makefile.$$ echo ' @for f in $? $@; do test -f $$f || exit 0; done; \' >> Makefile.$$ echo ' echo Touching $@...; \' >> Makefile.$$ - echo ' echo Touching $@... 1>&2; \' >> Makefile.$$ + chat ' echo Touching $@... 1>&2; \' >> Makefile.$$ echo ' touch $@' >> Makefile.$$ files_and_dependencies | sed 's,[^ ]* ,,;s,$, :,' >> Makefile.$$ - while ${MAKE-make} -s -f Makefile.$$ all | grep . > /dev/null; do + + # We would have to explicitly shut off the "Entering... Leaving..." + # messages through "--no-print-directory" to handle the case when + # we were called from a recursive invocation (i.e. "$(MAKE)" in a + # Makefile, not just make). Passing only "-s" doesn't help then, + # because make has helpfully added "-w" to MAKEFLAGS automatically. + # Unfortunately we do not require GNU make other than for building + # and testing, so let's just grep known text explicitly echoed by + # the rule. + while ${MAKE-make} -s -f Makefile.$$ all | grep Touching > /dev/null; do sleep 1 done 2>&1 rm -f Makefile.$$ @@ -136,21 +162,21 @@ touch_files () { # this script. By re-execing it, we ensure that the appropriate # dependencies and rules will be used. touch_files_reexec () { - echo "Adjusting file timestamps" - exec ${CONFIG_SHELL-/bin/sh} $self --touch + chat "Adjusting file timestamps" + exec ${CONFIG_SHELL-/bin/sh} $self ${silent+"--silent"} --touch } # This functions applies a patch to an existing tree. apply_patch () { - if [ -f $1 ]; then + if [ -f "$1" ]; then echo "Applying patch file $1" - case "$1" in + case $1 in *gz) - gzip -d -c $1 | patch -p1 ;; + gzip -d -c "$1" | patch -p1 ;; *bz2) - bzip2 -d -c $1 | patch -p1 ;; + bzip2 -d -c "$1" | patch -p1 ;; *) - cat $1 | patch -p1 ;; + patch -p1 < "$1";; esac fi touch_files_reexec @@ -163,6 +189,13 @@ if [ ! -f gcc/version.c ]; then fi case "$1" in +--silent) + silent=t + shift + ;; +esac + +case "$1" in # First of all, check whether we are going to process a patch. --patch) if test "$#" != 2; then @@ -203,9 +236,9 @@ p esac -# Check whether this indeed looks like a local CVS tree. -if [ ! -d CVS ]; then - echo "This does not seem to be a GCC CVS tree!" +# Check whether this indeed looks like a local SVN tree. +if [ ! -d .svn ]; then + echo "This does not seem to be a GCC SVN tree!" exit fi @@ -216,16 +249,17 @@ else set -- $UPDATE_OPTIONS ${1+"$@"} fi -echo "Updating CVS tree" -$GCC_CVS -q update ${1+"$@"} +chat "Updating SVN tree" + +$GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"} if [ $? -ne 0 ]; then (touch_files_reexec) - echo "CVS update of full tree failed." >&2 + echo "SVN update of full tree failed." >&2 exit 1 fi { date - TZ=UTC date + echo "`TZ=UTC date` (revision `svnversion .`)" } > LAST_UPDATED touch_files_reexec