* admin/update_autogen (commit): With git, call "add" before "commit".
[emacs.git] / admin / merge-gnulib
blob6c0dffb6dcee7aff575d6f360dda9885a8114b05
1 #! /bin/sh
2 # Merge gnulib sources into Emacs sources.
3 # Typical usage:
5 # admin/merge-gnulib
7 # Copyright 2012-2014 Free Software Foundation, Inc.
9 # This file is part of GNU Emacs.
11 # GNU Emacs is free software: you can redistribute it and/or modify
12 # it under the terms of the GNU General Public License as published by
13 # the Free Software Foundation, either version 3 of the License, or
14 # (at your option) any later version.
16 # GNU Emacs is distributed in the hope that it will be useful,
17 # but WITHOUT ANY WARRANTY; without even the implied warranty of
18 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 # GNU General Public License for more details.
21 # You should have received a copy of the GNU General Public License
22 # along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
24 # written by Paul Eggert
26 GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
28 GNULIB_MODULES='
29 alloca-opt byteswap c-ctype c-strcase
30 careadlinkat close-stream count-one-bits count-trailing-zeros
31 crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512
32 dtoastr dtotimespec dup2 environ execinfo faccessat
33 fcntl fcntl-h fdatasync fdopendir filemode fstatat fsync
34 getloadavg getopt-gnu gettime gettimeofday
35 intprops largefile lstat
36 manywarnings memrchr mkostemp mktime
37 pipe2 pselect pthread_sigmask putenv qacl readlink readlinkat
38 sig2str socklen stat-time stdalign stdarg stdbool stdio
39 strftime strtoimax strtoumax symlink sys_stat
40 sys_time time timer-time timespec-add timespec-sub
41 unsetenv update-copyright utimens
42 warnings
45 GNULIB_TOOL_FLAGS='
46 --avoid=close --avoid=dup
47 --avoid=fchdir --avoid=fstat
48 --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
49 --avoid=open --avoid=openat-die --avoid=opendir
50 --avoid=raise
51 --avoid=save-cwd --avoid=select --avoid=sigprocmask
52 --avoid=threadlib
53 --conditional-dependencies --import --no-changelog --no-vc-files
54 --makefile-name=gnulib.mk
57 # The source directory, with a trailing '/'.
58 # If empty, the source directory is the working directory.
59 src=$2
60 case $src in
61 */ | '') ;;
62 *) src=$src/ ;;
63 esac
65 # Gnulib's source directory.
66 gnulib_srcdir=${1-$src../gnulib}
68 case $gnulib_srcdir in
69 -*) src=- ;;
70 esac
71 case $src in
72 -*)
73 echo >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
75 SRCDIR is the Emacs source directory (default: working directory).
76 GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
77 exit 1 ;;
78 esac
80 test -x "$src"autogen.sh || {
81 echo >&2 "$0: '${src:-.}' is not an Emacs source directory."
82 exit 1
85 test -d "$gnulib_srcdir" ||
86 git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
87 exit
89 test -x "$gnulib_srcdir"/gnulib-tool || {
90 echo >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
91 exit 1
94 "$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
95 rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \
96 "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
97 cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
98 cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
99 autoreconf -i -I m4 -- ${src:+"$src"}