2010-12-03 14:45:09 +00:00
|
|
|
#!/bin/sh
|
|
|
|
### make-dist: create an Emacs distribution tar file from current srcdir
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
## Copyright (C) 1995, 1997-1998, 2000-2019 Free Software Foundation,
|
2015-01-01 22:26:41 +00:00
|
|
|
## Inc.
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## 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
|
2017-09-13 22:52:52 +00:00
|
|
|
## along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
### Commentary:
|
|
|
|
|
|
|
|
## This basically creates a duplicate directory structure, and then
|
|
|
|
## hard links into it only those files that should be distributed.
|
|
|
|
## This means that if you add a file with an odd name, you should make
|
|
|
|
## sure that this script will include it.
|
|
|
|
|
|
|
|
### Code:
|
|
|
|
|
|
|
|
progname="$0"
|
|
|
|
|
|
|
|
### Exit if a command fails.
|
|
|
|
#set -e
|
|
|
|
|
|
|
|
### Print out each line we read, for debugging's sake.
|
|
|
|
#set -v
|
|
|
|
|
|
|
|
LANGUAGE=C
|
|
|
|
LC_ALL=C
|
|
|
|
LC_MESSAGES=
|
|
|
|
LANG=
|
|
|
|
export LANGUAGE LC_ALL LC_MESSAGES LANG
|
|
|
|
|
2013-05-01 19:28:41 +00:00
|
|
|
## Remove unnecessary restrictions on file access.
|
|
|
|
umask 022
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
update=yes
|
|
|
|
check=yes
|
|
|
|
clean_up=no
|
|
|
|
make_tar=no
|
|
|
|
default_gzip=gzip
|
|
|
|
newer=""
|
2018-05-05 02:13:18 +00:00
|
|
|
with_info=yes
|
2013-07-25 06:57:25 +00:00
|
|
|
with_tests=no
|
2015-05-12 00:29:06 +00:00
|
|
|
changelog=yes
|
2016-12-08 00:59:14 +00:00
|
|
|
verbose=no
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
while [ $# -gt 0 ]; do
|
|
|
|
case "$1" in
|
|
|
|
## This option tells make-dist to delete the staging directory
|
|
|
|
## when done. It is useless to use this unless you make a tar file.
|
|
|
|
"--clean-up" )
|
|
|
|
clean_up=yes
|
|
|
|
;;
|
|
|
|
## This option tells make-dist to make a tar file.
|
|
|
|
"--tar" )
|
|
|
|
make_tar=yes
|
|
|
|
;;
|
|
|
|
## This option tells make-dist not to recompile or do analogous things.
|
|
|
|
"--no-update" )
|
|
|
|
update=no
|
|
|
|
;;
|
|
|
|
## This option says don't check for bad file names, etc.
|
|
|
|
"--no-check" )
|
|
|
|
check=no
|
|
|
|
;;
|
2015-05-12 00:29:06 +00:00
|
|
|
"--no-changelog" )
|
|
|
|
changelog=no
|
|
|
|
;;
|
2018-05-05 02:13:18 +00:00
|
|
|
## This options tells make-dist to skip the info files. This can
|
|
|
|
## be useful for creating a tarball purely for test purposes.
|
|
|
|
"--no-info" )
|
|
|
|
with_info=no
|
|
|
|
;;
|
2010-12-03 14:45:09 +00:00
|
|
|
## This option tells make-dist to make the distribution normally, then
|
|
|
|
## remove all files older than the given timestamp file. This is useful
|
|
|
|
## for creating incremental or patch distributions.
|
|
|
|
"--newer")
|
|
|
|
newer="$2"
|
|
|
|
new_extension=".new"
|
|
|
|
shift
|
|
|
|
;;
|
2015-04-19 21:40:51 +00:00
|
|
|
## This option tells make-dist to use 'bzip2' instead of gzip.
|
2010-12-03 14:45:09 +00:00
|
|
|
"--bzip2")
|
|
|
|
default_gzip="bzip2"
|
|
|
|
;;
|
2013-01-10 04:00:02 +00:00
|
|
|
## Same with xz.
|
|
|
|
"--xz")
|
|
|
|
default_gzip="xz"
|
|
|
|
;;
|
|
|
|
"--no-compress")
|
|
|
|
default_gzip="cat"
|
|
|
|
;;
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
"--snapshot")
|
|
|
|
clean_up=yes
|
|
|
|
make_tar=yes
|
|
|
|
update=no
|
|
|
|
;;
|
|
|
|
|
2013-07-25 06:57:25 +00:00
|
|
|
## Include the test/ directory.
|
|
|
|
## This option is mainly for the hydra build server.
|
|
|
|
"--tests")
|
|
|
|
with_tests=yes
|
|
|
|
;;
|
|
|
|
|
2016-12-08 00:59:14 +00:00
|
|
|
"--verbose")
|
|
|
|
verbose=yes
|
|
|
|
;;
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
"--help")
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
printf '%s\n' "Usage: ${progname} [options]"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo ""
|
|
|
|
echo " --bzip2 use bzip2 instead of gzip"
|
|
|
|
echo " --clean-up delete staging directories when done"
|
2013-01-10 04:00:02 +00:00
|
|
|
echo " --xz use xz instead of gzip"
|
|
|
|
echo " --no-compress don't compress"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo " --newer=TIME don't include files older than TIME"
|
|
|
|
echo " --no-check don't check for bad file names etc."
|
|
|
|
echo " --no-update don't recompile or do analogous things"
|
2015-05-12 00:29:06 +00:00
|
|
|
echo " --no-changelog don't generate the top-level ChangeLog"
|
2018-05-05 02:13:18 +00:00
|
|
|
echo " --no-info don't include info files"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo " --snapshot same as --clean-up --no-update --tar --no-check"
|
|
|
|
echo " --tar make a tar file"
|
2013-07-25 06:57:25 +00:00
|
|
|
echo " --tests include the test/ directory"
|
2016-12-08 00:59:14 +00:00
|
|
|
echo " --verbose noisier output"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo ""
|
|
|
|
exit 0
|
|
|
|
;;
|
|
|
|
|
|
|
|
* )
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
printf '%s\n' "${progname}: Unrecognized argument: $1" >&2
|
2010-12-03 14:45:09 +00:00
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
shift
|
|
|
|
done
|
|
|
|
|
|
|
|
### Make sure we're running in the right place.
|
|
|
|
if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
printf '%s\n' "${progname}: Can't find 'src/lisp.h' and 'lisp/subr.el'." >&2
|
|
|
|
printf '%s\n' "${progname} must be run in the top directory of the Emacs" >&2
|
|
|
|
printf '%s\n' "distribution tree. cd to that directory and try again." >&2
|
2010-12-03 14:45:09 +00:00
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Find where to run Emacs.
|
|
|
|
### (Accept only absolute file names.)
|
|
|
|
if [ $update = yes ];
|
|
|
|
then
|
|
|
|
if [ -f src/emacs ];
|
|
|
|
then
|
|
|
|
EMACS=`pwd`/src/emacs
|
|
|
|
else
|
|
|
|
case $EMACS in
|
|
|
|
/*) ;;
|
|
|
|
*)
|
|
|
|
if [ ! -f "$EMACS" ]; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
printf '%s\n' "$0: You must set the EMACS environment variable " \
|
2010-12-03 14:45:09 +00:00
|
|
|
"to an absolute file name." 2>&1
|
|
|
|
exit 1
|
|
|
|
fi;;
|
|
|
|
esac
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Find out which version of Emacs this is.
|
2011-01-31 08:12:52 +00:00
|
|
|
version=`
|
2014-04-03 01:16:18 +00:00
|
|
|
sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' <configure.ac
|
2011-01-31 08:12:52 +00:00
|
|
|
` || version=
|
2010-12-03 14:45:09 +00:00
|
|
|
if [ ! "${version}" ]; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
printf '%s\n' \
|
|
|
|
"${progname}: can't find current Emacs version in './src/emacs.c'" >&2
|
2010-12-03 14:45:09 +00:00
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
echo Version number is $version
|
|
|
|
|
|
|
|
if [ $update = yes ]; then
|
2014-11-10 00:17:17 +00:00
|
|
|
if ! grep -q "tree holds version *${version}" README; then
|
|
|
|
echo "WARNING: README has the wrong version number"
|
2010-12-03 14:45:09 +00:00
|
|
|
echo "Consider running M-x set-version from admin/admin.el"
|
|
|
|
sleep 5
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Make sure we don't already have a directory emacs-${version}.
|
|
|
|
|
|
|
|
emacsname="emacs-${version}${new_extension}"
|
|
|
|
|
|
|
|
if [ -d ${emacsname} ]
|
|
|
|
then
|
|
|
|
echo Directory "${emacsname}" already exists >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Make sure the subdirectory is available.
|
|
|
|
tempparent="make-dist.tmp.$$"
|
|
|
|
if [ -d ${tempparent} ]; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
printf '%s\n' "${progname}: staging directory '${tempparent}' already exists.
|
2015-04-19 21:40:51 +00:00
|
|
|
Perhaps a previous invocation of '${progname}' failed to clean up after
|
2010-12-03 14:45:09 +00:00
|
|
|
itself. Check that directories whose names are of the form
|
2015-04-19 21:40:51 +00:00
|
|
|
'make-dist.tmp.NNNNN' don't contain any important information, remove
|
2010-12-03 14:45:09 +00:00
|
|
|
them, and try again." >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
|
|
|
if [ $check = yes ]; then
|
2016-12-08 00:45:48 +00:00
|
|
|
|
|
|
|
echo "Sanity checking (use --no-check to disable this)..."
|
|
|
|
|
2016-12-08 00:13:05 +00:00
|
|
|
error=no
|
|
|
|
|
2018-12-14 20:40:15 +00:00
|
|
|
temp_el=/tmp/make-dist.tmp.$$
|
|
|
|
temp_elc=$temp_el.1
|
|
|
|
temp_elelc=$temp_el.2
|
|
|
|
temp_elcel=$temp_el.3
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \
|
|
|
|
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
|
2018-12-14 20:40:15 +00:00
|
|
|
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el > $temp_el
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \
|
|
|
|
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \
|
2018-12-14 20:40:15 +00:00
|
|
|
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc > $temp_elc
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
## Check for .elc files with no corresponding .el file.
|
2018-12-14 20:40:15 +00:00
|
|
|
sed 's/\.el$/.elc/' $temp_el > $temp_elelc
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2018-12-14 20:40:15 +00:00
|
|
|
bogosities=`comm -13 $temp_elelc $temp_elc`
|
2010-12-03 14:45:09 +00:00
|
|
|
if [ x"${bogosities}" != x"" ]; then
|
2016-12-08 00:13:05 +00:00
|
|
|
error=yes
|
2010-12-03 14:45:09 +00:00
|
|
|
echo "The following .elc files have no corresponding .el files:"
|
|
|
|
echo "${bogosities}"
|
|
|
|
fi
|
|
|
|
|
|
|
|
### Check for .el files with no corresponding .elc file.
|
2018-12-14 20:40:15 +00:00
|
|
|
sed 's/\.elc$/.el/' $temp_elc > $temp_elcel
|
|
|
|
losers=`comm -23 $temp_el $temp_elcel`
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2016-12-08 00:13:05 +00:00
|
|
|
bogosities=
|
|
|
|
while read elc; do
|
|
|
|
el=`echo $elc | sed 's/c$//'`
|
2017-08-21 22:34:07 +00:00
|
|
|
[ -r $el ] || continue
|
2016-12-08 00:13:05 +00:00
|
|
|
[ $elc -nt $el ] || bogosities="$bogosities $elc"
|
2018-12-14 20:40:15 +00:00
|
|
|
done < $temp_elc
|
2016-12-08 00:13:05 +00:00
|
|
|
|
|
|
|
if [ x"${bogosities}" != x"" ]; then
|
|
|
|
error=yes
|
|
|
|
echo "The following .elc files are older than their .el files:"
|
|
|
|
echo "${bogosities}"
|
|
|
|
fi
|
|
|
|
|
2018-12-14 20:40:15 +00:00
|
|
|
rm -f $temp_el*
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
bogosities=
|
|
|
|
for file in $losers; do
|
2018-12-14 20:41:17 +00:00
|
|
|
grep -q "^;.*no-byte-compile: t" $file && continue
|
2010-12-03 14:45:09 +00:00
|
|
|
case $file in
|
|
|
|
site-init.el | site-load.el | site-start.el | default.el) continue ;;
|
|
|
|
esac
|
|
|
|
|
|
|
|
bogosities="$file $bogosities"
|
|
|
|
|
|
|
|
done
|
|
|
|
if [ x"${bogosities}" != x"" ]; then
|
2016-12-08 00:13:05 +00:00
|
|
|
error=yes
|
2010-12-03 14:45:09 +00:00
|
|
|
echo "The following .el files have no corresponding .elc files:"
|
|
|
|
echo "${bogosities}"
|
|
|
|
fi
|
2016-12-08 00:13:05 +00:00
|
|
|
|
|
|
|
|
|
|
|
## This is only a crude check, eg it does not handle .info
|
|
|
|
## files with multiple .texi source files.
|
2018-12-14 20:40:15 +00:00
|
|
|
find doc -name '*.texi' > $temp_el
|
2016-12-08 00:13:05 +00:00
|
|
|
|
|
|
|
bogosities=
|
|
|
|
while read texi; do
|
|
|
|
info=`sed -n 's/^@setfilename //p' $texi | sed 's|.*info/||'`
|
|
|
|
[ x"${info}" != x"" ] || continue
|
|
|
|
info=info/$info
|
2017-08-21 22:34:07 +00:00
|
|
|
[ -r $info ] || continue
|
2016-12-08 00:13:05 +00:00
|
|
|
[ $info -nt $texi ] || bogosities="$bogosities $info"
|
2018-12-14 20:40:15 +00:00
|
|
|
done < $temp_el
|
2016-12-08 00:13:05 +00:00
|
|
|
|
2018-12-14 20:40:15 +00:00
|
|
|
rm -f $temp_el
|
2016-12-08 00:13:05 +00:00
|
|
|
|
|
|
|
if [ x"${bogosities}" != x"" ]; then
|
|
|
|
error=yes
|
|
|
|
echo "The following .info files are older than their .texi files:"
|
|
|
|
echo "${bogosities}"
|
|
|
|
fi
|
|
|
|
|
2016-12-08 00:43:36 +00:00
|
|
|
## This exits with non-zero status if any .info files need
|
|
|
|
## rebuilding.
|
2018-05-05 02:13:18 +00:00
|
|
|
if [ -r Makefile ] && [ "$with_info" = "yes" ]; then
|
2016-12-08 00:43:36 +00:00
|
|
|
echo "Checking to see if info files are up-to-date..."
|
|
|
|
make --question info || error=yes
|
|
|
|
fi
|
|
|
|
|
2017-06-07 17:41:46 +00:00
|
|
|
## Is this a release?
|
|
|
|
case $version in
|
|
|
|
[1-9][0-9].[0-9])
|
2017-08-21 22:34:07 +00:00
|
|
|
if [ -r ChangeLog ]; then
|
2017-06-07 17:41:46 +00:00
|
|
|
if ! grep -q "Version $version released" ChangeLog; then
|
|
|
|
echo "No release notice in ChangeLog"
|
|
|
|
error=yes
|
|
|
|
fi
|
|
|
|
else
|
|
|
|
echo "A release must have a ChangeLog"
|
|
|
|
error=yes
|
|
|
|
fi
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
|
2016-12-08 00:45:48 +00:00
|
|
|
if [ $error = yes ]; then
|
|
|
|
echo "Failed checks" >&2
|
|
|
|
exit 1
|
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [ $update = yes ]; then
|
|
|
|
|
2012-07-09 04:52:49 +00:00
|
|
|
## Make sure configure is newer than configure.ac, etc.
|
2012-07-06 07:40:43 +00:00
|
|
|
## It is better to let autoreconf do what is needed than
|
|
|
|
## for us to try and duplicate all its checks.
|
|
|
|
echo "Running autoreconf"
|
|
|
|
autoreconf -i -I m4 || { x=$?; echo Autoreconf FAILED! >&2; exit $x; }
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2018-05-05 02:13:18 +00:00
|
|
|
if [ "$make_info" = yes ] ; then
|
|
|
|
echo "Updating Info files"
|
|
|
|
make info
|
|
|
|
fi
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
echo "Updating finder, custom and autoload data"
|
2012-07-06 07:40:43 +00:00
|
|
|
(cd lisp && make updates EMACS="$EMACS")
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2012-07-06 07:40:43 +00:00
|
|
|
echo "Updating leim-list.el"
|
|
|
|
(cd leim && make leim-list.el EMACS="$EMACS")
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
echo "Recompiling Lisp files"
|
Move runtime leim lisp files to lisp/leim directory
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.
* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* leim/README: Update for moved leim/ directory.
* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.
* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.
* lisp/startup.el (normal-top-level): No more leim directory.
* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* lisp/leim/quail: Move here from ../leim.
* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.
* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* src/epaths.in (PATH_DUMPLOADSEARCH):
* src/lread.c (load_path_default):
* src/nsterm.m (ns_load_path): No more leim directory.
* .bzrignore: Update for relocated leim files.
2013-11-27 06:15:06 +00:00
|
|
|
$EMACS -batch -f batch-byte-recompile-directory lisp
|
2010-12-03 14:45:09 +00:00
|
|
|
fi # $update = yes
|
|
|
|
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
if [ "$changelog" = yes ] && [ -r .git ]; then
|
|
|
|
top_level_ChangeLog=ChangeLog
|
|
|
|
else
|
|
|
|
top_level_ChangeLog=
|
|
|
|
fi
|
|
|
|
|
|
|
|
# Files to distribute that might not be under version control.
|
|
|
|
# Don't distribute site-init.el, site-load.el, or default.el.
|
|
|
|
possibly_non_vc_files="
|
|
|
|
$top_level_ChangeLog
|
|
|
|
MANIFEST aclocal.m4 configure
|
|
|
|
admin/charsets/jisx2131-filter
|
|
|
|
src/config.in src/dmpstruct.h src/emacs-module.h
|
2019-02-02 01:50:59 +00:00
|
|
|
src/fingerprint.c
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
"$(
|
|
|
|
find admin doc etc lisp \
|
|
|
|
\( -name '*.el' -o -name '*.elc' -o -name '*.map' -o -name '*.stamp' \
|
|
|
|
-o -name '*.texi' -o -name '*.tex' -o -name '*.txt' \) \
|
|
|
|
! -name 'site-init*' ! -name 'site-load*' ! -name 'default*'
|
|
|
|
) || exit
|
|
|
|
|
|
|
|
if [ $with_info = yes ]; then
|
|
|
|
info_files="info/dir $(echo info/*.info)" || exit
|
|
|
|
else
|
|
|
|
info_files=
|
|
|
|
fi
|
|
|
|
|
2019-02-05 03:50:44 +00:00
|
|
|
echo "Creating staging directory: '${tempparent}'"
|
|
|
|
|
|
|
|
mkdir ${tempparent} || exit
|
|
|
|
tempdir="${tempparent}/${emacsname}"
|
|
|
|
|
|
|
|
manifest=MANIFEST
|
|
|
|
|
|
|
|
[ -f $manifest ] || manifest=${tempparent}/MANIFEST
|
|
|
|
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
# If Git is in use update the file MANIFEST, which can substitute for
|
|
|
|
# 'git ls-files' later (e.g., after extraction from a tarball).
|
|
|
|
# Otherwise, rely on the existing MANIFEST, which should be maintained some
|
|
|
|
# other way when adding or deleting a distributed file while not using Git.
|
2019-02-05 03:50:44 +00:00
|
|
|
# TODO: maybe this should ignore $update, and always update MANIFEST
|
|
|
|
# if .git is present.
|
|
|
|
if ( [ $update = yes ] || [ ! -f $manifest ] ) && [ -r .git ]; then
|
|
|
|
echo "Updating $manifest"
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
if [ $with_tests = yes ]; then
|
2019-02-05 03:50:44 +00:00
|
|
|
git ls-files > $manifest
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
else
|
2019-02-05 03:50:44 +00:00
|
|
|
git ls-files | grep -v '^test' >$manifest
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
fi || exit
|
2019-02-05 03:50:44 +00:00
|
|
|
printf '%s\n' $possibly_non_vc_files $info_files >>$manifest || exit
|
|
|
|
sort -u -o $manifest $manifest || exit
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
fi
|
|
|
|
|
2019-02-05 03:50:44 +00:00
|
|
|
<$manifest || exit
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
### This trap ensures that the staging directory will be cleaned up even
|
|
|
|
### when the script is interrupted in mid-career.
|
|
|
|
if [ "${clean_up}" = yes ]; then
|
|
|
|
trap "echo 'Cleaning up the staging directory'; rm -rf ${tempparent}" EXIT
|
|
|
|
fi
|
|
|
|
|
2015-04-19 21:40:51 +00:00
|
|
|
echo "Creating top directory: '${tempdir}'"
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
if [ $verbose = yes ] && (mkdir --verbose ${tempdir}) >/dev/null 2>&1; then
|
|
|
|
mkdir_verbose='mkdir --verbose'
|
|
|
|
else
|
|
|
|
mkdir $tempdir || exit
|
|
|
|
mkdir_verbose=mkdir
|
|
|
|
fi
|
|
|
|
|
|
|
|
# file_to_skip is normally empty to link every file,
|
|
|
|
# but it can be 'ChangeLog' if we do not want to link the
|
|
|
|
# top-level ChangeLog.
|
|
|
|
file_to_skip=
|
2010-12-03 14:45:09 +00:00
|
|
|
|
2015-05-12 00:29:06 +00:00
|
|
|
if [ "$changelog" = yes ]; then
|
2017-08-21 22:34:07 +00:00
|
|
|
if test -r .git; then
|
2017-06-07 17:26:25 +00:00
|
|
|
## When making a release or pretest the ChangeLog should already
|
|
|
|
## have been created and edited as needed. Don't ignore it.
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
if [ -r ChangeLog ] && [ ! -L ChangeLog ]; then
|
2017-06-07 17:26:25 +00:00
|
|
|
echo "Using existing top-level ChangeLog"
|
|
|
|
else
|
|
|
|
echo "Making top-level ChangeLog"
|
|
|
|
make ChangeLog CHANGELOG=${tempdir}/ChangeLog || \
|
|
|
|
{ x=$?; echo "make ChangeLog FAILED (try --no-changelog?)" >&2; exit $x; }
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
file_to_skip=ChangeLog
|
2017-06-07 17:26:25 +00:00
|
|
|
fi
|
2015-05-12 00:29:06 +00:00
|
|
|
else
|
|
|
|
echo "No repository, so omitting top-level ChangeLog"
|
|
|
|
fi
|
2015-04-07 07:00:55 +00:00
|
|
|
fi
|
|
|
|
|
2010-12-03 14:45:09 +00:00
|
|
|
echo "Creating subdirectories"
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
MANIFEST_subdir_sed='
|
|
|
|
$a\
|
|
|
|
'$tempdir'/info\
|
|
|
|
'$tempdir'/site-lisp
|
|
|
|
s,[^/]*$,,
|
|
|
|
s,/$,,
|
|
|
|
/^$/d
|
|
|
|
s,^,'$tempdir'/,
|
|
|
|
'
|
2019-02-05 03:50:44 +00:00
|
|
|
tempsubdirs=$(sed "$MANIFEST_subdir_sed" $manifest | sort -u)
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
$mkdir_verbose -p $tempsubdirs || exit
|
2010-12-03 14:45:09 +00:00
|
|
|
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
echo "Making links to files"
|
|
|
|
while read file; do
|
2019-02-05 03:50:44 +00:00
|
|
|
case $file in
|
|
|
|
MANIFEST) ln $manifest $tempdir/MANIFEST || exit ;;
|
|
|
|
$file_to_skip) continue ;;
|
|
|
|
*) ln $file $tempdir/$file || exit ;;
|
|
|
|
esac
|
|
|
|
done <$manifest
|
2010-12-03 14:45:09 +00:00
|
|
|
|
|
|
|
if [ "${newer}" ]; then
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
printf '%s\n' "Removing files older than $newer"
|
2010-12-03 14:45:09 +00:00
|
|
|
## We remove .elc files unconditionally, on the theory that anyone picking
|
|
|
|
## up an incremental distribution already has a running Emacs to byte-compile
|
|
|
|
## them with.
|
2018-12-14 20:40:15 +00:00
|
|
|
find ${tempdir} \( -name '*.elc' -o ! -newer ${newer} \) \
|
2018-04-09 20:34:44 +00:00
|
|
|
-exec rm -f {} \; || exit
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
|
|
|
if [ "${make_tar}" = yes ]; then
|
|
|
|
echo "Looking for $default_gzip"
|
|
|
|
found=0
|
Use ‘echo’ safely with ‘\’ or leading ‘-’
POSIX says that ‘echo FOO’ produces implementation-defined output
if FOO contains leading ‘-’, or ‘\’ anywhere, so don’t assume GNU
behavior in that case.
* Makefile.in (removenullpaths): Remove.
(epaths-force): Rewrite to avoid the need for ‘echo’.
(install-etc): Be clearer about escaping the shell metacharacters
‘\’ and ‘$’.
* Makefile.in (install-arch-indep, install-etcdoc):
* admin/charsets/mapconv, admin/merge-gnulib, admin/merge-pkg-config:
* admin/quick-install-emacs, build-aux/gitlog-to-emacslog:
* configure.ac, lib-src/rcs2log, make-dist:
* src/Makefile.in (lisp.mk):
Don’t assume ‘echo’ outputs ‘\’ and leading ‘-’ unscathed.
For example, use ‘printf '%s\n' "$foo"’ rather than ‘echo "$foo"’
if $foo can contain arbitrary characters.
* lisp/Makefile.in (TAGS): Use ‘ls’, not ‘echo’, to avoid ‘\’ issues.
* doc/lispref/two-volume.make (vol1.pdf):
* test/etags/make-src/Makefile (web ftp publish):
Use ‘printf’ rather than ‘echo -e’.
2015-10-11 01:03:49 +00:00
|
|
|
temppath=`printf '%s\n' "$PATH" |
|
|
|
|
sed -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' -e 's/:/ /g'
|
|
|
|
`
|
2010-12-03 14:45:09 +00:00
|
|
|
for dir in ${temppath}; do
|
|
|
|
[ -x ${dir}/$default_gzip ] || continue
|
|
|
|
found=1; break
|
|
|
|
done
|
|
|
|
if [ "$found" = "0" ]; then
|
2015-04-19 21:40:51 +00:00
|
|
|
echo "WARNING: '$default_gzip' not found, will not compress" >&2
|
2010-12-03 14:45:09 +00:00
|
|
|
default_gzip=cat
|
|
|
|
fi
|
|
|
|
case "${default_gzip}" in
|
|
|
|
bzip2) gzip_extension=.bz2 ;;
|
2013-01-10 04:00:02 +00:00
|
|
|
xz) gzip_extension=.xz ;;
|
2018-03-30 23:11:45 +00:00
|
|
|
gzip) gzip_extension=.gz ; default_gzip="gzip --best --no-name";;
|
2010-12-03 14:45:09 +00:00
|
|
|
*) gzip_extension= ;;
|
|
|
|
esac
|
|
|
|
echo "Creating tar file"
|
2018-04-01 20:53:15 +00:00
|
|
|
taropt='--numeric-owner --owner=0 --group=0 --mode=go+u,go-w'
|
2018-12-14 20:40:15 +00:00
|
|
|
tar --sort=name -cf /dev/null $tempdir/src/lisp.h 2>/dev/null &&
|
2018-04-01 20:53:15 +00:00
|
|
|
taropt="$taropt --sort=name"
|
2018-03-30 23:11:45 +00:00
|
|
|
[ "$verbose" = "yes" ] && taropt="$taropt --verbose"
|
2016-12-08 00:59:14 +00:00
|
|
|
|
2018-04-09 20:34:44 +00:00
|
|
|
(cd $tempparent &&
|
|
|
|
case $default_gzip in
|
|
|
|
cat) tar $taropt -cf - $emacsname;;
|
|
|
|
*) if tar $taropt -cf /dev/null --use-compress-program="$default_gzip" \
|
2019-02-02 01:56:25 +00:00
|
|
|
$emacsname/src/lisp.h > /dev/null 2>&1
|
2018-04-09 20:34:44 +00:00
|
|
|
then
|
|
|
|
tar $taropt -cf - --use-compress-program="$default_gzip" $emacsname
|
|
|
|
else
|
|
|
|
tar $taropt -cf $emacsname.tar $emacsname &&
|
|
|
|
$default_gzip <$emacsname.tar
|
|
|
|
fi;;
|
|
|
|
esac
|
|
|
|
) >$emacsname.tar$gzip_extension || exit
|
2010-12-03 14:45:09 +00:00
|
|
|
fi
|
|
|
|
|
2018-12-14 20:40:15 +00:00
|
|
|
## Why are we deleting the staging directory if clean_up is no?
|
2010-12-03 14:45:09 +00:00
|
|
|
if [ "${clean_up}" != yes ]; then
|
2018-04-09 20:34:44 +00:00
|
|
|
(cd ${tempparent} && mv ${emacsname} ..) &&
|
2010-12-03 14:45:09 +00:00
|
|
|
rm -rf ${tempparent}
|
|
|
|
fi
|
|
|
|
|
Make make-dist more automatic
Simplify make-dist maintenance by having it generate its
list of files more automatically. Put the list of distributed
files into a file MANIFEST that can be used in the unusual
situations when you’re making a distribution without having
access to a Git repository.
* make-dist (top_level_ChangeLog): Now nonempty if the
distribution tarball will contain a ChangeLog, instead of
being nonempty when a ChangeLog is requested, Git is present
and a readable ChangeLog exists. The new interpretation makes
the script a bit easier to follow.
(possibly_non_vc_files, info_files, mkdir_verbose)
(file_to_skip, MANIFEST_subdir_sed, tempsubdirs):
New variables.
(MANIFEST): Update and use this file, which now records what
files are distributed.
(top_level, subdir, files, file): Remove.
2019-02-01 23:17:48 +00:00
|
|
|
# Local Variables:
|
|
|
|
# sh-basic-offset: 2
|
|
|
|
# End:
|