diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | build-aux/bootstrap | 14 | ||||
| -rwxr-xr-x | top/bootstrap | 14 |
3 files changed, 18 insertions, 16 deletions
@@ -1,5 +1,11 @@ 2022-12-27 Paul Eggert <eggert@cs.ucla.edu> + 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. + Make autopull a shell function too This does not change behavior. It is helpful for future changes. * top/autopull.sh: Call autopull to do the actual work. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 78e307c5ef..2c81b0f26e 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -5,7 +5,7 @@ # 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. # @@ -1462,25 +1462,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" # ---------------------------------------------------------------------------- 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" # ---------------------------------------------------------------------------- |