X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=contrib%2Fgcc_update;h=b989ffdc574b71890552927a5c475ec9597d42b2;hb=e63a44cedeaa326f1d9ef7576c0460438cb9073e;hp=f29dcb60927ffc773bd452e412a90b6021cd0264;hpb=b770e72c28caf7fdae9f72e7ae722a65f5854591;p=pf3gnuchains%2Fgcc-fork.git diff --git a/contrib/gcc_update b/contrib/gcc_update index f29dcb60927..b989ffdc574 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -1,10 +1,11 @@ #! /bin/sh # -# 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. +# Update a local Subversion, Git or Mercurial 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. # -# (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation +# (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 +# Free Software Foundation # Originally by Gerald Pfeifer , August 1998. # # This script is Free Software, and it can be copied, distributed and @@ -12,8 +13,8 @@ # 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 +# By default all command-line options are passed to `svn update` or `hg/git +# pull` in addition to $UPDATE_OPTIONS (defined below). If the first parameter # reads --nostdflags, $UPDATE_OPTIONS as well as this parameter itself # are omitted. # @@ -38,11 +39,15 @@ # contrib/gcc_update --list -# SVN command -GCC_SVN=${GCC_SVN-${SVN-svn}} -# Default options used when updating via SVN (none). +# Default options used when updating (none). UPDATE_OPTIONS="" +# Set the locale to C to make this script work for users with foreign +# locale like e.g. French UTF-8. +LANG=C +LC_ALL=C +export LANG LC_ALL + ######## Anything below shouldn't be changed by regular users. # Arrange for the value of $0 to be available for functions @@ -84,6 +89,9 @@ 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 +# lto-plugin +lto-plugin/configure: lto-plugin/configure.ac lto-plugin/aclocal.m4 +lto-plugin/Makefile.in: lto-plugin/Makefile.am lto-plugin/aclocal.m4 # And libraries, at last libbanshee/configure: libbanshee/configure.ac libmudflap/configure: libmudflap/configure.ac @@ -236,9 +244,18 @@ p esac -# 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!" +# Check for known version control systems. +if [ -d .git ]; then + GCC_GIT=${GCC_GIT-${GIT-git}} + vcs_type="git" +elif [ -d .hg ]; then + GCC_HG=${GCC_HG-${HG-hg}} + vcs_type="hg" +elif [ -d .svn ]; then + GCC_SVN=${GCC_SVN-${SVN-svn}} + vcs_type="svn" +else + echo "This does not seem to be a GCC GIT/HG/SVN tree!" exit fi @@ -249,29 +266,107 @@ else set -- $UPDATE_OPTIONS ${1+"$@"} fi -chat "Updating SVN tree" +case $vcs_type in + git) + chat "Updating GIT tree" -$GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"} -if [ $? -ne 0 ]; then - (touch_files_reexec) - echo "SVN update of full tree failed." >&2 - exit 1 -fi + $GCC_GIT diff --quiet --exit-code HEAD + if [ $? -ne 0 ]; then + echo "Attempting to update a dirty git tree!" >&2 + echo "Commit or stash your changes first and retry." >&2 + exit 1 + fi -rm -f LAST_UPDATED gcc/REVISION + $GCC_GIT pull ${silent+-q} --rebase ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "git pull of full tree failed." >&2 + exit 1 + fi -revision=`svn info | awk '/Revision:/ { print $2 }'` -branch=`svn info | sed -ne "/URL:/ { -s,.*/trunk,trunk, -s,.*/branches/,, -s,.*/tags/,, -p -}"` + revision=`$GCC_GIT log -n1 --pretty=%p:%t:%H` + branch=`$GCC_GIT name-rev --name-only HEAD || :` + ;; + + hg) + chat "Updating HG tree" + + # Add -q so untracked files aren't listed. + if [ `$GCC_HG status -q | wc -l` -gt 0 ]; then + echo "Attempting to update a dirty hg tree!" >&2 + echo "Commit or revert your changes first and retry." >&2 + exit 1 + fi + + # Check for mq extension. mq patches must be popped so tip has + # been converted from the SVN tree. + if [ -d .hg/patches ] && [ `$GCC_HG qapplied | wc -l` -gt 0 ]; then + # FIXME: Perhaps pop queue instead? We could do that since we + # know the tree is clean. + echo "Attempting to update hg tree with mq patches applied!" >&2 + echo "Pop your patches first and retry." >&2 + exit 1 + fi + + # Update tree, but make sure to only pull the default branch. + # Otherwise all branches in the upstream repo are added, even if + # only a single one has been cloned. + $GCC_HG pull ${silent+-q} -r`$GCC_HG branch` ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "hg pull of full tree failed." >&2 + exit 1 + fi + + # Update tree. Needs to be done separately from pull so + # gcc_update -rREV works. + $GCC_HG update ${silent+-q} ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "hg update of full tree failed." >&2 + exit 1 + fi + + # Extract SVN revision corresponding to parents, as stored by + # hg convert. Before hg 1.4.3, there's no template keyword + # corresponding to the extra: tag, so need to use hg log --debug + # to extract the info. + parents=`$GCC_HG parents --template '{rev}'` + revision=`$GCC_HG log --debug -r$parents | \ + sed -ne "/^extra:.*convert_revision=svn:/ { + s%^.*@%% + p + }"` + branch=`$GCC_HG branch` + # trunk in SVN parlance shows up as default branch in hg. + [ x$branch = x"default" ] && branch="trunk" + ;; + + svn) + chat "Updating SVN tree" + + $GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"} + if [ $? -ne 0 ]; then + (touch_files_reexec) + echo "SVN update of full tree failed." >&2 + exit 1 + fi + + revision=`svn info | awk '/Revision:/ { print $2 }'` + branch=`svn info | sed -ne "/URL:/ { + s,.*/trunk,trunk, + s,.*/branches/,, + s,.*/tags/,, + p + }"` + ;; +esac + +rm -f LAST_UPDATED gcc/REVISION { - date - echo "`TZ=UTC date` (revision $revision)" + date + echo "`TZ=UTC date` (revision $revision)" } > LAST_UPDATED - echo "[$branch revision $revision]" > gcc/REVISION touch_files_reexec