Merge from emacs-24; up to 2014-06-08T18:27:22Z!eggert@cs.ucla.edu
[bpt/emacs.git] / admin / merge-gnulib
... / ...
CommitLineData
1#! /bin/sh
2# Merge gnulib sources into Emacs sources.
3# Typical usage:
4#
5# admin/merge-gnulib
6
7# Copyright 2012-2014 Free Software Foundation, Inc.
8
9# This file is part of GNU Emacs.
10
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.
15
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.
20
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/>.
23
24# written by Paul Eggert
25
26GNULIB_URL=git://git.savannah.gnu.org/gnulib.git
27
28GNULIB_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 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
43'
44
45GNULIB_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=stdarg --avoid=stdbool
53 --avoid=threadlib
54 --conditional-dependencies --import --no-changelog --no-vc-files
55 --makefile-name=gnulib.mk
56'
57
58# The source directory, with a trailing '/'.
59# If empty, the source directory is the working directory.
60src=$2
61case $src in
62 */ | '') ;;
63 *) src=$src/ ;;
64esac
65
66# Gnulib's source directory.
67gnulib_srcdir=${1-$src../gnulib}
68
69case $gnulib_srcdir in
70 -*) src=- ;;
71esac
72case $src in
73 -*)
74 echo >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]
75
76 SRCDIR is the Emacs source directory (default: working directory).
77 GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
78 exit 1 ;;
79esac
80
81test -x "$src"autogen.sh || {
82 echo >&2 "$0: '${src:-.}' is not an Emacs source directory."
83 exit 1
84}
85
86test -d "$gnulib_srcdir" ||
87git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
88exit
89
90test -x "$gnulib_srcdir"/gnulib-tool || {
91 echo >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
92 exit 1
93}
94
95"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS $GNULIB_MODULES &&
96rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 "$src"m4/gl-openssl.m4 \
97 "$src"m4/gnulib-cache.m4"$src" m4/warn-on-use.m4 &&
98cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
99cp -- "$gnulib_srcdir"/build-aux/move-if-change "$src"build-aux &&
100{ test -z "$src" || cd "$src"; } &&
101./autogen.sh