X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/4c9c1174e137e62afd86283af5f4dde395d4b726..668d9a3ec97bc2156e17088d623cd1c1b6b4928f:/make-dist diff --git a/make-dist b/make-dist index 05f84fd18d..0a516bf173 100755 --- a/make-dist +++ b/make-dist @@ -32,23 +32,20 @@ progname="$0" ### Print out each line we read, for debugging's sake. ### set -v -clean_up=yes -make_tar=yes +clean_up=no +make_tar=no newer="" while [ $# -gt 0 ]; do case "$1" in - ## This option tells make-dist not to delete the staging directory - ## after it's done making the tar file. - "--no-clean-up" ) - clean_up=no + ## 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 not to make a tar file. Since it's - ## rather pointless to build the whole staging directory and then - ## nuke it, using this option also selects '--no-clean-up'. - "--no-tar" ) - make_tar=no - clean_up=no + ## This option tells make-dist to make a tar file. + "--tar" ) + make_tar=yes ;; ## This option tells make-dist to make the distribution normally, then ## remove all files older than the given timestamp file. This is useful @@ -85,11 +82,11 @@ shortversion=`grep 'defconst[ ]*emacs-version' lisp/version.el \ version=`grep 'defconst[ ]*emacs-version' lisp/version.el \ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` if [ ! "${version}" ]; then - echo "${progname}: can't find current Emacs version in \`./lisp/version.el'." >&2 + echo "${progname}: can't find current Emacs version in \`./lisp/version.el'" >&2 exit 1 fi -echo $version and $shortversion +echo Version numbers are $version and $shortversion if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then true @@ -129,24 +126,42 @@ if [ "${bogosities}" != "" ]; then fi rm -f /tmp/el /tmp/elc +### Check for .el files that would overflow the 14-char limit if compiled. +long=`find lisp -name '???????????*.el' -print` +if [ "$long" != "" ]; then + echo "The following .el file names are too long:" + echo "$long" +fi + ### Make sure configure is newer than configure.in. if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then - echo "\`./configure.in' seems to be newer than \`./configure.'" >&2 - echo "Attempting to run autoconf." >&2 - autoconf + echo "\`./configure.in' is newer than \`./configure'" >&2 + echo "Running autoconf" >&2 + autoconf || { x=$?; echo Autoconf FAILED! >&2; exit $x; } fi ### Update getdate.c. (cd lib-src; make -f Makefile getdate.c YACC="bison -y") -echo "Updating Info files." +echo "Updating Info files" (cd man; make info) -echo "Updating finder-inf.el." +echo "Updating finder-inf.el" + +(cd lisp; ../src/emacs -batch -l finder -f finder-compile-keywords-make-dist) + +echo "Recompiling Lisp files" + +src/emacs -batch -f batch-byte-recompile-directory lisp -### update finder-inf.el. -(cd src; emacs -batch -l finder -f finder-compile-keywords) +echo "Updating autoloads" + +src/emacs -batch -f batch-update-autoloads lisp + +echo "Making lisp/MANIFEST" + +(cd lisp; head -1 [!=]*.el | grep '^;' | sed -e 's/;;; //' > MANIFEST) echo "Creating staging directory: \`${tempparent}'" @@ -156,7 +171,7 @@ tempdir="${tempparent}/${emacsname}" ### 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 'Interrupted...cleaning up the staging directory.'; rm -rf ${tempparent}; exit 1" 1 2 15 + trap "echo 'Interrupted...cleaning up the staging directory'; rm -rf ${tempparent}; exit 1" 1 2 15 fi echo "Creating top directory: \`${tempdir}'" @@ -166,7 +181,7 @@ mkdir ${tempdir} ### hopes that this will make the top-level files appear first in the ### 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." +echo "Making links to top-level files" ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README BUGS move-if-change ${tempdir} ln ChangeLog Makefile.in configure configure.in ${tempdir} ln config.bat make-dist update-subdirs vpath.sed ${tempdir} @@ -176,7 +191,7 @@ cp config.sub ${tempdir} cp config.guess ${tempdir} cp install.sh ${tempdir} -echo "Updating version number in README." +echo "Updating version number in README" (cd ${tempdir} awk \ '$1 " " $2 " " $3 " " $4 " " $5 == "This directory tree holds version" { $6 = version; print $0 } @@ -185,15 +200,15 @@ echo "Updating version number in README." mv tmp.README README) -echo "Creating subdirectories." +echo "Creating subdirectories" for subdir in lisp lisp/term site-lisp \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ - nt nt/inc nt/inc/sys nt/src \ + nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet \ etc etc/e lock cpp info man msdos vms; do mkdir ${tempdir}/${subdir} done -echo "Making links to \`lisp'." +echo "Making links to \`lisp'" ### Don't distribute TAGS, =*.el files, site-init.el, site-load.el, or default.el. (cd lisp ln [a-zA-Z]*.el ../${tempdir}/lisp @@ -201,14 +216,16 @@ echo "Making links to \`lisp'." ln [a-zA-Z]*.dat ../${tempdir}/lisp ## simula.el doesn't keep abbreviations in simula.defns any more. ## ln [a-zA-Z]*.defns ../${tempdir}/lisp - ln ChangeLog Makefile makefile.nt ChangeLog.? README dired.todo ../${tempdir}/lisp + ln ChangeLog Makefile makefile.nt ChangeLog.? README ../${tempdir}/lisp cd ../${tempdir}/lisp rm -f TAGS =* + rm -f subdirs.el rm -f site-init site-init.el site-init.elc rm -f site-load site-load.el site-load.elc + rm -f site-start site-start.el site-start.elc rm -f default default.el default.elc) -#echo "Making links to \`lisp/calc-2.02'." +#echo "Making links to \`lisp/calc-2.02'" #### Don't distribute =*.el files, TAGS or backups. #(cd lisp/calc-2.02 # ln [a-zA-Z]*.el ../../${tempdir}/lisp/calc-2.02 @@ -218,7 +235,7 @@ echo "Making links to \`lisp'." # cd ../../${tempdir}/lisp/calc-2.02 # rm -f *~ TAGS) -echo "Making links to \`lisp/term'." +echo "Making links to \`lisp/term'" ### Don't distribute =*.el files or TAGS. (cd lisp/term ln [a-zA-Z]*.el ../../${tempdir}/lisp/term @@ -226,9 +243,9 @@ echo "Making links to \`lisp/term'." ln README ../../${tempdir}/lisp/term rm -f =* TAGS) -echo "Making links to \`src'." +echo "Making links to \`src'" ### Don't distribute =*.[ch] files, or the configured versions of -### config.h.in, paths.h.in, or Makefile.in.in, or TAGS. +### config.in, paths.in, or Makefile.in, or TAGS. (cd src echo " (If we can't link gmalloc.c, that's okay.)" ln [a-zA-Z]*.c ../${tempdir}/src @@ -236,90 +253,99 @@ echo "Making links to \`src'." test -f ../${tempdir}/src/gmalloc.c || cp gmalloc.c ../${tempdir}/src ln [a-zA-Z]*.h ../${tempdir}/src ln [a-zA-Z]*.s ../${tempdir}/src - ln README Makefile.in.in ChangeLog ChangeLog.? config.h.in paths.h.in \ + ln README Makefile.in ChangeLog ChangeLog.? config.in paths.in \ ../${tempdir}/src + ln makefile.nt ../${tempdir}/src ln .gdbinit .dbxinit ../${tempdir}/src ln *.opt vms-pp.trans ../${tempdir}/src cd ../${tempdir}/src - rm -f config.h paths.h Makefile + rm -f config.h paths.h Makefile Makefile.c rm -f =* TAGS) -echo "Making links to \`src/bitmaps'." +echo "Making links to \`src/bitmaps'" (cd src/bitmaps ln README *.xbm ../../${tempdir}/src/bitmaps) -echo "Making links to \`src/m'." +echo "Making links to \`src/m'" (cd src/m # We call files for miscellaneous input (to linker etc) .inp. ln README [a-zA-Z0-9]*.h *.inp ../../${tempdir}/src/m) -echo "Making links to \`src/s'." +echo "Making links to \`src/s'" (cd src/s - ln README [a-zA-Z0-9]*.h *.inp ../../${tempdir}/src/s) + ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s) -echo "Making links to \`lib-src'." +echo "Making links to \`lib-src'" (cd lib-src ln [a-zA-Z]*.[chy] ../${tempdir}/lib-src - ln ChangeLog Makefile.in.in README testfile vcdiff ../${tempdir}/lib-src + ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src ln emacs.csh rcs2log rcs-checkin makefile.nt ../${tempdir}/lib-src cd ../${tempdir}/lib-src - rm -f getdate.tab.c y.tab.c y.tab.h + rm -f getdate.tab.c y.tab.c y.tab.h Makefile.c rm -f =* TAGS) -echo "Making links to \`nt'." +echo "Making links to \`nt'" (cd nt - ln [a-z]*.cmd makefile.* todo ChangeLog install readme ../${tempdir}/nt) + ln emacs.ico emacs.rc config.nt [a-z]*.in [a-z]*.c ../${tempdir}/nt + ln [a-z]*.bat [a-z]*.h makefile.def makefile.nt ../${tempdir}/nt + ln TODO ChangeLog INSTALL README ../${tempdir}/nt) -echo "Making links to \`nt/inc'." +echo "Making links to \`nt/inc'" (cd nt/inc - ln [a-z]*.h ../${tempdir}/nt/inc) + ln [a-z]*.h ../../${tempdir}/nt/inc) -echo "Making links to \`nt/inc/sys'." +echo "Making links to \`nt/inc/sys'" (cd nt/inc/sys - ln [a-z]*.h ../${tempdir}/nt/inc/sys) + ln [a-z]*.h ../../../${tempdir}/nt/inc/sys) + +echo "Making links to \`nt/inc/arpa'" +(cd nt/inc/arpa + ln [a-z]*.h ../../../${tempdir}/nt/inc/arpa) -echo "Making links to \`nt/src'." -(cd nt/src - ln [a-z]*.h ../${tempdir}/nt/src) +echo "Making links to \`nt/inc/netinet'" +(cd nt/inc/netinet + ln [a-z]*.h ../../../${tempdir}/nt/inc/netinet) -echo "Making links to \`msdos'." +echo "Making links to \`msdos'" (cd msdos ln ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos - ln mainmake sed*.inp ../${tempdir}/msdos + ln mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos cd ../${tempdir}/msdos rm -f =*) -echo "Making links to \`oldXMenu'." +echo "Making links to \`oldXMenu'" (cd oldXMenu ln *.c *.h *.in ../${tempdir}/oldXMenu ln README Imakefile ChangeLog ../${tempdir}/oldXMenu ln compile.com descrip.mms ../${tempdir}/oldXMenu) -echo "Making links to \`lwlib'." +echo "Making links to \`lwlib'" (cd lwlib ln *.c *.h *.in ../${tempdir}/lwlib - ln README Imakefile ChangeLog ../${tempdir}/lwlib) + ln README Imakefile ChangeLog ../${tempdir}/lwlib + cd ../${tempdir}/lwlib + rm -f lwlib-Xol*) -echo "Making links to \`etc'." +echo "Making links to \`etc'" ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or ### tex litter. (cd etc ln `ls -d * | grep -v 'RCS' | grep -v 'Old' | grep -v '^e$'` ../${tempdir}/etc cd ../${tempdir}/etc - rm -f DOC* *~ \#*\# *.dvi *.log *,v =* core + rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) -echo "Making links to \`etc/e'." +echo "Making links to \`etc/e'" (cd etc/e ln `ls -d * | grep -v 'RCS'` ../../${tempdir}/etc/e - cd ../../${tempdir}/etc + cd ../../${tempdir}/etc/e rm -f *~ \#*\# *,v =* core) -echo "Making links to \`cpp'." +echo "Making links to \`cpp'" (cd cpp ln cccp.c cexp.y Makefile README ../${tempdir}/cpp) -echo "Making links to \`info'." +echo "Making links to \`info'" # Don't distribute backups or autosaves. (cd info ln [a-zA-Z]* ../${tempdir}/info @@ -328,7 +354,7 @@ echo "Making links to \`info'." ln emacs dummy~ ; ln emacs \#dummy\# rm -f *~ \#*\# core) -echo "Making links to \`man'." +echo "Making links to \`man'" (cd man ln *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man test -f README && ln README ../${tempdir}/man @@ -339,7 +365,7 @@ echo "Making links to \`man'." rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux) -echo "Making links to \`vms'." +echo "Making links to \`vms'" (cd vms ln [0-9a-zA-Z]* ../${tempdir}/vms cd ../${tempdir}/vms @@ -347,7 +373,7 @@ echo "Making links to \`vms'." ### It would be nice if they could all be symlinks to etc's copy, but ### you're not supposed to have any symlinks in distribution tar files. -echo "Making sure copying notices are all copies of \`etc/COPYING'." +echo "Making sure copying notices are all copies of \`etc/COPYING'" rm -f ${tempdir}/etc/COPYING cp etc/COPYING ${tempdir}/etc/COPYING for subdir in lisp src lib-src info msdos; do @@ -363,12 +389,17 @@ done #### than two. (Yes, strictly greater than 2 is correct; since we #### created these files by linking them in from the original tree, #### they'll have exactly two links normally.) -echo "Breaking intra-tree links." -find ${tempdir} ! -type d -links +2 \ - -exec cp -p {} $$ \; -exec rm -f {} \; -exec mv $$ {} \; +#### +#### Commented out since it's not strictly necessary; it should suffice +#### to just break the link on alloca.c. +#echo "Breaking intra-tree links." +#find ${tempdir} ! -type d -links +2 \ +# -exec cp -p {} $$ \; -exec rm -f {} \; -exec mv $$ {} \; +rm -f $tempdir/lib-src/alloca.c +cp $tempdir/src/alloca.c $tempdir/lib-src/alloca.c if [ "${newer}" ]; then - echo "Removing files older than $newer." + echo "Removing files older than $newer" ## 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. @@ -377,7 +408,7 @@ fi if [ "${make_tar}" = yes ]; then if [ "${default_gzip}" = "" ]; then - echo "Looking for gzip." + echo "Looking for gzip" temppath=`echo $PATH | sed 's/^:/.:/ s/::/:.:/g s/:$/:./ @@ -393,14 +424,14 @@ if [ "${make_tar}" = yes ]; then compress* ) gzip_extension=.Z ;; * ) gzip_extension=.gz ;; esac - echo "Creating tar file." + echo "Creating tar file" (cd ${tempparent} ; tar cvf - ${emacsname} ) \ | ${default_gzip} \ > ${emacsname}.tar${gzip_extension} fi if [ "${clean_up}" = yes ]; then - echo "Cleaning up the staging directory." + echo "Cleaning up the staging directory" rm -rf ${tempparent} else (cd ${tempparent}; mv ${emacsname} ..)