Re: ./bootstrap --gnulib-srcdir and GNULIB_REVISION

[Bruno Haible]

Hi Simon,

After fixing the --help output, I'm changing the 'bootstrap' logic
to follow this documentation. Two patches:
* 0001 simplifies the logic by removing fallback code for git versions < 1.6.4.
  Version 1.6.4 was released in 2009, that is, 15 years ago. When encountering
  such an old version, now an error message is output.
* 0002 implements prepare_GNULIB_SRCDIR as documented. The real change is that
  instead of having a single occurrence of
    git checkout "$GNULIB_REVISION"
  at the end, we have one in each possible case. Which allows to tailor
  when to invoke it.

> Bug #1: it seems GNULIB_REVISION in bootstrap.conf has no effect, and
> this code is the reason (quoting bootstrap-funclib.sh):
> 
>   # XXX Should this be done if $use_git is false?
>   if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \
>      && ! git_modules_config submodule.gnulib.url >/dev/null; then
>     (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib
>   fi
> 
> The reason is that the tarball has .gitmodules looking like this:
> 
> [submodule "gnulib"]
>       path = gnulib
>       url = https://git.savannah.gnu.org/git/gnulib.git
> 
> Which trigger the '! git_modules_config submodules.gnulib.url'.

This is fixed as part of 0002.

Bruno

0001-bootstrap-Simplify-git-submodule-initialization.patch
Description: Text Data

0002-bootstrap-Implement-phase-1-as-documented-in-the-hel.patch
Description: Text Data