unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
blob a0cdb7db31d8332d3b5b2dcb193ba08ea6d943ae 4082 bytes (raw)
name: admin/merge-gnulib 	 # note: path name is non-authoritative(*)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
 
#! /bin/sh
# Merge gnulib sources into Emacs sources.
# Typical usage:
#
#	admin/merge-gnulib

# Copyright 2012-2021 Free Software Foundation, Inc.

# This file is part of GNU Emacs.

# GNU Emacs is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.

# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.

# You should have received a copy of the GNU General Public License
# along with GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.

# written by Paul Eggert

GNULIB_URL=git://git.savannah.gnu.org/gnulib.git

GNULIB_MODULES='
  alloca-opt binary-io byteswap c-ctype c-strcase
  canonicalize-lgpl
  careadlinkat close-stream copy-file-range
  count-leading-zeros count-one-bits count-trailing-zeros
  crypto/md5-buffer crypto/sha1-buffer crypto/sha256-buffer crypto/sha512-buffer
  d-type diffseq double-slash-root dtoastr dtotimespec dup2
  environ execinfo explicit_bzero faccessat
  fchmodat fcntl fcntl-h fdopendir file-has-acl
  filemode filename filevercmp flexmember fpieee
  free-posix fstatat fsusage fsync futimens
  getloadavg getopt-gnu getrandom gettime gettimeofday gitlog-to-changelog
  ieee754-h ignore-value intprops largefile libgmp lstat
  manywarnings memmem-simple mempcpy memrchr minmax mkostemp mktime nstrftime
  pathmax pipe2 pselect pthread_sigmask
  qcopy-acl readlink readlinkat regex
  sig2str sigdescr_np socklen stat-time std-gnu11 stdalign stddef stdio
  stpcpy strnlen strtoimax symlink sys_stat sys_time
  tempname time time_r time_rz timegm timer-time timespec-add timespec-sub
  update-copyright unlocked-io utimensat
  vla warnings
'

AVOIDED_MODULES='
  btowc close dup fchdir fstat langinfo lock
  malloc-posix mbrtowc mbsinit memchr mkdir msvc-inval msvc-nothrow nl_langinfo
  openat-die opendir pthread-h raise
  save-cwd select setenv sigprocmask stat stdarg stdbool
  threadlib tzset unsetenv utime utime-h
  wchar wcrtomb wctype-h
'

GNULIB_TOOL_FLAGS='
  --conditional-dependencies --import --no-changelog --no-vc-files
  --gnu-make
  --makefile-name=gnulib.mk.in
'

# The source directory, with a trailing '/'.
# If empty, the source directory is the working directory.
src=$2
case $src in
  */ | '') ;;
  *) src=$src/ ;;
esac

# Gnulib's source directory.
gnulib_srcdir=${1-$src../gnulib}

case $gnulib_srcdir in
  -*) src=- ;;
esac
case $src in
  -*)
    printf '%s\n' >&2 "$0: usage: $0 [GNULIB_SRCDIR [SRCDIR]]

    SRCDIR is the Emacs source directory (default: working directory).
    GNULIB_SRCDIR is the Gnulib source directory (default: SRCDIR/../gnulib)."
    exit 1 ;;
esac

test -x "$src"autogen.sh || {
  printf '%s\n' >&2 "$0: '${src:-.}' is not an Emacs source directory."
  exit 1
}

test -d "$gnulib_srcdir" ||
git clone -- "$GNULIB_URL" "$gnulib_srcdir" ||
exit

test -x "$gnulib_srcdir"/gnulib-tool || {
  printf '%s\n' >&2 "$0: '$gnulib_srcdir' is not a Gnulib source directory."
  exit 1
}

avoided_flags=
for module in $AVOIDED_MODULES; do
  avoided_flags="$avoided_flags --avoid=$module"
done

"$gnulib_srcdir"/gnulib-tool --dir="$src" $GNULIB_TOOL_FLAGS \
	$avoided_flags $GNULIB_MODULES &&
rm -- "$src"lib/gl_openssl.h "$src"m4/fcntl-o.m4 \
      "$src"m4/gl-openssl.m4 \
      "$src"m4/gnulib-cache.m4 "$src"m4/gnulib-tool.m4 \
      "$src"m4/manywarnings-c++.m4 \
      "$src"m4/warn-on-use.m4 "$src"m4/wint_t.m4 &&
cp -- "$gnulib_srcdir"/build-aux/texinfo.tex "$src"doc/misc &&
cp -- "$gnulib_srcdir"/build-aux/config.guess \
      "$gnulib_srcdir"/build-aux/config.sub \
      "$gnulib_srcdir"/build-aux/install-sh \
      "$gnulib_srcdir"/build-aux/move-if-change \
   "$src"build-aux &&
cp -- "$gnulib_srcdir"/lib/af_alg.h \
      "$gnulib_srcdir"/lib/save-cwd.h \
   "$src"lib &&
{ test -z "$src" || cd "$src"; } &&
./autogen.sh

debug log:

solving a0cdb7db31 ...
found a0cdb7db31 in https://yhetil.org/emacs-bugs/d40c1fec-cf1a-6d4e-84b1-983e61d8aece@cs.ucla.edu/
found 76349034fd in https://yhetil.org/emacs-bugs/d40c1fec-cf1a-6d4e-84b1-983e61d8aece@cs.ucla.edu/
found 1c8b442700 in https://git.savannah.gnu.org/cgit/emacs.git
preparing index
index prepared:
100755 1c8b442700086e90abbc438a98878fd7daee8fb3	admin/merge-gnulib

applying [1/2] https://yhetil.org/emacs-bugs/d40c1fec-cf1a-6d4e-84b1-983e61d8aece@cs.ucla.edu/
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 1c8b442700..76349034fd 100755


applying [2/2] https://yhetil.org/emacs-bugs/d40c1fec-cf1a-6d4e-84b1-983e61d8aece@cs.ucla.edu/
diff --git a/admin/merge-gnulib b/admin/merge-gnulib
index 76349034fd..a0cdb7db31 100755

Checking patch admin/merge-gnulib...
Applied patch admin/merge-gnulib cleanly.
Checking patch admin/merge-gnulib...
Applied patch admin/merge-gnulib cleanly.

index at:
100755 a0cdb7db31d8332d3b5b2dcb193ba08ea6d943ae	admin/merge-gnulib

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).