Skip to content

R
riscv-gcc-1
Commit 97075d3b by Rainer Orth Committed by Rainer Orth
Options

* gcc_update: Handle hg, too. 

From-SVN: r164246
parent 2f434b97
Showing with 107 additions and 57 deletions
contrib/ChangeLog
2010-09-13 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* gcc_update: Handle hg, too.
2010-07-08 Eric Botcazou <ebotcazou@adacore.com> 2010-07-08 Eric Botcazou <ebotcazou@adacore.com>
* make_sunver.pl: Remove extra whitespace in regexp. * make_sunver.pl: Remove extra whitespace in regexp.
......
contrib/gcc_update
#! /bin/sh #! /bin/sh
# #
# Update a local Subversion tree from the GCC repository, with an emphasis # Update a local Subversion, Git or Mercurial tree from the GCC
# on treating generated files correctly, so that autoconf, gperf et # repository, with an emphasis on treating generated files correctly, so
# al are not required for the ``end'' user. # 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 <pfeifer@dbai.tuwien.ac.at>, August 1998. # Originally by Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>, August 1998.
# #
# This script is Free Software, and it can be copied, distributed and # This script is Free Software, and it can be copied, distributed and
...@@ -12,8 +13,8 @@ ...@@ -12,8 +13,8 @@
# its license can be downloaded from http://www.gnu.org/copyleft/gpl.html # 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 # By default all command-line options are passed to `svn update` or `hg/git
# addition to $UPDATE_OPTIONS (defined below). If the first parameter # pull` in addition to $UPDATE_OPTIONS (defined below). If the first parameter
# reads --nostdflags, $UPDATE_OPTIONS as well as this parameter itself # reads --nostdflags, $UPDATE_OPTIONS as well as this parameter itself
# are omitted. # are omitted.
# #
...@@ -38,9 +39,7 @@ ...@@ -38,9 +39,7 @@
# contrib/gcc_update --list # contrib/gcc_update --list
# SVN command # Default options used when updating (none).
GCC_SVN=${GCC_SVN-${SVN-svn}}
# Default options used when updating via SVN (none).
UPDATE_OPTIONS="" UPDATE_OPTIONS=""
# Set the locale to C to make this script work for users with foreign # Set the locale to C to make this script work for users with foreign
...@@ -245,14 +244,18 @@ p ...@@ -245,14 +244,18 @@ p
esac esac
is_git=0 # Check for known version control systems.
# Check whether this indeed looks like a local SVN tree.
if [ -d .git ]; then if [ -d .git ]; then
GCC_GIT=${GCC_GIT-${GIT-git}} GCC_GIT=${GCC_GIT-${GIT-git}}
GCC_SVN="true -" vcs_type="git"
is_git=1 elif [ -d .hg ]; then
elif [ ! -d .svn ]; then GCC_HG=${GCC_HG-${HG-hg}}
echo "This does not seem to be a GCC SVN tree!" 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 exit
fi fi
...@@ -263,53 +266,96 @@ else ...@@ -263,53 +266,96 @@ else
set -- $UPDATE_OPTIONS ${1+"$@"} set -- $UPDATE_OPTIONS ${1+"$@"}
fi fi
if [ $is_git -eq 0 ]; then case $vcs_type in
chat "Updating SVN tree" git)
chat "Updating GIT tree"
$GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"} $GCC_GIT diff --quiet --exit-code HEAD
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
(touch_files_reexec) echo "Attempting to update a dirty git tree!" >&2
echo "SVN update of full tree failed." >&2 echo "Commit or stash your changes first and retry." >&2
exit 1 exit 1
fi 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 }'` revision=`$GCC_GIT log -n1 --pretty=%p:%t:%H`
branch=`svn info | sed -ne "/URL:/ { branch=`$GCC_GIT name-rev --name-only HEAD || :`
s,.*/trunk,trunk, ;;
s,.*/branches/,,
s,.*/tags/,, hg)
p 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 -u ${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
# Extract SVN revision corresponding to tip, 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.
revision=`$GCC_HG log --debug -l1 | \
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 date
echo "`TZ=UTC date` (revision $revision)" echo "`TZ=UTC date` (revision $revision)"
} > LAST_UPDATED } > LAST_UPDATED
echo "[$branch revision $revision]" > gcc/REVISION echo "[$branch revision $revision]" > gcc/REVISION
else
chat "Updating GIT tree"
$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
$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
rm -f LAST_UPDATED gcc/REVISION
revision=`$GCC_GIT log -n1 --pretty=%p:%t:%H`
branch=`$GCC_GIT name-rev --name-only HEAD || :`
{
date
echo "`TZ=UTC date` (revision $revision)"
} > LAST_UPDATED
echo "[$branch revision $revision]" > gcc/REVISION
fi
touch_files_reexec touch_files_reexec
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment