bootstrap.in (recode-3.7.4) | : | bootstrap.in (recode-3.7.5) | ||
---|---|---|---|---|
#! /bin/sh | #! /bin/sh | |||
# Bootstrap an Autotooled package from checked-out sources. | # Bootstrap an Autotooled package from checked-out sources. | |||
# Written by Gary V. Vaughan, 2010 | # Written by Gary V. Vaughan, 2010 | |||
# Inspired by a script written by Paul Eggert. | # Inspired by a script written by Paul Eggert. | |||
# This is free software. There is NO warranty; not even for | # This is free software. There is NO warranty; not even for | |||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. | |||
# | # | |||
# Copyright (C) 2010-2019 Bootstrap Authors | # Copyright (C) 2010-2017 Bootstrap Authors | |||
# | # | |||
# This file is dual licensed under the terms of the MIT license | # This file is dual licensed under the terms of the MIT license | |||
# <https://opensource.org/license/MIT>, and GPL version 3 or later | # <https://opensource.org/license/MIT>, and GPL version 3 or later | |||
# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of | # <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of | |||
# these licenses when using or redistributing this software or any of | # these licenses when using or redistributing this software or any of | |||
# the files within it. See the URLs above, or the file `LICENSE` | # the files within it. See the URLs above, or the file `LICENSE` | |||
# included in the Bootstrap distribution for the full license texts. | # included in the Bootstrap distribution for the full license texts. | |||
# You should place a copy of this script under version control in the | # You should place a copy of this script under version control in the | |||
# top-level directory of your project. The intent is that all | # top-level directory of your project. The intent is that all | |||
skipping to change at line 158 | skipping to change at line 158 | |||
build-aux/config.sub | build-aux/config.sub | |||
doc/INSTALL | doc/INSTALL | |||
" | " | |||
# Relative path to the local gnulib submodule, and url to the upstream | # Relative path to the local gnulib submodule, and url to the upstream | |||
# git repository. If you have a gnulib entry in your .gitmodules file, | # git repository. If you have a gnulib entry in your .gitmodules file, | |||
# these values are ignored. | # these values are ignored. | |||
gnulib_path= | gnulib_path= | |||
gnulib_url= | gnulib_url= | |||
# Date from which to clone github, to avoid a full clone. | ||||
gnulib_clone_since= | ||||
# Additional gnulib-tool options to use. | # Additional gnulib-tool options to use. | |||
gnulib_tool_options=" | gnulib_tool_options=" | |||
--no-changelog | --no-changelog | |||
" | " | |||
# bootstrap removes any macro-files that are not included by aclocal.m4, | # bootstrap removes any macro-files that are not included by aclocal.m4, | |||
# except for files listed in this variable that are always kept. | # except for files listed in this variable that are always kept. | |||
gnulib_precious=" | gnulib_precious=" | |||
gnulib-tool.m4 | gnulib-tool.m4 | |||
" | " | |||
skipping to change at line 228 | skipping to change at line 225 | |||
## ------------------- ## | ## ------------------- ## | |||
## External Libraries. ## | ## External Libraries. ## | |||
## ------------------- ## | ## ------------------- ## | |||
# Source required external libraries: | # Source required external libraries: | |||
. `echo "$0" |${SED-sed} 's|[^/]*$||'`"funclib.sh" | . `echo "$0" |${SED-sed} 's|[^/]*$||'`"funclib.sh" | |||
. `echo "$0" |${SED-sed} 's|[^/]*$||'`"options-parser" | . `echo "$0" |${SED-sed} 's|[^/]*$||'`"options-parser" | |||
. `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace" | . `echo "$0" |${SED-sed} 's|[^/]*$||'`"extract-trace" | |||
# Set a version string for *this* script. | # Set a version string for *this* script. | |||
scriptversion=2019-03-22.11; # UTC | scriptversion=2017-01-09.18; # UTC | |||
## ------------------- ## | ## ------------------- ## | |||
## Hookable functions. ## | ## Hookable functions. ## | |||
## ------------------- ## | ## ------------------- ## | |||
# After 'bootstrap.conf' has been sourced, execution proceeds by calling | # After 'bootstrap.conf' has been sourced, execution proceeds by calling | |||
# 'func_bootstrap'. Wherever a function is decorated with | # 'func_bootstrap'. Wherever a function is decorated with | |||
# 'func_hookable func_name', you will find a matching 'func_run_hooks | # 'func_hookable func_name', you will find a matching 'func_run_hooks | |||
# func_name', which executes all functions added with 'func_add_hook | # func_name', which executes all functions added with 'func_add_hook | |||
# func_name my_func'. | # func_name my_func'. | |||
skipping to change at line 1571 | skipping to change at line 1568 | |||
func_show_eval "$GIT clone --reference '$opt_gnulib_srcdir' \ | func_show_eval "$GIT clone --reference '$opt_gnulib_srcdir' \ | |||
'$gnulib_url' '$gnulib_path'" \ | '$gnulib_url' '$gnulib_path'" \ | |||
|| func_fatal_error "Unable to fetch gnulib submodule." | || func_fatal_error "Unable to fetch gnulib submodule." | |||
# Without --gnulib-srcdir, and no existing checked out submodule, we | # Without --gnulib-srcdir, and no existing checked out submodule, we | |||
# create a new shallow clone of the remote gnulib repository. | # create a new shallow clone of the remote gnulib repository. | |||
else | else | |||
trap func_cleanup_gnulib 1 2 13 15 | trap func_cleanup_gnulib 1 2 13 15 | |||
shallow= | shallow= | |||
test -n "$gnulib_clone_since" && \ | $GIT clone -h 2>&1 |func_grep_q -- --depth \ | |||
$GIT clone -h 2>&1 |func_grep_q -- --shallow-since \ | && shallow='--depth 365' | |||
&& shallow="--shallow-since=$gnulib_clone_since" | ||||
func_show_eval "$GIT clone $shallow '$gnulib_url' '$gnulib_path'" \ | func_show_eval "$GIT clone $shallow '$gnulib_url' '$gnulib_path'" \ | |||
func_cleanup_gnulib | func_cleanup_gnulib | |||
# FIXME: Solaris /bin/sh will try to execute '-' if any of | # FIXME: Solaris /bin/sh will try to execute '-' if any of | |||
# these signals are caught after this. | # these signals are caught after this. | |||
trap - 1 2 13 15 | trap - 1 2 13 15 | |||
fi | fi | |||
# Make sure we've checked out the correct revision of gnulib. | # Make sure we've checked out the correct revision of gnulib. | |||
End of changes. 4 change blocks. | ||||
8 lines changed or deleted | 4 lines changed or added |