]>
Commit | Line | Data |
---|---|---|
f717c7e4 GP |
1 | #! /bin/sh |
2 | # | |
97075d3b RO |
3 | # Update a local Subversion, Git or Mercurial tree from the GCC |
4 | # repository, with an emphasis on treating generated files correctly, so | |
5 | # that autoconf, gperf et al are not required for the ``end'' user. | |
f717c7e4 | 6 | # |
51155089 | 7 | # (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, |
b2bcb1b3 GP |
8 | # 2010, 2011, 2012, 2013, 2014, 2015, 2017 Free Software Foundation |
9 | # Originally by Gerald Pfeifer <gerald@pfeifer.com>, August 1998. | |
1b9f940b DB |
10 | # |
11 | # This script is Free Software, and it can be copied, distributed and | |
12 | # modified as defined in the GNU General Public License. A copy of | |
13 | # its license can be downloaded from http://www.gnu.org/copyleft/gpl.html | |
14 | # | |
15 | # | |
97075d3b RO |
16 | # By default all command-line options are passed to `svn update` or `hg/git |
17 | # pull` in addition to $UPDATE_OPTIONS (defined below). If the first parameter | |
9b14b81c | 18 | # reads --nostdflags, $UPDATE_OPTIONS as well as this parameter itself |
12acf3a9 AJ |
19 | # are omitted. |
20 | # | |
9d59f307 GP |
21 | # If the first parameter reads --patch, the second parameter is considered |
22 | # a patch file. | |
12acf3a9 | 23 | # |
1b9f940b | 24 | # If the first parameter is --touch, no svn operation will be performed, |
94b82f2b AO |
25 | # only generated files that appear to be out of date in the local tree |
26 | # will be touched. | |
27 | # | |
28 | # If the first parameter is --list, a list of the generated files and | |
29 | # their dependencies will be printed; --help prints this message. | |
30 | # | |
2d072788 ZW |
31 | # If the first parameter is --silent, this script prints nothing other |
32 | # than error messages; the second parameter is then interpreted as above. | |
33 | # | |
9b14b81c GP |
34 | # Examples: |
35 | # | |
1b9f940b | 36 | # contrib/gcc_update -r 8712 |
b9550bfb GP |
37 | # contrib/gcc_update --patch some-patch |
38 | # contrib/gcc_update --touch | |
39 | # contrib/gcc_update --list | |
23a05d03 | 40 | |
f717c7e4 | 41 | |
97075d3b | 42 | # Default options used when updating (none). |
1b9f940b | 43 | UPDATE_OPTIONS="" |
6cf735a7 | 44 | |
c334c130 BS |
45 | # Set the locale to C to make this script work for users with foreign |
46 | # locale like e.g. French UTF-8. | |
47 | LANG=C | |
48 | LC_ALL=C | |
49 | export LANG LC_ALL | |
50 | ||
6cf735a7 | 51 | ######## Anything below shouldn't be changed by regular users. |
f717c7e4 | 52 | |
fda73e41 AO |
53 | # Arrange for the value of $0 to be available for functions |
54 | self=$0 | |
f717c7e4 | 55 | |
2d072788 ZW |
56 | # This function prints its arguments to standard output unless |
57 | # "silent" is set. | |
7e3c8f17 | 58 | unset silent |
2d072788 ZW |
59 | chat () { |
60 | if [ -z "$silent" ]; then | |
61 | echo "$@" | |
62 | fi | |
63 | } | |
64 | ||
94b82f2b AO |
65 | # This function prints a list of all generated files, along with their |
66 | # dependencies. Note that only one target is supported per line: the | |
67 | # colon is stripped from the output. | |
68 | files_and_dependencies () { | |
69 | sed -e 's/ *#.*//' -e '/^$/d' -e 's/://' <<\EOF | |
71b5d516 PB |
70 | # fixincludes |
71 | fixincludes/configure: fixincludes/configure.ac fixincludes/aclocal.m4 | |
72 | fixincludes/config.h.in: fixincludes/configure.ac fixincludes/aclocal.m4 | |
fd776d09 | 73 | fixincludes/fixincl.x: fixincludes/inclhack.def fixincludes/fixincl.tpl |
6eb95e99 ZW |
74 | # intl library |
75 | intl/plural.c: intl/plural.y | |
437eea66 | 76 | intl/plural-config.h: intl/plural.y |
61c3ff8f AP |
77 | intl/configure: intl/configure.ac intl/aclocal.m4 |
78 | intl/config.h.in: intl/configure.ac intl/aclocal.m4 | |
94b82f2b | 79 | # Now, proceed to gcc automatically generated files |
c5d1156b AP |
80 | gcc/configure: gcc/configure.ac |
81 | gcc/cstamp-h.in: gcc/configure.ac | |
1a618a5a | 82 | gcc/config.in: gcc/cstamp-h.in |
94b82f2b | 83 | gcc/fixinc/fixincl.x: gcc/fixinc/fixincl.tpl gcc/fixinc/inclhack.def |
37f14a0d | 84 | gcc/config/aarch64/aarch64-tune.md: gcc/config/aarch64/aarch64-cores.def gcc/config/aarch64/gentune.sh |
a92ffb3e RE |
85 | gcc/config/arm/arm-tune.md: gcc/config/arm/arm-cpus.in gcc/config/arm/parsecpu.awk |
86 | gcc/config/arm/arm-tables.opt: gcc/config/arm/arm-cpus.in gcc/config/arm/parsecpu.awk | |
bcead286 BS |
87 | gcc/config/c6x/c6x-tables.opt: gcc/config/c6x/c6x-isas.def gcc/config/c6x/genopt.sh |
88 | gcc/config/c6x/c6x-sched.md: gcc/config/c6x/c6x-sched.md.in gcc/config/c6x/gensched.sh | |
89 | gcc/config/c6x/c6x-mult.md: gcc/config/c6x/c6x-mult.md.in gcc/config/c6x/genmult.sh | |
562d014e | 90 | gcc/config/loongarch/loongarch-str.h: gcc/config/loongarch/genopts/genstr.sh gcc/config/loongarch/genopts/loongarch-strings |
b44786f6 | 91 | gcc/config/loongarch/loongarch.opt: gcc/config/loongarch/genopts/genstr.sh gcc/config/loongarch/genopts/loongarch.opt.in |
47c94d21 | 92 | gcc/config/m68k/m68k-tables.opt: gcc/config/m68k/m68k-devices.def gcc/config/m68k/m68k-isas.def gcc/config/m68k/m68k-microarchs.def gcc/config/m68k/genopt.sh |
d371df6f | 93 | gcc/config/mips/mips-tables.opt: gcc/config/mips/mips-cpus.def gcc/config/mips/genopt.sh |
f10d3ac9 | 94 | gcc/config/rs6000/rs6000-tables.opt: gcc/config/rs6000/rs6000-cpus.def gcc/config/rs6000/genopt.sh |
05c93a63 | 95 | gcc/config/rs6000/fusion.md: gcc/config/rs6000/genfusion.pl |
94b82f2b | 96 | # And then, language-specific files |
029d882c | 97 | gcc/cp/cfns.h: gcc/cp/cfns.gperf |
0c92f895 | 98 | gcc/cp/std-name-hint.h: gcc/cp/std-name-hint.gperf |
a2e28389 | 99 | gcc/cp/std-name-hint.gperf: gcc/cp/cxxapi-data.csv |
51155089 GM |
100 | gcc/m2/configure: gcc/m2/configure.ac |
101 | gcc/m2/gm2config.h.in: gcc/m2/configure.ac | |
102 | gcc/m2/gm2-libs/config-host: gcc/m2/gm2-libs/config-host.in | |
e4048ffc JT |
103 | # testsuite |
104 | # Without this, _Pragma3.c can have a false negative. | |
105 | gcc/testsuite/gcc.dg/cpp/_Pragma3.c: gcc/testsuite/gcc.dg/cpp/mi1c.h | |
6d409e8a HPN |
106 | # Similarly, without this, you will see: |
107 | # direct2s.c:35: warning: current file is older than direct2.c | |
108 | gcc/testsuite/gcc.dg/cpp/direct2s.c: gcc/testsuite/gcc.dg/cpp/direct2.c | |
d7f09764 | 109 | # lto-plugin |
fd776d09 | 110 | lto-plugin/aclocal.m4: lto-plugin/configure.ac |
d7f09764 DN |
111 | lto-plugin/configure: lto-plugin/configure.ac lto-plugin/aclocal.m4 |
112 | lto-plugin/Makefile.in: lto-plugin/Makefile.am lto-plugin/aclocal.m4 | |
09616422 NS |
113 | # tools |
114 | c++tools/configure: c++tools/configure.ac | |
115 | c++tools/config.h.in: c++tools/configure.ac | |
94b82f2b | 116 | # And libraries, at last |
9e953fed | 117 | libbanshee/configure: libbanshee/configure.ac |
5a4f1818 | 118 | libmudflap/configure: libmudflap/configure.ac |
3adc31d1 | 119 | libobjc/configure: libobjc/configure.ac |
5b03e555 KC |
120 | zlib/aclocal.m4: zlib/configure.ac zlib/acinclude.m4 |
121 | zlib/Makefile.in: zlib/Makefile.am zlib/configure.ac zlib/aclocal.m4 | |
122 | zlib/configure: zlib/configure.ac zlib/aclocal.m4 | |
a4b0b8f1 KC |
123 | fastjar/aclocal.m4: fastjar/configure.ac |
124 | fastjar/Makefile.in: fastjar/Makefile.am fastjar/configure.ac fastjar/aclocal.m4 | |
125 | fastjar/configure: fastjar/configure.ac fastjar/aclocal.m4 | |
9a399055 | 126 | boehm-gc/aclocal.m4: boehm-gc/configure.ac |
cc605afe | 127 | boehm-gc/Makefile.in: boehm-gc/Makefile.am boehm-gc/configure.ac boehm-gc/aclocal.m4 |
bf9a420e | 128 | boehm-gc/configure: boehm-gc/configure.ac boehm-gc/aclocal.m4 |
4f5b645a | 129 | libada/configure: libada/configure.ac |
7de53bca AT |
130 | libffi/aclocal.m4: libffi/configure.ac libffi/acinclude.m4 |
131 | libffi/Makefile.in: libffi/Makefile.am libffi/configure.ac libffi/aclocal.m4 | |
132 | libffi/configure: libffi/configure.ac libffi/aclocal.m4 | |
133 | libffi/fficonfig.h.in: libffi/configure.ac libffi/aclocal.m4 | |
dbfa8d15 AJ |
134 | libgfortran/aclocal.m4: libgfortran/configure.ac libgfortran/acinclude.m4 |
135 | libgfortran/Makefile.in: libgfortran/Makefile.am libgfortran/configure.ac libgfortran/aclocal.m4 | |
51155089 GM |
136 | libgm2/Makefile.in: libgm2/Makefile.am libgm2/configure.ac libgm2/aclocal.m4 |
137 | libgm2/aclocal.m4: libgm2/configure.ac | |
138 | libgm2/libm2cor/Makefile.in: libgm2/libm2cor/Makefile.am | |
139 | libgm2/libm2pim/Makefile.in: libgm2/libm2pim/Makefile.am | |
140 | libgm2/libm2iso/Makefile.in: libgm2/libm2iso/Makefile.am | |
141 | libgm2/libm2log/Makefile.in: libgm2/libm2log/Makefile.am | |
142 | libgm2/libm2min/Makefile.in: libgm2/libm2min/Makefile.am | |
36a41ef1 TB |
143 | libquadmath/configure: libquadmath/configure.ac libquadmath/aclocal.m4 |
144 | libquadmath/aclocal.m4: libquadmath/configure.ac libquadmath/acinclude.m4 | |
145 | libquadmath/Makefile.in: libquadmath/Makefile.am libquadmath/configure.ac libgfortran/aclocal.m4 | |
dbfa8d15 | 146 | libgfortran/configure: libgfortran/configure.ac libgfortran/aclocal.m4 |
3d5e3eb4 | 147 | libcody/configure: libcody/configure.ac libcody/config.m4 |
d5ad6feb | 148 | libcpp/aclocal.m4: libcpp/configure.ac |
5b292a4b | 149 | libcpp/Makefile.in: libcpp/configure.ac libcpp/aclocal.m4 |
d5ad6feb | 150 | libcpp/configure: libcpp/configure.ac libcpp/aclocal.m4 |
953ff289 | 151 | libgomp/aclocal.m4: libgomp/configure.ac libgomp/acinclude.m4 |
41dbbb37 | 152 | libgomp/Makefile.am: libgomp/plugin/Makefrag.am |
953ff289 | 153 | libgomp/Makefile.in: libgomp/Makefile.am libgomp/aclocal.m4 |
cd13be9b | 154 | libgomp/testsuite/Makefile.in: libgomp/testsuite/Makefile.am libgomp/aclocal.m4 |
41dbbb37 | 155 | libgomp/configure.ac: libgomp/plugin/configfrag.ac |
953ff289 DN |
156 | libgomp/configure: libgomp/configure.ac libgomp/aclocal.m4 |
157 | libgomp/config.h.in: libgomp/configure.ac libgomp/aclocal.m4 | |
f37c55c1 PEP |
158 | libgrust/Makefile.in: libgrust/Makefile.am libgrust/aclocal.m4 |
159 | libgrust/aclocal.m4: libgrust/configure.ac | |
160 | libgrust/configure: libgrust/configure.ac libgrust/aclocal.m4 | |
161 | libgrust/libproc_macro_internal/Makefile.in: libgrust/libproc_macro_internal/Makefile.am libgrust/aclocal.m4 | |
0a35513e AH |
162 | libitm/aclocal.m4: libitm/configure.ac libitm/acinclude.m4 |
163 | libitm/Makefile.in: libitm/Makefile.am libitm/aclocal.m4 | |
164 | libitm/testsuite/Makefile.in: libitm/testsuite/Makefile.am libitm/aclocal.m4 | |
165 | libitm/configure: libitm/configure.ac libitm/aclocal.m4 | |
166 | libitm/config.h.in: libitm/configure.ac libitm/aclocal.m4 | |
48310492 RH |
167 | libatomic/aclocal.m4: libatomic/configure.ac libatomic/acinclude.m4 |
168 | libatomic/Makefile.in: libatomic/Makefile.am libatomic/aclocal.m4 | |
169 | libatomic/testsuite/Makefile.in: libatomic/testsuite/Makefile.am libatomic/aclocal.m4 | |
170 | libatomic/configure: libatomic/configure.ac libatomic/aclocal.m4 | |
171 | libatomic/auto-config.h.in: libatomic/configure.ac libatomic/aclocal.m4 | |
451a210d | 172 | libsanitizer/aclocal.m4: libsanitizer/configure.ac libsanitizer/acinclude.m4 |
6671a4e4 L |
173 | libsanitizer/Makefile.in: libsanitizer/Makefile.am libsanitizer/aclocal.m4 |
174 | libsanitizer/configure: libsanitizer/configure.ac libsanitizer/aclocal.m4 | |
451a210d L |
175 | libsanitizer/asan/Makefile.in: libsanitizer/asan/Makefile.am libsanitizer/aclocal.m4 |
176 | libsanitizer/interception/Makefile.in: libsanitizer/interception/Makefile.am libsanitizer/aclocal.m4 | |
177 | libsanitizer/sanitizer_common/Makefile.in: libsanitizer/sanitizer_common/Makefile.am libsanitizer/aclocal.m4 | |
2077db1b CT |
178 | libvtv/aclocal.m4: libvtv/configure.ac libvtv/acinclude.m4 |
179 | libvtv/Makefile.in: libvtv/Makefile.am libvtv/aclocal.m4 | |
180 | libvtv/configure: libvtv/configure.ac libvtv/aclocal.m4 | |
22381c22 TS |
181 | libbacktrace/aclocal.m4: libbacktrace/configure.ac |
182 | libbacktrace/Makefile.in: libbacktrace/Makefile.am libbacktrace/aclocal.m4 | |
183 | libbacktrace/configure: libbacktrace/configure.ac libbacktrace/aclocal.m4 | |
184 | libbacktrace/config.h.in: libbacktrace/configure.ac libbacktrace/aclocal.m4 | |
357044d2 RO |
185 | libphobos/Makefile.in: libphobos/Makefile.am libphobos/configure.ac libphobos/aclocal.m4 |
186 | libphobos/aclocal.m4: libphobos/configure.ac libphobos/acinclude.m4 | |
187 | libphobos/config.h.in: libphobos/configure.ac libphobos/aclocal.m4 | |
188 | libphobos/configure: libphobos/configure.ac libphobos/aclocal.m4 | |
189 | libphobos/src/Makefile.in: libphobos/src/Makefile.am libphobos/aclocal.m4 | |
190 | libphobos/testsuite/Makefile.in: libphobos/testsuite/Makefile.am libphobos/aclocal.m4 | |
fd776d09 JW |
191 | libstdc++-v3/aclocal.m4: libstdc++-v3/configure.ac libstdc++-v3/acinclude.m4 |
192 | libstdc++-v3/Makefile.in: libstdc++-v3/Makefile.am libstdc++-v3/aclocal.m4 | |
193 | libstdc++-v3/configure: libstdc++-v3/configure.ac libstdc++-v3/acinclude.m4 | |
034dd425 | 194 | libstdc++-v3/include/bits/version.h: libstdc++-v3/include/bits/version.def libstdc++-v3/include/bits/version.tpl |
fd776d09 JW |
195 | libcc1/aclocal.m4: libcc1/configure.ac |
196 | libcc1/Makefile.in: libcc1/Makefile.am libcc1/configure.ac libcc1/aclocal.m4 | |
197 | libcc1/configure: libcc1/configure.ac | |
95ddd785 NN |
198 | # Top level |
199 | Makefile.in: Makefile.tpl Makefile.def | |
61930fe5 | 200 | configure: configure.ac config/acx.m4 |
94b82f2b AO |
201 | EOF |
202 | } | |
203 | ||
204 | ||
9d59f307 GP |
205 | # This function touches generated files such that the ``end'' user does |
206 | # not have to rebuild them. | |
94b82f2b | 207 | touch_files () { |
e8b073c1 AO |
208 | rm -f Makefile.$$ |
209 | echo 'all: \' > Makefile.$$ | |
210 | files_and_dependencies | sed 's, .*, \\,' >> Makefile.$$ | |
211 | echo '; @true' >> Makefile.$$ | |
212 | files_and_dependencies | sed 's, ,: ,' >> Makefile.$$ | |
213 | files_and_dependencies | sed 's, .*, \\,' >> Makefile.$$ | |
214 | echo ':' >> Makefile.$$ | |
29a948c8 | 215 | echo ' @for f in $? $@; do test -f $$f || exit 0; done; \' >> Makefile.$$ |
e8b073c1 | 216 | echo ' echo Touching $@...; \' >> Makefile.$$ |
2d072788 | 217 | chat ' echo Touching $@... 1>&2; \' >> Makefile.$$ |
e8b073c1 AO |
218 | echo ' touch $@' >> Makefile.$$ |
219 | files_and_dependencies | sed 's,[^ ]* ,,;s,$, :,' >> Makefile.$$ | |
18ccc7e0 | 220 | |
9eaf7da0 | 221 | # We would have to explicitly shut off the "Entering... Leaving..." |
18ccc7e0 HPN |
222 | # messages through "--no-print-directory" to handle the case when |
223 | # we were called from a recursive invocation (i.e. "$(MAKE)" in a | |
224 | # Makefile, not just make). Passing only "-s" doesn't help then, | |
225 | # because make has helpfully added "-w" to MAKEFLAGS automatically. | |
9eaf7da0 HPN |
226 | # Unfortunately we do not require GNU make other than for building |
227 | # and testing, so let's just grep known text explicitly echoed by | |
228 | # the rule. | |
229 | while ${MAKE-make} -s -f Makefile.$$ all | grep Touching > /dev/null; do | |
e8b073c1 AO |
230 | sleep 1 |
231 | done 2>&1 | |
232 | rm -f Makefile.$$ | |
9d59f307 GP |
233 | } |
234 | ||
e8b073c1 | 235 | |
25a9b3e5 AO |
236 | # Whenever we update the tree or install a patch, we may be modifying |
237 | # this script. By re-execing it, we ensure that the appropriate | |
238 | # dependencies and rules will be used. | |
239 | touch_files_reexec () { | |
2d072788 ZW |
240 | chat "Adjusting file timestamps" |
241 | exec ${CONFIG_SHELL-/bin/sh} $self ${silent+"--silent"} --touch | |
12acf3a9 | 242 | } |
9d59f307 GP |
243 | |
244 | # This functions applies a patch to an existing tree. | |
94b82f2b | 245 | apply_patch () { |
d028e149 | 246 | if [ -f "$1" ]; then |
9d59f307 | 247 | echo "Applying patch file $1" |
d028e149 | 248 | case $1 in |
9d59f307 | 249 | *gz) |
d028e149 | 250 | gzip -d -c "$1" | patch -p1 ;; |
5c96cc3b | 251 | *bz2) |
d028e149 | 252 | bzip2 -d -c "$1" | patch -p1 ;; |
9d59f307 | 253 | *) |
d028e149 | 254 | patch -p1 < "$1";; |
9d59f307 GP |
255 | esac |
256 | fi | |
25a9b3e5 | 257 | touch_files_reexec |
9d59f307 GP |
258 | } |
259 | ||
9d59f307 | 260 | # Check whether this indeed looks like a local tree. |
e53b6e56 | 261 | if [ ! -f gcc/reload.cc ]; then |
b9550bfb | 262 | echo "This does not seem to be a GCC tree!" |
9d59f307 | 263 | exit |
f717c7e4 GP |
264 | fi |
265 | ||
2d072788 ZW |
266 | case "$1" in |
267 | --silent) | |
268 | silent=t | |
269 | shift | |
270 | ;; | |
271 | esac | |
272 | ||
94b82f2b | 273 | case "$1" in |
9d59f307 | 274 | # First of all, check whether we are going to process a patch. |
12acf3a9 | 275 | --patch) |
94b82f2b AO |
276 | if test "$#" != 2; then |
277 | echo "$1" expects only one argument >&2 | |
278 | exit 1 | |
279 | fi | |
280 | apply_patch "${2}" | |
281 | exit $? | |
282 | ;; | |
283 | ||
284 | --touch) | |
285 | if test "$#" != 1; then | |
286 | echo "$1" does not expect any argument >&2 | |
287 | exit 1 | |
288 | fi | |
289 | touch_files | |
290 | exit $? | |
291 | ;; | |
292 | ||
293 | --list) | |
294 | if test "$#" != 1; then | |
295 | echo "$1" does not expect any argument >&2 | |
296 | exit 1 | |
297 | fi | |
298 | files_and_dependencies | sed 's/ /: /' | |
299 | exit $? | |
300 | ;; | |
301 | ||
302 | --help) | |
303 | sed -e '1,2d' -e '/^UPDATE_OPTIONS=/{i\ | |
304 | \ | |
305 | ||
306 | p | |
307 | }' \ | |
308 | -e '/^$/,$d' -e 's/#//' -e 's/^ //' < $0 | |
309 | exit $? | |
310 | ;; | |
311 | ||
312 | esac | |
9d59f307 | 313 | |
97075d3b | 314 | # Check for known version control systems. |
254f7933 | 315 | if [ -d .git ] || [ -f .git ]; then |
e31a6dc2 | 316 | GCC_GIT=${GCC_GIT-${GIT-git}} |
97075d3b RO |
317 | vcs_type="git" |
318 | elif [ -d .hg ]; then | |
319 | GCC_HG=${GCC_HG-${HG-hg}} | |
320 | vcs_type="hg" | |
321 | elif [ -d .svn ]; then | |
322 | GCC_SVN=${GCC_SVN-${SVN-svn}} | |
323 | vcs_type="svn" | |
324 | else | |
325 | echo "This does not seem to be a GCC GIT/HG/SVN tree!" | |
9d59f307 GP |
326 | exit |
327 | fi | |
9b14b81c | 328 | |
9d59f307 | 329 | # Check command-line options |
9b14b81c GP |
330 | if [ x"${1}"x = x"--nostdflags"x ]; then |
331 | shift | |
332 | else | |
333 | set -- $UPDATE_OPTIONS ${1+"$@"} | |
334 | fi | |
335 | ||
97075d3b RO |
336 | case $vcs_type in |
337 | git) | |
338 | chat "Updating GIT tree" | |
2d072788 | 339 | |
97075d3b RO |
340 | $GCC_GIT diff --quiet --exit-code HEAD |
341 | if [ $? -ne 0 ]; then | |
342 | echo "Attempting to update a dirty git tree!" >&2 | |
343 | echo "Commit or stash your changes first and retry." >&2 | |
344 | exit 1 | |
345 | fi | |
f717c7e4 | 346 | |
97075d3b RO |
347 | $GCC_GIT pull ${silent+-q} --rebase ${1+"$@"} |
348 | if [ $? -ne 0 ]; then | |
349 | (touch_files_reexec) | |
350 | echo "git pull of full tree failed." >&2 | |
351 | exit 1 | |
352 | fi | |
36dcf055 | 353 | |
78b34cd8 SB |
354 | # Open-coded version of "git gcc-descr" from contrib/gcc-git-customization.sh |
355 | revision=`$GCC_GIT log -n1 --pretty=tformat:%h` | |
356 | r=`$GCC_GIT describe --all --match 'basepoints/gcc-[0-9]*' HEAD \ | |
357 | | sed -n 's,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)-\([0-9]\+\)-g[0-9a-f]*$,r\2-\3,p;s,^\(tags/\)\?basepoints/gcc-\([0-9]\+\)$,r\2-0,p'`; | |
df633382 | 358 | if test -n "$r"; then |
78b34cd8 SB |
359 | o=`$GCC_GIT config --get gcc-config.upstream`; |
360 | rr=`echo $r | sed -n 's,^r\([0-9]\+\)-[0-9]\+\(-g[0-9a-f]\+\)\?$,\1,p'`; | |
361 | if $GCC_GIT rev-parse --verify --quiet ${o:-origin}/releases/gcc-$rr >/dev/null; then | |
362 | m=releases/gcc-$rr; | |
363 | else | |
364 | m=master; | |
365 | fi; | |
366 | if $GCC_GIT merge-base --is-ancestor HEAD ${o:-origin}/$m; then | |
367 | revision=${r}-g${revision}; | |
368 | fi | |
369 | fi | |
97075d3b | 370 | branch=`$GCC_GIT name-rev --name-only HEAD || :` |
51155089 | 371 | ;; |
97075d3b RO |
372 | |
373 | hg) | |
374 | chat "Updating HG tree" | |
375 | ||
376 | # Add -q so untracked files aren't listed. | |
377 | if [ `$GCC_HG status -q | wc -l` -gt 0 ]; then | |
378 | echo "Attempting to update a dirty hg tree!" >&2 | |
379 | echo "Commit or revert your changes first and retry." >&2 | |
380 | exit 1 | |
381 | fi | |
382 | ||
383 | # Check for mq extension. mq patches must be popped so tip has | |
384 | # been converted from the SVN tree. | |
385 | if [ -d .hg/patches ] && [ `$GCC_HG qapplied | wc -l` -gt 0 ]; then | |
386 | # FIXME: Perhaps pop queue instead? We could do that since we | |
387 | # know the tree is clean. | |
388 | echo "Attempting to update hg tree with mq patches applied!" >&2 | |
389 | echo "Pop your patches first and retry." >&2 | |
390 | exit 1 | |
391 | fi | |
392 | ||
393 | # Update tree, but make sure to only pull the default branch. | |
394 | # Otherwise all branches in the upstream repo are added, even if | |
395 | # only a single one has been cloned. | |
6832435e | 396 | $GCC_HG pull ${silent+-q} -r`$GCC_HG branch` ${1+"$@"} |
97075d3b RO |
397 | if [ $? -ne 0 ]; then |
398 | (touch_files_reexec) | |
399 | echo "hg pull of full tree failed." >&2 | |
400 | exit 1 | |
401 | fi | |
402 | ||
6832435e RO |
403 | # Update tree. Needs to be done separately from pull so |
404 | # gcc_update -rREV works. | |
405 | $GCC_HG update ${silent+-q} ${1+"$@"} | |
406 | if [ $? -ne 0 ]; then | |
407 | (touch_files_reexec) | |
408 | echo "hg update of full tree failed." >&2 | |
409 | exit 1 | |
410 | fi | |
411 | ||
412 | # Extract SVN revision corresponding to parents, as stored by | |
413 | # hg convert. Before hg 1.4.3, there's no template keyword | |
414 | # corresponding to the extra: tag, so need to use hg log --debug | |
415 | # to extract the info. | |
416 | parents=`$GCC_HG parents --template '{rev}'` | |
39b75e51 | 417 | convert_revision=`$GCC_HG log --debug -r$parents | \ |
97075d3b | 418 | sed -ne "/^extra:.*convert_revision=svn:/ { |
39b75e51 | 419 | s%^[^/]*/%% |
97075d3b RO |
420 | p |
421 | }"` | |
39b75e51 RO |
422 | revision=`echo $convert_revision | sed -e 's/.*@//'` |
423 | branch=`echo $convert_revision | sed -e 's%branches/%%' -e 's/@.*//'` | |
97075d3b RO |
424 | ;; |
425 | ||
426 | svn) | |
427 | chat "Updating SVN tree" | |
428 | ||
429 | $GCC_SVN ${silent+-q} --non-interactive update ${1+"$@"} | |
430 | if [ $? -ne 0 ]; then | |
431 | (touch_files_reexec) | |
432 | echo "SVN update of full tree failed." >&2 | |
433 | exit 1 | |
434 | fi | |
435 | ||
c75e90f3 | 436 | revision=`$GCC_SVN info | awk '/Revision:/ { print $2 }'` |
6e39ee0c | 437 | branch=`$GCC_SVN info | sed -ne "/^URL:/ { |
97075d3b RO |
438 | s,.*/trunk,trunk, |
439 | s,.*/branches/,, | |
440 | s,.*/tags/,, | |
441 | p | |
442 | }"` | |
443 | ;; | |
444 | esac | |
445 | ||
446 | rm -f LAST_UPDATED gcc/REVISION | |
2a08c780 | 447 | { |
97075d3b RO |
448 | date |
449 | echo "`TZ=UTC date` (revision $revision)" | |
2a08c780 | 450 | } > LAST_UPDATED |
78b34cd8 | 451 | echo "[$branch $revision]" > gcc/REVISION |
36dcf055 | 452 | |
25a9b3e5 | 453 | touch_files_reexec |