mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-14 16:50:58 +00:00
make-dist: check exit statuses more carefully
* make-dist: Do a better job checking for subprocess failure.
This commit is contained in:
Paul Eggert
parent
32dc0cb1b5
commit
83a6224d60
250
make-dist
250
make-dist
@ -346,7 +346,7 @@ fi # $update = yes
|
||||
|
||||
echo "Creating staging directory: '${tempparent}'"
|
||||
|
||||
mkdir ${tempparent}
|
||||
mkdir ${tempparent} || exit
|
||||
tempdir="${tempparent}/${emacsname}"
|
||||
|
||||
### This trap ensures that the staging directory will be cleaned up even
|
||||
@ -356,7 +356,7 @@ if [ "${clean_up}" = yes ]; then
|
||||
fi
|
||||
|
||||
echo "Creating top directory: '${tempdir}'"
|
||||
mkdir ${tempdir}
|
||||
mkdir ${tempdir} || exit
|
||||
|
||||
if [ "$changelog" = yes ]; then
|
||||
if test -r .git; then
|
||||
@ -379,10 +379,13 @@ fi
|
||||
### tar file; this means that people can start reading the INSTALL and
|
||||
### README while the rest of the tar file is still unpacking. Whoopee.
|
||||
echo "Making links to top-level files"
|
||||
ln INSTALL README BUGS ${tempdir}
|
||||
ln ChangeLog.*[0-9] Makefile.in autogen.sh configure configure.ac ${tempdir}
|
||||
ln config.bat make-dist .dir-locals.el ${tempdir}
|
||||
ln aclocal.m4 CONTRIBUTE ChangeLog ${tempdir}
|
||||
top_level='
|
||||
INSTALL README BUGS
|
||||
ChangeLog.*[0-9] Makefile.in autogen.sh configure configure.ac
|
||||
config.bat make-dist .dir-locals.el
|
||||
aclocal.m4 CONTRIBUTE ChangeLog
|
||||
'
|
||||
ln $top_level $tempdir || exit
|
||||
|
||||
echo "Creating subdirectories"
|
||||
for subdir in site-lisp \
|
||||
@ -412,132 +415,151 @@ do
|
||||
[ "$subdir" = "site-lisp" ] || [ -d "$subdir" ] || \
|
||||
echo "WARNING: $subdir not found, making anyway"
|
||||
[ "$verbose" = "yes" ] && echo " ${tempdir}/${subdir}"
|
||||
mkdir ${tempdir}/${subdir}
|
||||
mkdir ${tempdir}/${subdir} || exit
|
||||
done
|
||||
|
||||
echo "Making links to 'lisp' and its subdirectories"
|
||||
files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \
|
||||
-o -name 'README' \)`
|
||||
-o -name 'README' \)` || exit
|
||||
|
||||
### Don't distribute site-init.el, site-load.el, or default.el.
|
||||
for file in lisp/Makefile.in $files; do
|
||||
case $file in
|
||||
*/site-init*|*/site-load*|*/default*) continue ;;
|
||||
esac
|
||||
ln $file $tempdir/$file
|
||||
ln $file $tempdir/$file || exit
|
||||
done
|
||||
|
||||
echo "Making links to 'leim' and its subdirectories"
|
||||
(cd leim
|
||||
ln ChangeLog.*[0-9] README ../${tempdir}/leim
|
||||
ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC
|
||||
ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC
|
||||
ln MISC-DIC/README MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC
|
||||
ln Makefile.in ../${tempdir}/leim/Makefile.in
|
||||
ln leim-ext.el ../${tempdir}/leim/leim-ext.el)
|
||||
(cd leim &&
|
||||
ln ChangeLog.*[0-9] README ../${tempdir}/leim &&
|
||||
ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC &&
|
||||
ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC &&
|
||||
ln MISC-DIC/README MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC &&
|
||||
ln Makefile.in ../${tempdir}/leim/Makefile.in &&
|
||||
ln leim-ext.el ../${tempdir}/leim/leim-ext.el &&
|
||||
:) || exit
|
||||
|
||||
## FIXME Can we not just use the "find -type f" method for this one?
|
||||
echo "Making links to 'build-aux'"
|
||||
(cd build-aux
|
||||
ln config.guess config.sub msys-to-w32 ../${tempdir}/build-aux
|
||||
ln gitlog-to-changelog gitlog-to-emacslog ../${tempdir}/build-aux
|
||||
ln install-sh move-if-change ../${tempdir}/build-aux
|
||||
ln update-copyright update-subdirs ../${tempdir}/build-aux
|
||||
ln dir_top make-info-dir ../${tempdir}/build-aux)
|
||||
(cd build-aux &&
|
||||
ln config.guess config.sub msys-to-w32 ../${tempdir}/build-aux &&
|
||||
ln gitlog-to-changelog gitlog-to-emacslog ../${tempdir}/build-aux &&
|
||||
ln install-sh move-if-change ../${tempdir}/build-aux &&
|
||||
ln update-copyright update-subdirs ../${tempdir}/build-aux &&
|
||||
ln dir_top make-info-dir ../${tempdir}/build-aux &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'src'"
|
||||
### Don't distribute the configured versions of
|
||||
### config.in, paths.in, buildobj.h, or Makefile.in.
|
||||
(cd src
|
||||
echo " (It is ok if ln fails in some cases.)"
|
||||
ln [a-zA-Z]*.[chm] ../${tempdir}/src
|
||||
ln [a-zA-Z]*.in ../${tempdir}/src
|
||||
ln deps.mk ../${tempdir}/src
|
||||
ln README ChangeLog.*[0-9] ../${tempdir}/src
|
||||
ln .gdbinit .dbxinit ../${tempdir}/src
|
||||
cd ../${tempdir}/src
|
||||
rm -f globals.h config.h epaths.h Makefile buildobj.h)
|
||||
(cd src &&
|
||||
ln [a-zA-Z]*.[chm] ../${tempdir}/src &&
|
||||
ln [a-zA-Z]*.in ../${tempdir}/src &&
|
||||
ln deps.mk ../${tempdir}/src &&
|
||||
ln README ChangeLog.*[0-9] ../${tempdir}/src &&
|
||||
ln .gdbinit .dbxinit ../${tempdir}/src &&
|
||||
cd ../${tempdir}/src &&
|
||||
rm -f globals.h config.h epaths.h Makefile buildobj.h &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'src/bitmaps'"
|
||||
(cd src/bitmaps
|
||||
ln README *.xbm ../../${tempdir}/src/bitmaps)
|
||||
(cd src/bitmaps &&
|
||||
ln README *.xbm ../../${tempdir}/src/bitmaps &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'lib'"
|
||||
(cd lib
|
||||
ln [a-zA-Z_]*.[ch] ../${tempdir}/lib
|
||||
ln gnulib.mk.in Makefile.in ../${tempdir}/lib
|
||||
cd ../${tempdir}/lib
|
||||
script='/[*]/d; s/\.in\.h$/.h/'
|
||||
rm -f `ls *.in.h | sed "$script"`)
|
||||
(cd lib &&
|
||||
ln [a-zA-Z_]*.[ch] ../${tempdir}/lib &&
|
||||
ln gnulib.mk.in Makefile.in ../${tempdir}/lib &&
|
||||
cd ../${tempdir}/lib &&
|
||||
script='/[*]/d; s/\.in\.h$/.h/' &&
|
||||
rm -f `ls *.in.h | sed "$script"` &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'lib-src'"
|
||||
(cd lib-src
|
||||
ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
|
||||
ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src
|
||||
ln rcs2log ../${tempdir}/lib-src)
|
||||
(cd lib-src &&
|
||||
ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src &&
|
||||
ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src &&
|
||||
ln rcs2log ../${tempdir}/lib-src &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'm4'"
|
||||
(cd m4
|
||||
ln *.m4 ../${tempdir}/m4)
|
||||
(cd m4 &&
|
||||
ln *.m4 ../${tempdir}/m4 &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'modules'"
|
||||
(cd modules
|
||||
ln *.py ../${tempdir}/modules
|
||||
)
|
||||
(cd modules &&
|
||||
ln *.py ../${tempdir}/modules &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'nt'"
|
||||
(cd nt
|
||||
ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt
|
||||
ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
|
||||
ln *.in gnulib-cfg.mk ../${tempdir}/nt
|
||||
ln mingw-cfg.site epaths.nt INSTALL.W64 ../${tempdir}/nt
|
||||
ln ChangeLog.*[0-9] INSTALL README README.W32 ../${tempdir}/nt)
|
||||
(cd nt &&
|
||||
ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt &&
|
||||
ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt &&
|
||||
ln *.in gnulib-cfg.mk ../${tempdir}/nt &&
|
||||
ln mingw-cfg.site epaths.nt INSTALL.W64 ../${tempdir}/nt &&
|
||||
ln ChangeLog.*[0-9] INSTALL README README.W32 ../${tempdir}/nt &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'nt/inc' and its subdirectories"
|
||||
for f in `find nt/inc -type f -name '[a-z]*.h'`; do
|
||||
ln $f $tempdir/$f
|
||||
ln $f $tempdir/$f || exit
|
||||
done
|
||||
|
||||
echo "Making links to 'nt/icons'"
|
||||
(cd nt/icons
|
||||
ln README [a-z]*.ico ../../${tempdir}/nt/icons
|
||||
ln [a-z]*.cur ../../${tempdir}/nt/icons)
|
||||
(cd nt/icons &&
|
||||
ln README [a-z]*.ico ../../${tempdir}/nt/icons &&
|
||||
ln [a-z]*.cur ../../${tempdir}/nt/icons &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'msdos'"
|
||||
(cd msdos
|
||||
ln ChangeLog.*[0-9] INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos
|
||||
ln depfiles.bat inttypes.h ../${tempdir}/msdos
|
||||
ln mainmake.v2 sed*.inp ../${tempdir}/msdos)
|
||||
(cd msdos &&
|
||||
ln ChangeLog.*[0-9] INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos &&
|
||||
ln depfiles.bat inttypes.h ../${tempdir}/msdos &&
|
||||
ln mainmake.v2 sed*.inp ../${tempdir}/msdos &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'nextstep'"
|
||||
(cd nextstep
|
||||
ln ChangeLog.*[0-9] README INSTALL Makefile.in ../${tempdir}/nextstep)
|
||||
(cd nextstep &&
|
||||
ln ChangeLog.*[0-9] README INSTALL Makefile.in ../${tempdir}/nextstep &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'nextstep/templates'"
|
||||
(cd nextstep/templates
|
||||
ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in ../../${tempdir}/nextstep/templates)
|
||||
(cd nextstep/templates &&
|
||||
ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in \
|
||||
../../${tempdir}/nextstep/templates &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'nextstep/Cocoa/Emacs.base/Contents'"
|
||||
(cd nextstep/Cocoa/Emacs.base/Contents
|
||||
ln PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents)
|
||||
(cd nextstep/Cocoa/Emacs.base/Contents &&
|
||||
ln PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'nextstep/Cocoa/Emacs.base/Contents/Resources'"
|
||||
(cd nextstep/Cocoa/Emacs.base/Contents/Resources
|
||||
ln Credits.html *.icns ../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources)
|
||||
(cd nextstep/Cocoa/Emacs.base/Contents/Resources &&
|
||||
ln Credits.html *.icns \
|
||||
../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'nextstep/GNUstep/Emacs.base/Resources'"
|
||||
(cd nextstep/GNUstep/Emacs.base/Resources
|
||||
ln README emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources )
|
||||
(cd nextstep/GNUstep/Emacs.base/Resources &&
|
||||
ln README emacs.tiff \
|
||||
../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'oldXMenu'"
|
||||
(cd oldXMenu
|
||||
ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu
|
||||
ln README ChangeLog.*[0-9] ../${tempdir}/oldXMenu)
|
||||
(cd oldXMenu &&
|
||||
ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu &&
|
||||
ln README ChangeLog.*[0-9] ../${tempdir}/oldXMenu &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'lwlib'"
|
||||
(cd lwlib
|
||||
ln *.[ch] *.in *.mk ../${tempdir}/lwlib
|
||||
ln README ChangeLog.*[0-9] ../${tempdir}/lwlib)
|
||||
(cd lwlib &&
|
||||
ln *.[ch] *.in *.mk ../${tempdir}/lwlib &&
|
||||
ln README ChangeLog.*[0-9] ../${tempdir}/lwlib &&
|
||||
:) || exit
|
||||
|
||||
## It is important to distribute admin/ because it contains sources
|
||||
## for generated lisp/international/uni-*.el files.
|
||||
@ -546,7 +568,7 @@ for f in `find admin -type f`; do
|
||||
case $f in
|
||||
*/Makefile) [ -f $f.in ] && continue ;;
|
||||
esac
|
||||
ln $f $tempdir/$f
|
||||
ln $f $tempdir/$f || exit
|
||||
done
|
||||
|
||||
if [ "$with_tests" = "yes" ]; then
|
||||
@ -557,7 +579,7 @@ if [ "$with_tests" = "yes" ]; then
|
||||
case $f in
|
||||
*/Makefile) [ -f $f.in ] && continue ;;
|
||||
esac
|
||||
ln $f $tempdir/$f
|
||||
ln $f $tempdir/$f || exit
|
||||
done
|
||||
fi
|
||||
|
||||
@ -569,45 +591,50 @@ for f in `find etc -type f`; do
|
||||
etc/refcards/*.aux|etc/refcards/*.dvi|etc/refcards/*.log|etc/refcards/*.ps)
|
||||
continue ;;
|
||||
esac
|
||||
ln $f $tempdir/$f
|
||||
ln $f $tempdir/$f || exit
|
||||
done
|
||||
|
||||
echo "Making links to 'info'"
|
||||
ln `find info -type f -print` ${tempdir}/info
|
||||
ln `find info -type f -print` ${tempdir}/info || exit
|
||||
|
||||
echo "Making links to 'doc/emacs'"
|
||||
(cd doc/emacs
|
||||
ln *.texi *.in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs)
|
||||
(cd doc/emacs &&
|
||||
ln *.texi *.in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'doc/misc'"
|
||||
(cd doc/misc
|
||||
(cd doc/misc &&
|
||||
ln *.texi *.tex *.in gnus-news.el ChangeLog.*[0-9] \
|
||||
../../${tempdir}/doc/misc)
|
||||
../../${tempdir}/doc/misc &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'doc/lispref'"
|
||||
(cd doc/lispref
|
||||
ln *.texi *.in README ChangeLog.*[0-9] ../../${tempdir}/doc/lispref
|
||||
ln spellfile ../../${tempdir}/doc/lispref
|
||||
ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref)
|
||||
(cd doc/lispref &&
|
||||
ln *.texi *.in README ChangeLog.*[0-9] ../../${tempdir}/doc/lispref &&
|
||||
ln spellfile ../../${tempdir}/doc/lispref &&
|
||||
ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'doc/lispintro'"
|
||||
(cd doc/lispintro
|
||||
ln *.texi *.in *.eps *.pdf ../../${tempdir}/doc/lispintro
|
||||
ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro
|
||||
cd ../../${tempdir}/doc/lispintro)
|
||||
(cd doc/lispintro &&
|
||||
ln *.texi *.in *.eps *.pdf ../../${tempdir}/doc/lispintro &&
|
||||
ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro &&
|
||||
cd ../../${tempdir}/doc/lispintro &&
|
||||
:) || exit
|
||||
|
||||
echo "Making links to 'doc/man'"
|
||||
(cd doc/man
|
||||
ln *.*[0-9] *.in ../../${tempdir}/doc/man
|
||||
cd ../../${tempdir}/doc/man
|
||||
rm -f emacs.1)
|
||||
(cd doc/man &&
|
||||
ln *.*[0-9] *.in ../../${tempdir}/doc/man &&
|
||||
cd ../../${tempdir}/doc/man &&
|
||||
rm -f emacs.1 &&
|
||||
:) || exit
|
||||
|
||||
### It would be nice if they could all be symlinks to top-level copy, but
|
||||
### you're not supposed to have any symlinks in distribution tar files.
|
||||
echo "Making sure copying notices are all copies of 'COPYING'"
|
||||
for subdir in . etc leim lib lib-src lisp lwlib msdos nt src; do
|
||||
rm -f ${tempdir}/${subdir}/COPYING
|
||||
cp COPYING ${tempdir}/${subdir}
|
||||
rm -f ${tempdir}/${subdir}/COPYING || exit
|
||||
cp COPYING ${tempdir}/${subdir} || exit
|
||||
done
|
||||
|
||||
if [ "${newer}" ]; then
|
||||
@ -615,12 +642,13 @@ if [ "${newer}" ]; then
|
||||
## 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.
|
||||
find ${tempparent} \( -name '*.elc' -o ! -newer ${newer} \) -exec rm -f {} \;
|
||||
find ${tempparent} \( -name '*.elc' -o ! -newer ${newer} \) \
|
||||
-exec rm -f {} \; || exit
|
||||
fi
|
||||
|
||||
## Don't distribute backups, autosaves, etc.
|
||||
echo "Removing unwanted files"
|
||||
find ${tempparent} \( -name '*~' -o -name '#*#' -o -name '.*ignore' -o -name '=*' -o -name 'TAGS' \) -exec rm -f {} \;
|
||||
find ${tempparent} \( -name '*~' -o -name '#*#' -o -name '.*ignore' -o -name '=*' -o -name 'TAGS' \) -exec rm -f {} \; || exit
|
||||
|
||||
if [ "${make_tar}" = yes ]; then
|
||||
echo "Looking for $default_gzip"
|
||||
@ -648,13 +676,23 @@ if [ "${make_tar}" = yes ]; then
|
||||
taropt="$taropt --sort=name"
|
||||
[ "$verbose" = "yes" ] && taropt="$taropt --verbose"
|
||||
|
||||
(cd ${tempparent} ; tar $taropt -cf - ${emacsname} ) \
|
||||
| ${default_gzip} \
|
||||
> ${emacsname}.tar${gzip_extension}
|
||||
(cd $tempparent &&
|
||||
case $default_gzip in
|
||||
cat) tar $taropt -cf - $emacsname;;
|
||||
*) if tar $taropt -cf /dev/null --use-compress-program="$default_gzip" \
|
||||
$emacsname/src/lisp.h
|
||||
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
|
||||
fi
|
||||
|
||||
if [ "${clean_up}" != yes ]; then
|
||||
(cd ${tempparent}; mv ${emacsname} ..)
|
||||
(cd ${tempparent} && mv ${emacsname} ..) &&
|
||||
rm -rf ${tempparent}
|
||||
fi
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user