diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2022-12-27 08:15:37 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2022-12-27 10:02:41 -0800 |
commit | 8319b1927b2763e7b0bb39a0c5a310078f2dfe86 (patch) | |
tree | e2d1703efcb1a419fefe9826f4d7c922eaa30a2c /top | |
parent | 064ce98a651bd3f16b65aa4082c95d540648257e (diff) | |
download | gnulib-8319b1927b2763e7b0bb39a0c5a310078f2dfe86.tar.gz |
Bootstrap with functions, not scripts
* top/bootstrap: Use autopull and autogen functions, not
shell scripts. This lets build-aux/bootstrap become a
standalone script. It does not change the behavior of
top/bootstrap, except for minor rewording of disagnostics.
Diffstat (limited to 'top')
-rwxr-xr-x | top/bootstrap | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/top/bootstrap b/top/bootstrap index 9d31b4311c..a4246c7e80 100755 --- a/top/bootstrap +++ b/top/bootstrap @@ -1,7 +1,7 @@ #! /bin/sh # Bootstrap this package from checked-out sources. -scriptversion=2022-12-27.03; # UTC +scriptversion=2022-12-27.04; # UTC # Copyright (C) 2003-2022 Free Software Foundation, Inc. # @@ -183,25 +183,23 @@ fi echo "$0: Bootstrapping from checked-out $package sources..." -# Pass GNULIB_SRCDIR to autopull.sh and autogen.sh. +# Pass GNULIB_SRCDIR and GNULIB_REFDIR to any subsidiary commands that care. export GNULIB_SRCDIR - -# Pass GNULIB_REFDIR to autopull.sh. export GNULIB_REFDIR if $use_git || test -z "$SKIP_PO"; then - "$medir"/autopull.sh \ + autopull \ `if $bootstrap_sync; then echo ' --bootstrap-sync'; else echo ' --no-bootstrap-sync'; fi` \ `if test -z "$checkout_only_file"; then echo ' --force'; fi` \ `if ! $use_git; then echo ' --no-git'; fi` \ `if test -n "$SKIP_PO"; then echo ' --skip-po'; fi` \ - || die "autopull.sh failed." + || die "could not fetch auxiliary files" fi -"$medir"/autogen.sh \ +autogen \ `if $copy; then echo ' --copy'; fi` \ `if test -z "$checkout_only_file"; then echo ' --force'; fi` \ - || die "autogen.sh failed." + || die "could not generate auxiliary files" # ---------------------------------------------------------------------------- |