Mercurial > octave
annotate bootstrap-funclib.sh @ 32477:e6d339b9309d
maint: Update gnulib.
* bootstrap.conf (GNULIB_REVISION):
Update to 7a38f30f925db7d486460c18df41413f3c7ef74b.
* bootstrap, autogen.sh, autopull.sh, bootstrap-funclib.sh: Update with
./bootstrap --bootstrap-sync.
* build-aux/gnulib-bootstrap-git-fetch.diff: Refresh patch for new gnulib
version.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Mon, 20 Nov 2023 18:41:06 +0100 |
| parents | e98fb9b4be86 |
| children | c51b07a71421 |
| rev | line source |
|---|---|
| 31420 | 1 # A library of shell functions for autopull.sh, autogen.sh, and bootstrap. |
| 2 | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
3 scriptlibversion=2023-08-29.21; # UTC |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
4 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
5 # Copyright (C) 2003-2023 Free Software Foundation, Inc. |
| 31420 | 6 # |
| 7 # This program is free software: you can redistribute it and/or modify | |
| 8 # it under the terms of the GNU General Public License as published by | |
| 9 # the Free Software Foundation, either version 3 of the License, or | |
| 10 # (at your option) any later version. | |
| 11 # | |
| 12 # This program is distributed in the hope that it will be useful, | |
| 13 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 15 # GNU General Public License for more details. | |
| 16 # | |
| 17 # You should have received a copy of the GNU General Public License | |
| 18 # along with this program. If not, see <https://www.gnu.org/licenses/>. | |
| 19 | |
| 20 # Originally written by Paul Eggert. The canonical version of this | |
| 21 # script is maintained as top/bootstrap-funclib.sh in gnulib. However, | |
| 22 # to be useful to your package, you should place a copy of it under | |
| 23 # version control in the top-level directory of your package. The | |
| 24 # intent is that all customization can be done with a bootstrap.conf | |
| 25 # file also maintained in your version control; gnulib comes with a | |
| 26 # template build-aux/bootstrap.conf to get you started. | |
| 27 | |
| 28 nl=' | |
| 29 ' | |
| 30 | |
| 31 # Ensure file names are sorted consistently across platforms. | |
| 32 LC_ALL=C | |
| 33 export LC_ALL | |
| 34 | |
| 35 # Honor $PERL, but work even if there is none. | |
| 36 PERL="${PERL-perl}" | |
| 37 | |
| 38 default_gnulib_url=https://git.savannah.gnu.org/git/gnulib.git | |
| 39 | |
| 40 # Copyright year, for the --version output. | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
41 copyright_year=`echo "$scriptlibversion" | sed -e 's/[^0-9].*//'` |
| 31420 | 42 copyright="Copyright (C) ${copyright_year} Free Software Foundation, Inc. |
| 43 License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>. | |
| 44 This is free software: you are free to change and redistribute it. | |
| 45 There is NO WARRANTY, to the extent permitted by law." | |
| 46 | |
| 47 # warnf_ FORMAT-STRING ARG1... | |
| 48 warnf_ () | |
| 49 { | |
| 50 warnf_format_=$1 | |
| 51 shift | |
| 52 nl=' | |
| 53 ' | |
| 54 case $* in | |
| 55 *$nl*) me_=$(printf "$me"|tr "$nl|" '??') | |
| 56 printf "$warnf_format_" "$@" | sed "s|^|$me_: |" ;; | |
| 57 *) printf "$me: $warnf_format_" "$@" ;; | |
| 58 esac >&2 | |
| 59 } | |
| 60 | |
| 61 # warn_ WORD1... | |
| 62 warn_ () | |
| 63 { | |
| 64 # If IFS does not start with ' ', set it and emit the warning in a subshell. | |
| 65 case $IFS in | |
| 66 ' '*) warnf_ '%s\n' "$*";; | |
| 67 *) (IFS=' '; warn_ "$@");; | |
| 68 esac | |
| 69 } | |
| 70 | |
| 71 # die WORD1... | |
| 72 die() { warn_ "$@"; exit 1; } | |
| 73 | |
| 74 # ------------------------------ Configuration. ------------------------------ | |
| 75 | |
| 76 # Directory that contains package-specific gnulib modules and/or overrides. | |
| 77 local_gl_dir=gl | |
| 78 | |
| 79 # Name of the Makefile.am | |
| 80 # XXX Not used. | |
| 81 gnulib_mk=gnulib.mk | |
| 82 | |
| 83 # List of gnulib modules needed. | |
| 84 gnulib_modules= | |
| 85 | |
| 86 # Any gnulib files needed that are not in modules. | |
| 87 gnulib_files= | |
| 88 | |
| 89 # A function to be called for each unrecognized option. Returns 0 if | |
| 90 # the option in $1 has been processed by the function. Returns 1 if | |
| 91 # the option has not been processed by the function. Override it via | |
| 92 # your own definition in bootstrap.conf | |
| 93 bootstrap_option_hook() { return 1; } | |
| 94 | |
| 95 # A function to be called in order to print the --help information | |
| 96 # corresponding to user-defined command-line options. | |
| 97 bootstrap_print_option_usage_hook() { :; } | |
| 98 | |
| 99 # A function to be called at the end of autopull.sh. | |
| 100 # Override it via your own definition in bootstrap.conf. | |
| 101 bootstrap_post_pull_hook() { :; } | |
| 102 | |
| 103 # A function to be called right after gnulib-tool is run. | |
| 104 # Override it via your own definition in bootstrap.conf. | |
| 105 bootstrap_post_import_hook() { :; } | |
| 106 | |
| 107 # A function to be called after everything else in this script. | |
| 108 # Override it via your own definition in bootstrap.conf. | |
| 109 bootstrap_epilogue() { :; } | |
| 110 | |
| 111 # The command to download all .po files for a specified domain into a | |
| 112 # specified directory. Fill in the first %s with the destination | |
| 113 # directory and the second with the domain name. | |
| 114 po_download_command_format=\ | |
| 115 "wget --mirror --level=1 -nd -nv -A.po -P '%s' \ | |
| 116 https://translationproject.org/latest/%s/" | |
| 117 | |
| 118 # Prefer a non-empty tarname (4th argument of AC_INIT if given), else | |
| 119 # fall back to the package name (1st argument with munging). | |
| 120 extract_package_name=' | |
| 121 /^AC_INIT(\[*/{ | |
| 122 s/// | |
| 123 /^[^,]*,[^,]*,[^,]*,[ []*\([^][ ,)]\)/{ | |
| 124 s//\1/ | |
| 125 s/[],)].*// | |
| 126 p | |
| 127 q | |
| 128 } | |
| 129 s/[],)].*// | |
| 130 s/^GNU // | |
| 131 y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ | |
| 132 s/[^abcdefghijklmnopqrstuvwxyz0123456789_]/-/g | |
| 133 p | |
| 134 } | |
| 135 ' | |
| 136 package=$(${AUTOCONF:-autoconf} --trace AC_INIT:\$4 configure.ac 2>/dev/null) | |
| 137 if test -z "$package"; then | |
| 138 package=$(sed -n "$extract_package_name" configure.ac) \ | |
| 139 || die 'cannot find package name in configure.ac' | |
| 140 fi | |
| 141 gnulib_name=lib$package | |
| 142 | |
| 143 build_aux=build-aux | |
| 144 source_base=lib | |
| 145 m4_base=m4 | |
| 146 doc_base=doc | |
| 147 tests_base=tests | |
| 148 gnulib_extra_files=" | |
| 149 build-aux/install-sh | |
| 150 build-aux/mdate-sh | |
| 151 build-aux/texinfo.tex | |
| 152 build-aux/depcomp | |
| 153 build-aux/config.guess | |
| 154 build-aux/config.sub | |
| 155 doc/INSTALL | |
| 156 " | |
| 157 | |
| 158 # Additional gnulib-tool options to use. Use "\newline" to break lines. | |
| 159 gnulib_tool_option_extras= | |
| 160 | |
| 161 # Other locale categories that need message catalogs. | |
| 162 EXTRA_LOCALE_CATEGORIES= | |
| 163 | |
| 164 # Additional xgettext options to use. Use "\\\newline" to break lines. | |
| 165 XGETTEXT_OPTIONS='\\\ | |
| 166 --flag=_:1:pass-c-format\\\ | |
| 167 --flag=N_:1:pass-c-format\\\ | |
| 168 --flag=error:3:c-format --flag=error_at_line:5:c-format\\\ | |
| 169 ' | |
| 170 | |
| 171 # Package bug report address and copyright holder for gettext files | |
| 172 COPYRIGHT_HOLDER='Free Software Foundation, Inc.' | |
| 173 MSGID_BUGS_ADDRESS=bug-$package@gnu.org | |
| 174 | |
| 175 # Files we don't want to import. | |
| 176 # XXX Not used. | |
| 177 excluded_files= | |
| 178 | |
| 179 # File that should exist in the top directory of a checked out hierarchy, | |
| 180 # but not in a distribution tarball. | |
| 181 checkout_only_file=README-hacking | |
| 182 | |
| 183 # Set this to '.cvsignore .gitignore' in bootstrap.conf if you want | |
| 184 # those files to be generated in directories like lib/, m4/, and po/. | |
| 185 # Or set it to 'auto' to make this script select which to use based | |
| 186 # on which version control system (if any) is used in the source directory. | |
| 187 vc_ignore=auto | |
| 188 | |
| 189 # Set this to true in bootstrap.conf to enable --bootstrap-sync by | |
| 190 # default. | |
| 191 bootstrap_sync=false | |
| 192 | |
| 193 # Override the default configuration, if necessary. | |
| 194 # Make sure that bootstrap.conf is sourced from the current directory | |
| 195 # if we were invoked as "sh bootstrap". | |
| 196 conffile=`dirname "$me"`/bootstrap.conf | |
| 197 test -r "$conffile" && . "$conffile" | |
| 198 | |
| 199 # ------------------------- Build-time prerequisites ------------------------- | |
| 200 | |
| 201 check_exists() { | |
| 202 if test "$1" = "--verbose"; then | |
| 203 ($2 --version </dev/null) >/dev/null 2>&1 | |
| 204 if test $? -ge 126; then | |
| 205 # If not found, run with diagnostics as one may be | |
| 206 # presented with env variables to set to find the right version | |
| 207 ($2 --version </dev/null) | |
| 208 fi | |
| 209 else | |
| 210 ($1 --version </dev/null) >/dev/null 2>&1 | |
| 211 fi | |
| 212 | |
| 213 test $? -lt 126 | |
| 214 } | |
| 215 | |
| 216 # Note this deviates from the version comparison in automake | |
| 217 # in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a | |
| 218 # but this should suffice as we won't be specifying old | |
| 219 # version formats or redundant trailing .0 in bootstrap.conf. | |
| 220 # If we did want full compatibility then we should probably | |
| 221 # use m4_version_compare from autoconf. | |
| 222 sort_ver() { # sort -V is not generally available | |
| 223 ver1="$1" | |
| 224 ver2="$2" | |
| 225 | |
| 226 # split on '.' and compare each component | |
| 227 i=1 | |
| 228 while : ; do | |
| 229 p1=$(echo "$ver1" | cut -d. -f$i) | |
| 230 p2=$(echo "$ver2" | cut -d. -f$i) | |
| 231 if [ ! "$p1" ]; then | |
| 232 echo "$1 $2" | |
| 233 break | |
| 234 elif [ ! "$p2" ]; then | |
| 235 echo "$2 $1" | |
| 236 break | |
| 237 elif [ ! "$p1" = "$p2" ]; then | |
| 238 if [ "$p1" -gt "$p2" ] 2>/dev/null; then # numeric comparison | |
| 239 echo "$2 $1" | |
| 240 elif [ "$p2" -gt "$p1" ] 2>/dev/null; then # numeric comparison | |
| 241 echo "$1 $2" | |
| 242 else # numeric, then lexicographic comparison | |
| 243 lp=$(printf "%s\n%s\n" "$p1" "$p2" | LANG=C sort -n | tail -n1) | |
| 244 if [ "$lp" = "$p2" ]; then | |
| 245 echo "$1 $2" | |
| 246 else | |
| 247 echo "$2 $1" | |
| 248 fi | |
| 249 fi | |
| 250 break | |
| 251 fi | |
| 252 i=$(($i+1)) | |
| 253 done | |
| 254 } | |
| 255 | |
| 256 get_version_sed=' | |
| 257 # Move version to start of line. | |
| 258 s/.*[v ]\([0-9]\)/\1/ | |
| 259 | |
| 260 # Skip lines that do not start with version. | |
| 261 /^[0-9]/!d | |
| 262 | |
| 263 # Remove characters after the version. | |
| 264 s/[^.a-z0-9-].*// | |
| 265 | |
| 266 # The first component must be digits only. | |
| 267 s/^\([0-9]*\)[a-z-].*/\1/ | |
| 268 | |
| 269 #the following essentially does s/5.005/5.5/ | |
| 270 s/\.0*\([1-9]\)/.\1/g | |
| 271 p | |
| 272 q' | |
| 273 | |
| 274 get_version() { | |
| 275 app=$1 | |
| 276 | |
| 277 $app --version >/dev/null 2>&1 || { $app --version; return 1; } | |
| 278 | |
| 279 $app --version 2>&1 | sed -n "$get_version_sed" | |
| 280 } | |
| 281 | |
| 282 check_versions() { | |
| 283 ret=0 | |
| 284 | |
| 285 while read app req_ver; do | |
| 286 # We only need libtoolize from the libtool package. | |
| 287 if test "$app" = libtool; then | |
| 288 app=libtoolize | |
| 289 fi | |
| 290 # Exempt git if git is not needed. | |
| 291 if test "$app" = git; then | |
| 292 $check_git || continue | |
| 293 fi | |
| 294 # Honor $APP variables ($TAR, $AUTOCONF, etc.) | |
| 295 appvar=$(echo $app | LC_ALL=C tr '[a-z]-' '[A-Z]_') | |
| 296 test "$appvar" = TAR && appvar=AMTAR | |
| 297 case $appvar in | |
| 298 GZIP) ;; # Do not use $GZIP: it contains gzip options. | |
| 299 PERL::*) ;; # Keep perl modules as-is | |
| 300 *) eval "app=\${$appvar-$app}" ;; | |
| 301 esac | |
| 302 | |
| 303 # Handle the still-experimental Automake-NG programs specially. | |
| 304 # They remain named as the mainstream Automake programs ("automake", | |
| 305 # and "aclocal") to avoid gratuitous incompatibilities with | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
306 # preexisting usages (by, say, autoreconf, or custom autogen.sh |
| 31420 | 307 # scripts), but correctly identify themselves (as being part of |
| 308 # "GNU automake-ng") when asked their version. | |
| 309 case $app in | |
| 310 automake-ng|aclocal-ng) | |
| 311 app=${app%-ng} | |
| 312 ($app --version | grep '(GNU automake-ng)') >/dev/null 2>&1 || { | |
| 313 warn_ "Error: '$app' not found or not from Automake-NG" | |
| 314 ret=1 | |
| 315 continue | |
| 316 } ;; | |
| 317 # Another check is for perl modules. These can be written as | |
| 318 # e.g. perl::XML::XPath in case of XML::XPath module, etc. | |
| 319 perl::*) | |
| 320 # Extract module name | |
| 321 app="${app#perl::}" | |
| 322 if ! $PERL -m"$app" -e 'exit 0' >/dev/null 2>&1; then | |
| 323 warn_ "Error: perl module '$app' not found" | |
| 324 ret=1 | |
| 325 fi | |
| 326 continue | |
| 327 ;; | |
| 328 esac | |
| 329 if [ "$req_ver" = "-" ]; then | |
| 330 # Merely require app to exist; not all prereq apps are well-behaved | |
| 331 # so we have to rely on $? rather than get_version. | |
| 332 if ! check_exists --verbose $app; then | |
| 333 warn_ "Error: '$app' not found" | |
| 334 ret=1 | |
| 335 fi | |
| 336 else | |
| 337 # Require app to produce a new enough version string. | |
| 338 inst_ver=$(get_version $app) | |
| 339 if [ ! "$inst_ver" ]; then | |
| 340 warn_ "Error: '$app' not found" | |
| 341 ret=1 | |
| 342 else | |
| 343 latest_ver=$(sort_ver $req_ver $inst_ver | cut -d' ' -f2) | |
| 344 if [ ! "$latest_ver" = "$inst_ver" ]; then | |
| 345 warnf_ '%s\n' \ | |
| 346 "Error: '$app' version == $inst_ver is too old" \ | |
| 347 " '$app' version >= $req_ver is required" | |
| 348 ret=1 | |
| 349 fi | |
| 350 fi | |
| 351 fi | |
| 352 done | |
| 353 | |
| 354 return $ret | |
| 355 } | |
| 356 | |
| 357 print_versions() { | |
| 358 echo "Program Min_version" | |
| 359 echo "----------------------" | |
| 360 printf %s "$buildreq" | |
| 361 echo "----------------------" | |
| 362 # can't depend on column -t | |
| 363 } | |
| 364 | |
| 365 # check_build_prerequisites check_git | |
| 366 check_build_prerequisites() | |
| 367 { | |
| 368 check_git="$1" | |
| 369 | |
| 370 # gnulib-tool requires at least automake and autoconf. | |
| 371 # If either is not listed, add it (with minimum version) as a prerequisite. | |
| 372 case $buildreq in | |
| 373 *automake*) ;; | |
| 374 *) buildreq="automake 1.9 | |
| 375 $buildreq" ;; | |
| 376 esac | |
| 377 case $buildreq in | |
| 378 *autoconf*) ;; | |
| 379 *) buildreq="autoconf 2.59 | |
| 380 $buildreq" ;; | |
| 381 esac | |
| 382 | |
| 383 # When we can deduce that gnulib-tool will require patch, | |
| 384 # and when patch is not already listed as a prerequisite, add it, too. | |
| 385 if test -d "$local_gl_dir" \ | |
| 386 && ! find "$local_gl_dir" -name '*.diff' -exec false {} +; then | |
| 387 case $buildreq in | |
| 388 *patch*) ;; | |
| 389 *) buildreq="patch - | |
| 390 $buildreq" ;; | |
| 391 esac | |
| 392 fi | |
| 393 | |
| 394 if ! printf '%s' "$buildreq" | check_versions; then | |
| 395 echo >&2 | |
| 396 if test -f README-prereq; then | |
| 397 die "See README-prereq for how to get the prerequisite programs" | |
| 398 else | |
| 399 die "Please install the prerequisite programs" | |
| 400 fi | |
| 401 fi | |
| 402 | |
| 403 # Warn the user if autom4te appears to be broken; this causes known | |
| 404 # issues with at least gettext 0.18.3. | |
| 405 probe=$(echo 'm4_quote([hi])' | autom4te -l M4sugar -t 'm4_quote:$%' -) | |
| 406 if test "x$probe" != xhi; then | |
| 407 warn_ "WARNING: your autom4te wrapper eats stdin;" | |
| 408 warn_ "if bootstrap fails, consider upgrading your autotools" | |
| 409 fi | |
| 410 } | |
| 411 | |
| 412 # find_tool ENVVAR NAMES... | |
| 413 # ------------------------- | |
| 414 # Search for a required program. Use the value of ENVVAR, if set, | |
| 415 # otherwise find the first of the NAMES that can be run. | |
| 416 # If found, set ENVVAR to the program name, die otherwise. | |
| 417 # | |
| 418 # FIXME: code duplication, see also gnu-web-doc-update. | |
| 419 find_tool () | |
| 420 { | |
| 421 find_tool_envvar=$1 | |
| 422 shift | |
| 423 find_tool_names=$@ | |
| 424 eval "find_tool_res=\$$find_tool_envvar" | |
| 425 if test x"$find_tool_res" = x; then | |
| 426 for i; do | |
| 427 if check_exists $i; then | |
| 428 find_tool_res=$i | |
| 429 break | |
| 430 fi | |
| 431 done | |
| 432 fi | |
| 433 if test x"$find_tool_res" = x; then | |
| 434 warn_ "one of these is required: $find_tool_names;" | |
| 435 die "alternatively set $find_tool_envvar to a compatible tool" | |
| 436 fi | |
| 437 eval "$find_tool_envvar=\$find_tool_res" | |
| 438 eval "export $find_tool_envvar" | |
| 439 } | |
| 440 | |
| 441 # --------------------- Preparing GNULIB_SRCDIR for use. --------------------- | |
| 442 # This is part of autopull.sh, but bootstrap needs it too, for self-upgrading. | |
| 443 | |
| 444 cleanup_gnulib() { | |
| 445 status=$? | |
| 446 # XXX It's a bad idea to erase the submodule directory if it contains local | |
| 447 # modifications. | |
| 448 rm -fr "$gnulib_path" | |
| 449 exit $status | |
| 450 } | |
| 451 | |
| 452 git_modules_config () { | |
| 453 test -f .gitmodules && git config --file .gitmodules "$@" | |
| 454 } | |
| 455 | |
| 456 prepare_GNULIB_SRCDIR () | |
| 457 { | |
| 458 if test -n "$GNULIB_SRCDIR"; then | |
| 459 # Use GNULIB_SRCDIR directly. | |
| 460 # We already checked that $GNULIB_SRCDIR references a directory. | |
| 461 # Verify that it contains a gnulib checkout. | |
| 462 test -f "$GNULIB_SRCDIR/gnulib-tool" \ | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
463 || die "Error: --gnulib-srcdir or \$GNULIB_SRCDIR is specified," \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
464 "but does not contain gnulib-tool" |
| 31420 | 465 elif $use_git; then |
| 466 gnulib_path=$(git_modules_config submodule.gnulib.path) | |
| 467 test -z "$gnulib_path" && gnulib_path=gnulib | |
| 468 | |
| 469 # Get gnulib files. Populate $gnulib_path, possibly updating a | |
| 470 # submodule, for use in the rest of the script. | |
| 471 | |
| 472 if test -n "$GNULIB_REFDIR" && test -d "$GNULIB_REFDIR"/.git \ | |
| 473 && git_modules_config submodule.gnulib.url >/dev/null; then | |
| 474 # Use GNULIB_REFDIR as a reference. | |
| 475 echo "$0: getting gnulib files..." | |
| 476 if git submodule -h|grep -- --reference > /dev/null; then | |
| 477 # Prefer the one-liner available in git 1.6.4 or newer. | |
| 478 git submodule update --init --reference "$GNULIB_REFDIR" \ | |
| 479 "$gnulib_path" || exit $? | |
| 480 else | |
| 481 # This fallback allows at least git 1.5.5. | |
| 482 if test -f "$gnulib_path"/gnulib-tool; then | |
| 483 # Since file already exists, assume submodule init already complete. | |
| 484 git submodule update -- "$gnulib_path" || exit $? | |
| 485 else | |
| 486 # Older git can't clone into an empty directory. | |
| 487 rmdir "$gnulib_path" 2>/dev/null | |
| 488 git clone --reference "$GNULIB_REFDIR" \ | |
| 489 "$(git_modules_config submodule.gnulib.url)" "$gnulib_path" \ | |
| 490 && git submodule init -- "$gnulib_path" \ | |
| 491 && git submodule update -- "$gnulib_path" \ | |
| 492 || exit $? | |
| 493 fi | |
| 494 fi | |
| 495 else | |
| 496 # GNULIB_REFDIR is not set or not usable. Ignore it. | |
| 497 if git_modules_config submodule.gnulib.url >/dev/null; then | |
| 498 echo "$0: getting gnulib files..." | |
| 499 git submodule init -- "$gnulib_path" || exit $? | |
| 500 git submodule update -- "$gnulib_path" || exit $? | |
| 501 | |
| 502 elif [ ! -d "$gnulib_path" ]; then | |
| 503 echo "$0: getting gnulib files..." | |
| 504 | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
505 trap cleanup_gnulib HUP INT PIPE TERM |
| 31420 | 506 |
| 507 shallow= | |
| 508 if test -z "$GNULIB_REVISION"; then | |
| 509 if git clone -h 2>&1 | grep -- --depth > /dev/null; then | |
| 510 shallow='--depth 2' | |
| 511 fi | |
| 512 git clone $shallow ${GNULIB_URL:-$default_gnulib_url} "$gnulib_path" \ | |
| 513 || cleanup_gnulib | |
| 514 else | |
| 515 if git fetch -h 2>&1 | grep -- --depth > /dev/null; then | |
| 516 shallow='--depth 2' | |
| 517 fi | |
| 518 mkdir -p "$gnulib_path" | |
| 519 # Only want a shallow checkout of $GNULIB_REVISION, but git does not | |
| 520 # support cloning by commit hash. So attempt a shallow fetch by commit | |
| 521 # hash to minimize the amount of data downloaded and changes needed to | |
| 522 # be processed, which can drastically reduce download and processing | |
| 523 # time for checkout. If the fetch by commit fails, a shallow fetch can | |
| 524 # not be performed because we do not know what the depth of the commit | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
525 # is without fetching all commits. So fall back to fetching all |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
526 # commits. |
| 31420 | 527 git -C "$gnulib_path" init |
| 528 git -C "$gnulib_path" remote add origin \ | |
| 529 ${GNULIB_URL:-$default_gnulib_url} | |
| 530 git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \ | |
| 531 || git -C "$gnulib_path" fetch origin \ | |
| 532 || cleanup_gnulib | |
| 533 git -C "$gnulib_path" reset --hard FETCH_HEAD | |
| 534 fi | |
| 535 | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
536 trap - HUP INT PIPE TERM |
| 31420 | 537 |
| 538 elif test -n "$GNULIB_REVISION" \ | |
| 539 && ! git --git-dir="$gnulib_path"/.git cat-file \ | |
| 540 commit "$GNULIB_REVISION"; then | |
| 541 git --git-dir="$gnulib_path"/.git fetch | |
| 542 fi | |
| 543 fi | |
| 544 GNULIB_SRCDIR=$gnulib_path | |
| 545 # Verify that the submodule contains a gnulib checkout. | |
| 546 test -f "$gnulib_path/gnulib-tool" \ | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
547 || die "Error: $gnulib_path is supposed to contain a gnulib checkout," \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
548 "but does not contain gnulib-tool" |
| 31420 | 549 fi |
| 550 | |
| 551 # XXX Should this be done if $use_git is false? | |
| 552 if test -d "$GNULIB_SRCDIR"/.git && test -n "$GNULIB_REVISION" \ | |
| 553 && ! git_modules_config submodule.gnulib.url >/dev/null; then | |
| 554 if ! git --git-dir="$GNULIB_SRCDIR"/.git cat-file \ | |
| 555 commit "$GNULIB_REVISION"; then | |
| 556 git --git-dir="$GNULIB_SRCDIR"/.git fetch | |
| 557 fi | |
| 558 (cd "$GNULIB_SRCDIR" && git checkout "$GNULIB_REVISION") || cleanup_gnulib | |
| 559 fi | |
| 560 | |
| 561 # $GNULIB_SRCDIR now points to the version of gnulib to use, and | |
| 562 # we no longer need to use git or $gnulib_path below here. | |
| 563 } | |
| 564 | |
| 565 # -------- Upgrading bootstrap to the version found in GNULIB_SRCDIR. -------- | |
| 566 | |
| 567 upgrade_bootstrap () | |
| 568 { | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
569 if test -f "$medir"/bootstrap-funclib.sh; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
570 update_lib=true |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
571 { cmp -s "$medir"/bootstrap "$GNULIB_SRCDIR/top/bootstrap" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
572 && cmp -s "$medir"/bootstrap-funclib.sh \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
573 "$GNULIB_SRCDIR/top/bootstrap-funclib.sh" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
574 && cmp -s "$medir"/autopull.sh "$GNULIB_SRCDIR/top/autopull.sh" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
575 && cmp -s "$medir"/autogen.sh "$GNULIB_SRCDIR/top/autogen.sh"; \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
576 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
577 else |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
578 update_lib=false |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
579 cmp -s "$medir"/bootstrap "$GNULIB_SRCDIR/build-aux/bootstrap" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
580 fi || { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
581 if $update_lib; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
582 echo "$0: updating bootstrap & companions and restarting..." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
583 else |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
584 echo "$0: updating bootstrap and restarting..." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
585 fi |
| 31420 | 586 case $(sh -c 'echo "$1"' -- a) in |
| 587 a) ignored=--;; | |
| 588 *) ignored=ignored;; | |
| 589 esac | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
590 u=$update_lib |
| 31420 | 591 exec sh -c \ |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
592 '{ if '$u' && test -f "$1"; then cp "$1" "$3"; else cp "$2" "$3"; fi; } && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
593 { if '$u' && test -f "$4"; then cp "$4" "$5"; else rm -f "$5"; fi; } && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
594 { if '$u' && test -f "$6"; then cp "$6" "$7"; else rm -f "$7"; fi; } && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
595 { if '$u' && test -f "$8"; then cp "$8" "$9"; else rm -f "$9"; fi; } && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
596 shift && shift && shift && shift && shift && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
597 shift && shift && shift && shift && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
598 exec "${CONFIG_SHELL-/bin/sh}" "$@"' \ |
| 31420 | 599 $ignored \ |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
600 "$GNULIB_SRCDIR/top/bootstrap" "$GNULIB_SRCDIR/build-aux/bootstrap" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
601 "$medir/bootstrap" \ |
| 31420 | 602 "$GNULIB_SRCDIR/top/bootstrap-funclib.sh" "$medir/bootstrap-funclib.sh" \ |
| 603 "$GNULIB_SRCDIR/top/autopull.sh" "$medir/autopull.sh" \ | |
| 604 "$GNULIB_SRCDIR/top/autogen.sh" "$medir/autogen.sh" \ | |
| 605 "$0" "$@" --no-bootstrap-sync | |
| 606 } | |
| 607 } | |
| 608 | |
| 609 # ---------------------------------------------------------------------------- | |
| 610 | |
| 611 if test x"$gnulib_modules$gnulib_files$gnulib_extra_files" = x; then | |
| 612 use_gnulib=false | |
| 613 else | |
| 614 use_gnulib=true | |
| 615 fi | |
| 616 | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
617 # -------- Fetch auxiliary files from the network. -------------------------- |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
618 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
619 autopull_usage() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
620 cat <<EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
621 Usage: $me [OPTION]... |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
622 Bootstrap this package from the checked-out sources. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
623 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
624 Optional environment variables: |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
625 GNULIB_SRCDIR Specifies the local directory where gnulib |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
626 sources reside. Use this if you already |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
627 have gnulib sources on your machine, and |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
628 you want to use these sources. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
629 GNULIB_REFDIR Specifies the local directory where a gnulib |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
630 repository (with a .git subdirectory) resides. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
631 Use this if you already have gnulib sources |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
632 and history on your machine, and do not want |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
633 to waste your bandwidth downloading them again. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
634 GNULIB_URL URL of the gnulib repository. The default is |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
635 $default_gnulib_url, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
636 which is Gnulib's upstream repository. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
637 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
638 Options: |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
639 --bootstrap-sync if this bootstrap script is not identical to |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
640 the version in the local gnulib sources, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
641 update this script, and then restart it with |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
642 /bin/sh or the shell \$CONFIG_SHELL |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
643 --no-bootstrap-sync do not check whether bootstrap is out of sync |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
644 --force attempt to bootstrap even if the sources seem |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
645 not to have been checked out |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
646 --no-git do not use git to update gnulib. Requires that |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
647 \$GNULIB_SRCDIR or the --gnulib-srcdir option |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
648 points to a gnulib repository with the correct |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
649 revision |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
650 --skip-po do not download po files |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
651 EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
652 bootstrap_print_option_usage_hook |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
653 cat <<EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
654 If the file bootstrap.conf exists in the same directory as this script, its |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
655 contents are read as shell variables to configure the bootstrap. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
656 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
657 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
658 are honored. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
659 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
660 Gnulib sources can be fetched in various ways: |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
661 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
662 * If the environment variable GNULIB_SRCDIR is set (either as an |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
663 environment variable or via the --gnulib-srcdir option), then sources |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
664 are fetched from that local directory. If it is a git repository and |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
665 the configuration variable GNULIB_REVISION is set in bootstrap.conf, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
666 then that revision is checked out. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
667 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
668 * Otherwise, if this package is in a git repository with a 'gnulib' |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
669 submodule configured, then that submodule is initialized and updated |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
670 and sources are fetched from there. If GNULIB_REFDIR is set (either |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
671 as an environment variable or via the --gnulib-refdir option) and is |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
672 a git repository, then it is used as a reference. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
673 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
674 * Otherwise, if the 'gnulib' directory does not exist, Gnulib sources |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
675 are cloned into that directory using git from \$GNULIB_URL, defaulting |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
676 to $default_gnulib_url. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
677 If the configuration variable GNULIB_REVISION is set in bootstrap.conf, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
678 then that revision is checked out. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
679 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
680 * Otherwise, the existing Gnulib sources in the 'gnulib' directory are |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
681 used. If it is a git repository and the configuration variable |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
682 GNULIB_REVISION is set in bootstrap.conf, then that revision is |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
683 checked out. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
684 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
685 If you maintain a package and want to pin a particular revision of the |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
686 Gnulib sources that has been tested with your package, then there are |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
687 two possible approaches: either configure a 'gnulib' submodule with the |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
688 appropriate revision, or set GNULIB_REVISION (and if necessary |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
689 GNULIB_URL) in bootstrap.conf. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
690 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
691 Running without arguments will suffice in most cases. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
692 EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
693 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
694 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
695 # Fetch auxiliary files that are omitted from the version control |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
696 # repository of this package. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
697 autopull() |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
698 { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
699 # Ensure that CDPATH is not set. Otherwise, the output from cd |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
700 # would cause trouble in at least one use below. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
701 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
702 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
703 # Parse options. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
704 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
705 # Use git to update gnulib sources |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
706 use_git=true |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
707 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
708 for option |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
709 do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
710 case $option in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
711 --help) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
712 autopull_usage |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
713 return;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
714 --version) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
715 set -e |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
716 echo "autopull.sh $scriptlibversion" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
717 echo "$copyright" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
718 return 0 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
719 ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
720 --skip-po) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
721 SKIP_PO=t;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
722 --force) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
723 checkout_only_file=;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
724 --bootstrap-sync) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
725 bootstrap_sync=true;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
726 --no-bootstrap-sync) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
727 bootstrap_sync=false;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
728 --no-git) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
729 use_git=false;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
730 *) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
731 bootstrap_option_hook $option || die "$option: unknown option";; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
732 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
733 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
734 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
735 $use_git || test -n "$GNULIB_SRCDIR" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
736 || die "Error: --no-git requires \$GNULIB_SRCDIR environment variable" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
737 "or --gnulib-srcdir option" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
738 test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
739 || die "Error: \$GNULIB_SRCDIR environment variable" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
740 "or --gnulib-srcdir option is specified," \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
741 "but does not denote a directory" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
742 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
743 if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
744 die "Running this script from a non-checked-out distribution is risky." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
745 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
746 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
747 check_build_prerequisites $use_git |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
748 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
749 if $use_gnulib || $bootstrap_sync; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
750 prepare_GNULIB_SRCDIR |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
751 if $bootstrap_sync; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
752 upgrade_bootstrap |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
753 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
754 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
755 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
756 # Find sha1sum, named gsha1sum on MacPorts, shasum on Mac OS X 10.6. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
757 # Also find the compatible sha1 utility on the BSDs |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
758 if test x"$SKIP_PO" = x; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
759 find_tool SHA1SUM sha1sum gsha1sum shasum sha1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
760 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
761 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
762 # See if we can use gnulib's git-merge-changelog merge driver. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
763 if $use_git && test -d .git && check_exists git; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
764 if git config merge.merge-changelog.driver >/dev/null ; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
765 : |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
766 elif check_exists git-merge-changelog; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
767 echo "$0: initializing git-merge-changelog driver" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
768 git config merge.merge-changelog.name 'GNU-style ChangeLog merge driver' |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
769 git config merge.merge-changelog.driver 'git-merge-changelog %O %A %B' |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
770 else |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
771 echo "$0: consider installing git-merge-changelog from gnulib" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
772 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
773 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
774 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
775 case $SKIP_PO in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
776 '') |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
777 if test -d po; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
778 update_po_files po $package || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
779 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
780 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
781 if test -d runtime-po; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
782 update_po_files runtime-po $package-runtime || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
783 fi;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
784 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
785 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
786 # --------------------------------------------------------------------------- |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
787 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
788 bootstrap_post_pull_hook \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
789 || die "bootstrap_post_pull_hook failed" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
790 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
791 # Don't proceed if there are uninitialized submodules. In particular, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
792 # autogen.sh will remove dangling links, which might be links into |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
793 # uninitialized submodules. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
794 # But it's OK if the 'gnulib' submodule is uninitialized, as long as |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
795 # GNULIB_SRCDIR is set. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
796 if $use_git; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
797 # Uninitialized submodules are listed with an initial dash. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
798 uninitialized=`git submodule | grep '^-' | awk '{ print $2 }'` |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
799 if test -n "$GNULIB_SRCDIR"; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
800 uninitialized=`echo "$uninitialized" | grep -v '^gnulib$'` |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
801 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
802 if test -n "$uninitialized"; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
803 uninit_comma=`echo "$uninitialized" | tr '\n' ',' | sed -e 's|,$|.|'` |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
804 die "Some git submodules are not initialized: "$uninit_comma \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
805 "Either use option '--no-git'," \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
806 "or run 'git submodule update --init' and bootstrap again." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
807 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
808 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
809 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
810 if test -f "$medir"/autogen.sh; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
811 echo "$0: done. Now you can run '$medir/autogen.sh'." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
812 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
813 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
814 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
815 # ----------------------------- Get translations. ----------------------------- |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
816 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
817 download_po_files() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
818 subdir=$1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
819 domain=$2 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
820 echo "$me: getting translations into $subdir for $domain..." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
821 cmd=$(printf "$po_download_command_format" "$subdir" "$domain") |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
822 eval "$cmd" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
823 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
824 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
825 # Mirror .po files to $po_dir/.reference and copy only the new |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
826 # or modified ones into $po_dir. Also update $po_dir/LINGUAS. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
827 # Note po files that exist locally only are left in $po_dir but will |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
828 # not be included in LINGUAS and hence will not be distributed. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
829 update_po_files() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
830 # Directory containing primary .po files. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
831 # Overwrite them only when we're sure a .po file is new. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
832 po_dir=$1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
833 domain=$2 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
834 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
835 # Mirror *.po files into this dir. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
836 # Usually contains *.s1 checksum files. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
837 ref_po_dir="$po_dir/.reference" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
838 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
839 test -d $ref_po_dir || mkdir $ref_po_dir || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
840 download_po_files $ref_po_dir $domain \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
841 && ls "$ref_po_dir"/*.po 2>/dev/null | |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
842 sed 's|.*/||; s|\.po$||' > "$po_dir/LINGUAS" || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
843 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
844 langs=$(cd $ref_po_dir && echo *.po | sed 's/\.po//g') |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
845 test "$langs" = '*' && langs=x |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
846 for po in $langs; do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
847 case $po in x) continue;; esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
848 new_po="$ref_po_dir/$po.po" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
849 cksum_file="$ref_po_dir/$po.s1" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
850 if ! test -f "$cksum_file" || |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
851 ! test -f "$po_dir/$po.po" || |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
852 ! $SHA1SUM -c "$cksum_file" < "$new_po" > /dev/null 2>&1; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
853 echo "$me: updated $po_dir/$po.po..." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
854 cp "$new_po" "$po_dir/$po.po" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
855 && $SHA1SUM < "$new_po" > "$cksum_file" || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
856 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
857 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
858 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
859 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
860 # -------- Generate files automatically from existing sources. -------------- |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
861 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
862 autogen_usage() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
863 cat <<EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
864 Usage: $me [OPTION]... |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
865 Bootstrap this package from the checked-out sources. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
866 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
867 Optional environment variables: |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
868 GNULIB_SRCDIR Specifies the local directory where gnulib |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
869 sources reside. Use this if you already |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
870 have gnulib sources on your machine, and |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
871 you want to use these sources. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
872 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
873 Options: |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
874 --copy copy files instead of creating symbolic links |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
875 --force attempt to bootstrap even if the sources seem |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
876 not to have been checked out |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
877 EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
878 bootstrap_print_option_usage_hook |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
879 cat <<EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
880 If the file bootstrap.conf exists in the same directory as this script, its |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
881 contents are read as shell variables to configure the bootstrap. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
882 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
883 For build prerequisites, environment variables like \$AUTOCONF and \$AMTAR |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
884 are honored. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
885 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
886 Gnulib sources are assumed to be present: |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
887 * in \$GNULIB_SRCDIR, if that environment variable is set, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
888 * otherwise, in the 'gnulib' submodule, if such a submodule is configured, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
889 * otherwise, in the 'gnulib' subdirectory. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
890 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
891 Running without arguments will suffice in most cases. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
892 EOF |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
893 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
894 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
895 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
896 version_controlled_file() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
897 parent=$1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
898 file=$2 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
899 if test -d .git; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
900 git rm -n "$file" > /dev/null 2>&1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
901 elif test -d .svn; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
902 svn log -r HEAD "$file" > /dev/null 2>&1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
903 elif test -d CVS; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
904 grep -F "/${file##*/}/" "$parent/CVS/Entries" 2>/dev/null | |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
905 grep '^/[^/]*/[0-9]' > /dev/null |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
906 else |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
907 warn_ "no version control for $file?" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
908 false |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
909 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
910 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
911 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
912 # Strip blank and comment lines to leave significant entries. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
913 gitignore_entries() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
914 sed '/^#/d; /^$/d' "$@" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
915 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
916 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
917 # If $STR is not already on a line by itself in $FILE, insert it at the start. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
918 # Entries are inserted at the start of the ignore list to ensure existing |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
919 # entries starting with ! are not overridden. Such entries support |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
920 # whitelisting exceptions after a more generic blacklist pattern. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
921 insert_if_absent() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
922 file=$1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
923 str=$2 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
924 test -f $file || touch $file |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
925 test -r $file || die "Error: failed to read ignore file: $file" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
926 duplicate_entries=$(gitignore_entries $file | sort | uniq -d) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
927 if [ "$duplicate_entries" ] ; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
928 die "Error: Duplicate entries in $file: " $duplicate_entries |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
929 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
930 linesold=$(gitignore_entries $file | wc -l) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
931 linesnew=$( { echo "$str"; cat $file; } | gitignore_entries | sort -u | wc -l) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
932 if [ $linesold != $linesnew ] ; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
933 { echo "$str" | cat - $file > $file.bak && mv $file.bak $file; } \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
934 || die "insert_if_absent $file $str: failed" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
935 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
936 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
937 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
938 # Adjust $PATTERN for $VC_IGNORE_FILE and insert it with |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
939 # insert_if_absent. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
940 insert_vc_ignore() { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
941 vc_ignore_file="$1" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
942 pattern="$2" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
943 case $vc_ignore_file in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
944 *.gitignore) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
945 # A .gitignore entry that does not start with '/' applies |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
946 # recursively to subdirectories, so prepend '/' to every |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
947 # .gitignore entry. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
948 pattern=$(echo "$pattern" | sed s,^,/,);; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
949 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
950 insert_if_absent "$vc_ignore_file" "$pattern" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
951 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
952 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
953 symlink_to_dir() |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
954 { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
955 src=$1/$2 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
956 dst=${3-$2} |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
957 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
958 test -f "$src" && { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
959 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
960 # If the destination directory doesn't exist, create it. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
961 # This is required at least for "lib/uniwidth/cjk.h". |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
962 dst_dir=$(dirname "$dst") |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
963 if ! test -d "$dst_dir"; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
964 mkdir -p "$dst_dir" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
965 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
966 # If we've just created a directory like lib/uniwidth, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
967 # tell version control system(s) it's ignorable. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
968 # FIXME: for now, this does only one level |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
969 parent=$(dirname "$dst_dir") |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
970 for dot_ig in x $vc_ignore; do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
971 test $dot_ig = x && continue |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
972 ig=$parent/$dot_ig |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
973 insert_vc_ignore $ig "${dst_dir##*/}/" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
974 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
975 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
976 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
977 if $copy; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
978 { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
979 test ! -h "$dst" || { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
980 echo "$me: rm -f $dst" && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
981 rm -f "$dst" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
982 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
983 } && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
984 test -f "$dst" && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
985 cmp -s "$src" "$dst" || { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
986 echo "$me: cp -fp $src $dst" && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
987 cp -fp "$src" "$dst" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
988 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
989 else |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
990 # Leave any existing symlink alone, if it already points to the source, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
991 # so that broken build tools that care about symlink times |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
992 # aren't confused into doing unnecessary builds. Conversely, if the |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
993 # existing symlink's timestamp is older than the source, make it afresh, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
994 # so that broken tools aren't confused into skipping needed builds. See |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
995 # <https://lists.gnu.org/r/bug-gnulib/2011-05/msg00326.html>. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
996 test -h "$dst" && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
997 src_ls=$(ls -diL "$src" 2>/dev/null) && set $src_ls && src_i=$1 && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
998 dst_ls=$(ls -diL "$dst" 2>/dev/null) && set $dst_ls && dst_i=$1 && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
999 test "$src_i" = "$dst_i" && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1000 both_ls=$(ls -dt "$src" "$dst") && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1001 test "X$both_ls" = "X$dst$nl$src" || { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1002 dot_dots= |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1003 case $src in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1004 /*) ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1005 *) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1006 case /$dst/ in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1007 *//* | */../* | */./* | /*/*/*/*/*/) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1008 die "invalid symlink calculation: $src -> $dst";; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1009 /*/*/*/*/) dot_dots=../../../;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1010 /*/*/*/) dot_dots=../../;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1011 /*/*/) dot_dots=../;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1012 esac;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1013 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1014 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1015 echo "$me: ln -fs $dot_dots$src $dst" && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1016 ln -fs "$dot_dots$src" "$dst" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1017 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1018 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1019 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1020 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1021 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1022 # Regenerate all autogeneratable files that are omitted from the |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1023 # version control repository. In particular, regenerate all |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1024 # aclocal.m4, config.h.in, Makefile.in, configure files with new |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1025 # versions of autoconf or automake. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1026 autogen() |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1027 { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1028 # Ensure that CDPATH is not set. Otherwise, the output from cd |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1029 # would cause trouble in at least one use below. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1030 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1031 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1032 # Environment variables that may be set by the user. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1033 : "${AUTOPOINT=autopoint}" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1034 : "${AUTORECONF=autoreconf}" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1035 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1036 if test "$vc_ignore" = auto; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1037 vc_ignore= |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1038 test -d .git && vc_ignore=.gitignore |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1039 test -d CVS && vc_ignore="$vc_ignore .cvsignore" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1040 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1041 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1042 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1043 # Parse options. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1044 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1045 # Whether to use copies instead of symlinks. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1046 copy=false |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1047 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1048 for option |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1049 do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1050 case $option in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1051 --help) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1052 autogen_usage |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1053 return;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1054 --version) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1055 set -e |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1056 echo "autogen.sh $scriptlibversion" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1057 echo "$copyright" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1058 return 0 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1059 ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1060 --force) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1061 checkout_only_file=;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1062 --copy) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1063 copy=true;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1064 *) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1065 bootstrap_option_hook $option || die "$option: unknown option";; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1066 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1067 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1068 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1069 test -z "$GNULIB_SRCDIR" || test -d "$GNULIB_SRCDIR" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1070 || die "Error: \$GNULIB_SRCDIR environment variable or --gnulib-srcdir" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1071 "option is specified, but does not denote a directory" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1072 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1073 if test -n "$checkout_only_file" && test ! -r "$checkout_only_file"; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1074 die "Running this script from a non-checked-out distribution is risky." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1075 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1076 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1077 if $use_gnulib; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1078 if test -z "$GNULIB_SRCDIR"; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1079 gnulib_path=$(test -f .gitmodules && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1080 git config --file .gitmodules submodule.gnulib.path) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1081 test -z "$gnulib_path" && gnulib_path=gnulib |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1082 GNULIB_SRCDIR=$gnulib_path |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1083 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1084 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1085 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1086 # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1087 found_aux_dir=no |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1088 grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'])' configure.ac \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1089 >/dev/null && found_aux_dir=yes |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1090 grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1091 >/dev/null && found_aux_dir=yes |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1092 test $found_aux_dir = yes \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1093 || die "configure.ac lacks 'AC_CONFIG_AUX_DIR([$build_aux])'; add it" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1094 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1095 # If $build_aux doesn't exist, create it now, otherwise some bits |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1096 # below will malfunction. If creating it, also mark it as ignored. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1097 if test ! -d $build_aux; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1098 mkdir $build_aux |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1099 for dot_ig in x $vc_ignore; do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1100 test $dot_ig = x && continue |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1101 insert_vc_ignore $dot_ig $build_aux/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1102 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1103 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1104 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1105 check_build_prerequisites false |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1106 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1107 use_libtool=0 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1108 # We'd like to use grep -E, to see if any of LT_INIT, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1109 # AC_PROG_LIBTOOL, AM_PROG_LIBTOOL is used in configure.ac, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1110 # but that's not portable enough (e.g., for Solaris). |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1111 grep '^[ ]*A[CM]_PROG_LIBTOOL' configure.ac >/dev/null \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1112 && use_libtool=1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1113 grep '^[ ]*LT_INIT' configure.ac >/dev/null \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1114 && use_libtool=1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1115 if test $use_libtool = 1; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1116 find_tool LIBTOOLIZE glibtoolize libtoolize |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1117 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1118 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1119 if $use_gnulib; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1120 gnulib_tool=$GNULIB_SRCDIR/gnulib-tool |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1121 <$gnulib_tool || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1122 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1123 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1124 # NOTE: we have to be careful to run both autopoint and libtoolize |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1125 # before gnulib-tool, since gnulib-tool is likely to provide newer |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1126 # versions of files "installed" by these two programs. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1127 # Then, *after* gnulib-tool (see below), we have to be careful to |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1128 # run autoreconf in such a way that it does not run either of these |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1129 # two just-pre-run programs. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1130 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1131 # Import from gettext. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1132 with_gettext=yes |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1133 grep '^[ ]*AM_GNU_GETTEXT_VERSION(' configure.ac >/dev/null || \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1134 with_gettext=no |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1135 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1136 if test $with_gettext = yes || test $use_libtool = 1; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1137 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1138 tempbase=.bootstrap$$ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1139 trap "rm -f $tempbase.0 $tempbase.1" HUP INT PIPE TERM |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1140 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1141 > $tempbase.0 > $tempbase.1 && |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1142 find . ! -type d -print | sort > $tempbase.0 || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1143 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1144 if test $with_gettext = yes; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1145 # Released autopoint has the tendency to install macros that have been |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1146 # obsoleted in current gnulib, so run this before gnulib-tool. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1147 echo "$0: $AUTOPOINT --force" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1148 $AUTOPOINT --force || return |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1149 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1150 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1151 # Autoreconf runs aclocal before libtoolize, which causes spurious |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1152 # warnings if the initial aclocal is confused by the libtoolized |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1153 # (or worse out-of-date) macro directory. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1154 # libtoolize 1.9b added the --install option; but we support back |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1155 # to libtoolize 1.5.22, where the install action was default. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1156 if test $use_libtool = 1; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1157 install= |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1158 case $($LIBTOOLIZE --help) in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1159 *--install*) install=--install ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1160 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1161 echo "running: $LIBTOOLIZE $install --copy" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1162 $LIBTOOLIZE $install --copy |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1163 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1164 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1165 find . ! -type d -print | sort >$tempbase.1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1166 old_IFS=$IFS |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1167 IFS=$nl |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1168 for file in $(comm -13 $tempbase.0 $tempbase.1); do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1169 IFS=$old_IFS |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1170 parent=${file%/*} |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1171 version_controlled_file "$parent" "$file" || { |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1172 for dot_ig in x $vc_ignore; do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1173 test $dot_ig = x && continue |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1174 ig=$parent/$dot_ig |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1175 insert_vc_ignore "$ig" "${file##*/}" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1176 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1177 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1178 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1179 IFS=$old_IFS |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1180 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1181 rm -f $tempbase.0 $tempbase.1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1182 trap - HUP INT PIPE TERM |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1183 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1184 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1185 # Import from gnulib. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1186 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1187 if $use_gnulib; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1188 gnulib_tool_options="\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1189 --no-changelog\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1190 --aux-dir=$build_aux\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1191 --doc-base=$doc_base\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1192 --lib=$gnulib_name\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1193 --m4-base=$m4_base/\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1194 --source-base=$source_base/\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1195 --tests-base=$tests_base\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1196 --local-dir=$local_gl_dir\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1197 $gnulib_tool_option_extras\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1198 " |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1199 if test $use_libtool = 1; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1200 case "$gnulib_tool_options " in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1201 *' --libtool '*) ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1202 *) gnulib_tool_options="$gnulib_tool_options --libtool" ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1203 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1204 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1205 echo "$0: $gnulib_tool $gnulib_tool_options --import ..." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1206 $gnulib_tool $gnulib_tool_options --import $gnulib_modules \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1207 || die "gnulib-tool failed" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1208 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1209 for file in $gnulib_files; do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1210 symlink_to_dir "$GNULIB_SRCDIR" $file \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1211 || die "failed to symlink $file" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1212 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1213 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1214 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1215 bootstrap_post_import_hook \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1216 || die "bootstrap_post_import_hook failed" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1217 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1218 # Remove any dangling symlink matching "*.m4" or "*.[ch]" in some |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1219 # gnulib-populated directories. Such .m4 files would cause aclocal to fail. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1220 # The following requires GNU find 4.2.3 or newer. Considering the usual |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1221 # portability constraints of this script, that may seem a very demanding |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1222 # requirement, but it should be ok. Ignore any failure, which is fine, |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1223 # since this is only a convenience to help developers avoid the relatively |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1224 # unusual case in which a symlinked-to .m4 file is git-removed from gnulib |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1225 # between successive runs of this script. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1226 find "$m4_base" "$source_base" \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1227 -depth \( -name '*.m4' -o -name '*.[ch]' \) \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1228 -type l -xtype l -delete > /dev/null 2>&1 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1229 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1230 # Invoke autoreconf with --force --install to ensure upgrades of tools |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1231 # such as ylwrap. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1232 AUTORECONFFLAGS="--verbose --install --force -I $m4_base $ACLOCAL_FLAGS" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1233 AUTORECONFFLAGS="$AUTORECONFFLAGS --no-recursive" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1234 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1235 # Tell autoreconf not to invoke autopoint or libtoolize; they were run above. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1236 echo "running: AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1237 AUTOPOINT=true LIBTOOLIZE=true $AUTORECONF $AUTORECONFFLAGS \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1238 || die "autoreconf failed" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1239 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1240 # Get some extra files from gnulib, overriding existing files. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1241 for file in $gnulib_extra_files; do |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1242 case $file in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1243 */INSTALL) dst=INSTALL;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1244 build-aux/*) dst=$build_aux/${file#build-aux/};; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1245 *) dst=$file;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1246 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1247 symlink_to_dir "$GNULIB_SRCDIR" $file $dst \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1248 || die "failed to symlink $file" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1249 done |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1250 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1251 if test $with_gettext = yes; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1252 # Create gettext configuration. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1253 echo "$0: Creating po/Makevars from po/Makevars.template ..." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1254 rm -f po/Makevars |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1255 sed ' |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1256 /^EXTRA_LOCALE_CATEGORIES *=/s/=.*/= '"$EXTRA_LOCALE_CATEGORIES"'/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1257 /^COPYRIGHT_HOLDER *=/s/=.*/= '"$COPYRIGHT_HOLDER"'/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1258 /^MSGID_BUGS_ADDRESS *=/s|=.*|= '"$MSGID_BUGS_ADDRESS"'| |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1259 /^XGETTEXT_OPTIONS *=/{ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1260 s/$/ \\/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1261 a\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1262 '"$XGETTEXT_OPTIONS"' $${end_of_xgettext_options+} |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1263 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1264 ' po/Makevars.template >po/Makevars \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1265 || die 'cannot generate po/Makevars' |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1266 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1267 # If the 'gettext' module is in use, grab the latest Makefile.in.in. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1268 # If only the 'gettext-h' module is in use, assume autopoint already |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1269 # put the correct version of this file into place. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1270 case $gnulib_modules in |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1271 *gettext-h*) ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1272 *gettext*) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1273 cp $GNULIB_SRCDIR/build-aux/po/Makefile.in.in po/Makefile.in.in \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1274 || die "cannot create po/Makefile.in.in" |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1275 ;; |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1276 esac |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1277 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1278 if test -d runtime-po; then |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1279 # Similarly for runtime-po/Makevars, but not quite the same. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1280 rm -f runtime-po/Makevars |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1281 sed ' |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1282 /^DOMAIN *=.*/s/=.*/= '"$package"'-runtime/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1283 /^subdir *=.*/s/=.*/= runtime-po/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1284 /^MSGID_BUGS_ADDRESS *=/s/=.*/= bug-'"$package"'@gnu.org/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1285 /^XGETTEXT_OPTIONS *=/{ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1286 s/$/ \\/ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1287 a\ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1288 '"$XGETTEXT_OPTIONS_RUNTIME"' $${end_of_xgettext_options+} |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1289 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1290 ' po/Makevars.template >runtime-po/Makevars \ |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1291 || die 'cannot generate runtime-po/Makevars' |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1292 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1293 # Copy identical files from po to runtime-po. |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1294 (cd po && cp -p Makefile.in.in *-quot *.header *.sed *.sin ../runtime-po) |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1295 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1296 fi |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1297 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1298 bootstrap_epilogue |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1299 |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1300 echo "$0: done. Now you can run './configure'." |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1301 } |
|
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1302 |
| 31420 | 1303 # ---------------------------------------------------------------------------- |
| 1304 | |
| 1305 # Local Variables: | |
| 1306 # eval: (add-hook 'before-save-hook 'time-stamp) | |
|
32477
e6d339b9309d
maint: Update gnulib.
Markus Mützel <markus.muetzel@gmx.de>
parents:
31420
diff
changeset
|
1307 # time-stamp-start: "scriptlibversion=" |
| 31420 | 1308 # time-stamp-format: "%:y-%02m-%02d.%02H" |
| 1309 # time-stamp-time-zone: "UTC0" | |
| 1310 # time-stamp-end: "; # UTC" | |
| 1311 # End: |