X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ad8f07cdb6267f4317e32722fdad6088af0a81ca..fbc284f6f71ec837ca5d6b518235fc70413361dd:/make-dist diff --git a/make-dist b/make-dist index 733cc29bca..ac23fcfa82 100755 --- a/make-dist +++ b/make-dist @@ -6,31 +6,67 @@ #### be distributed. This means that if you add a file with an odd name, #### you should make sure that this script will include it. +# Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2005, 2006 +# 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 2, 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; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. + progname="$0" ### Exit if a command fails. -### set -e +#set -e ### Print out each line we read, for debugging's sake. -### set -v +#set -v + +LANGUAGE=C +LC_ALL=C +LC_MESSAGES= +LANG= +export LANGUAGE LC_ALL LC_MESSAGES LANG + +## Don't restrict access to any files. +umask 0 -clean_up=yes -make_tar=yes +update=yes +check=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 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 ;; ## This option tells make-dist to make the distribution normally, then ## remove all files older than the given timestamp file. This is useful @@ -45,6 +81,28 @@ while [ $# -gt 0 ]; do "--compress") default_gzip="compress" ;; + + "--snapshot") + clean_up=yes + make_tar=yes + update=no + check=no + ;; + + "--help") + echo "Usage: ${progname} [options]" + echo "" + echo " --clean-up delete staging directories when done" + echo " --compress use compress instead of gzip" + 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" + echo " --snapshot same as --clean-up --no-update --tar --no-check" + echo " --tar make a tar file" + echo "" + exit 0 + ;; + * ) echo "${progname}: Unrecognized argument: $1" >&2 exit 1 @@ -61,19 +119,54 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then exit 1 fi +### Find where to run Emacs. +### (We don't accept EMACS=t as an answer, since that probably only means +### that the shell is running in an Emacs window.) +if [ $update = yes ]; +then + unset EMACS_UNIBYTE + if [ -f src/emacs ]; + then + EMACS=`pwd`/src/emacs + else + if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ]; + then + echo You must specify the EMACS environment variable 2>&1 + exit 1 + fi + fi +fi + ### Find out which version of Emacs this is. +shortversion=`grep 'defconst[ ]*emacs-version' lisp/version.el \ + | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` version=`grep 'defconst[ ]*emacs-version' lisp/version.el \ - | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'` + | 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 -if grep -s "GNU Emacs version ${version}" ./man/emacs.texi > /dev/null; then - true -else - echo "You must update the version number in \`./man/emacs.texi'" - sleep 5 +echo Version numbers are $version and $shortversion + +if [ $update = yes ]; +then + if grep -s "@set EMACSVER *${shortversion}" ./man/emacs.texi > /dev/null; then + true + else + echo "You must update the version number in \`./man/emacs.texi'" + 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. @@ -87,35 +180,106 @@ them, and try again." >&2 exit 1 fi -### Check for .elc files with no corresponding .el file. -ls -1 lisp/*.el | sed 's/\.el$/.elc/' > /tmp/el -ls -1 lisp/*.elc > /tmp/elc -bogosities="`comm -13 /tmp/el /tmp/elc`" -if [ "${bogosities}" != "" ]; then - echo "The following .elc files have no corresponding .el files:" - echo "${bogosities}" +### Find where to run Emacs. +if [ $check = yes ]; +then + ### Check for .elc files with no corresponding .el file. + ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \ + leim/[a-z]*/[a-z]*.el | sed 's/\.el$/.elc/' > /tmp/el + ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \ + leim/[a-z]*/[a-z]*.elc > /tmp/elc + bogosities="`comm -13 /tmp/el /tmp/elc`" + if [ "${bogosities}" != "" ]; then + echo "The following .elc files have no corresponding .el files:" + echo "${bogosities}" + fi + rm -f /tmp/el /tmp/elc + + ### Check for .el files with no corresponding .elc file. + ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \ + leim/[a-z]*/[a-z]*.el > /tmp/el + ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \ + leim/[a-z]*/[a-z]*.elc | sed 's/\.elc$/.el/' > /tmp/elc + losers="`comm -23 /tmp/el /tmp/elc`" + bogosities= + for file in $losers; do + if ! grep -q "no-byte-compile: t" $file; then + case $file in + site-init.el | site-load.el | site-start.el | default.el) + ;; + *) + bogosities="$file $bogosities" + ;; + esac + fi + done + if [ x"${bogosities}" != x"" ]; then + echo "The following .el files have no corresponding .elc files:" + echo "${bogosities}" + fi + rm -f /tmp/el /tmp/elc fi -rm -f /tmp/el /tmp/elc ### 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 +if [ "x`ls -t configure configure.in | sed q`" != "xconfigure" ]; then + 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.in getdate.c YACC="bison -y") +### Make sure src/config-in.stamp is newer than configure.in. +if [ "x`ls -t src/stamp-h.in configure.in | sed q`" != "xsrc/stamp-h.in" ]; then + echo "\`./configure.in' is newer than \`./src/stamp-h.in'" >&2 + echo "Running autoheader" >&2 + autoheader || { x=$?; echo Autoheader FAILED! >&2; exit $x; } + rm -f src/stamp-h.in + echo timestamp > src/stamp-h.in +fi + +if [ $update = yes ]; +then + echo "Updating Info files" + (cd man; make -f Makefile.in srcdir=. info) + (cd lispref; make -f Makefile.in srcdir=. info) + (cd lispintro; make -f Makefile.in SHELL=/bin/sh srcdir=. info VPATH=.) + + echo "Updating finder, custom and autoload data" + (cd lisp; make updates EMACS="$EMACS") + + if test -f leim/leim-list.el; then + echo "Updating leim-list.el" + (cd leim; make leim-list.el EMACS="$EMACS") + fi + + echo "Recompiling Lisp files" + $EMACS -batch -f batch-byte-recompile-directory lisp leim +fi + +echo "Making lisp/MANIFEST" + +(cd lisp; + files=`echo [!=]*.el | sed -e 's/ subdirs.el / /' -e 's/ default.el / /'` + for dir in [!=]*; do + if [ -d $dir ] && [ $dir != term ] && [ $dir != CVS ] && [ $dir != RCS ] + then + echo $dir + thisdir=`echo $dir/[!=]*.el | sed -e 's/ subdirs.el / /'` + files="$files $thisdir" + fi + done + for file in $files + do sed -n 's/^;;; //p; q' $file + done | sort > MANIFEST) echo "Creating staging directory: \`${tempparent}'" + mkdir ${tempparent} -emacsname="emacs-${version}${new_extension}" 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}'" @@ -125,186 +289,405 @@ 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." -ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README move-if-change ${tempdir} -ln ChangeLog Makefile.in build-ins.in configure configure.in ${tempdir} -ln make-dist vpath.sed ${tempdir} -### Copy config.guess and config.sub; they're cross-filesystem symlinks. +echo "Making links to top-level files" +ln AUTHORS FTP INSTALL README BUGS move-if-change ${tempdir} +ln ChangeLog Makefile.in configure configure.in ${tempdir} +ln config.bat make-dist update-subdirs vpath.sed ${tempdir} +### Copy these files; they're cross-filesystem symlinks. +cp mkinstalldirs ${tempdir} 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 } $1 " " $2 " " $3 " " $4 " " $5 != "This directory tree holds version"' \ version=${version} README > tmp.README - mv tmp.README README) - - -echo "Creating subdirectories." -# I think we're not going to distribute anything in external-lisp, so -# I've removed it from this list. -for subdir in lisp lisp/term site-lisp \ - src src/m src/s src/bitmaps lib-src oldXMenu \ - etc lock cpp info man shortnames vms; do + mv -f tmp.README README) + + +echo "Creating subdirectories" +for subdir in lisp site-lisp lispref lispintro \ + leim leim/CXTERM-DIC leim/MISC-DIC \ + leim/SKK-DIC leim/ja-dic leim/quail \ + src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ + nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ + etc etc/e \ + etc/images etc/images/ezimage etc/images/gnus etc/images/gud \ + etc/images/icons etc/images/low-color etc/images/mail \ + etc/images/smilies etc/tree-widget etc/tree-widget/default \ + etc/tree-widget/folder info man m4 msdos vms mac mac/inc \ + mac/inc/sys mac/src mac/Emacs.app mac/Emacs.app/Contents \ + mac/Emacs.app/Contents/MacOS mac/Emacs.app/Contents/Resources \ + mac/Emacs.app/Contents/Resources/English.lproj +do + echo " ${tempdir}/${subdir}" mkdir ${tempdir}/${subdir} done -echo "Making links to \`lisp'." +echo "Making links to \`lisp' and its subdirectories" ### Don't distribute TAGS, =*.el files, site-init.el, site-load.el, or default.el. (cd lisp ln [a-zA-Z]*.el ../${tempdir}/lisp ln [a-zA-Z]*.elc ../${tempdir}/lisp - ln [a-zA-Z]*.dat forms.README ../${tempdir}/lisp + ln [a-zA-Z]*.dat ../${tempdir}/lisp + for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do + # If there are no images, the shell won't expand the pattern. + if [ -f $img ]; then + ln $img ../${tempdir}/lisp + fi + done ## simula.el doesn't keep abbreviations in simula.defns any more. ## ln [a-zA-Z]*.defns ../${tempdir}/lisp - ln ChangeLog OChangeLog README dired.todo ../${tempdir}/lisp - cd ../${tempdir}/lisp - rm -f TAGS =* - rm -f site-init site-init.el site-init.elc - rm -f site-load site-load.el site-load.elc - rm -f default default.el default.elc) - -#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 -# ln [a-zA-Z]*.elc ../../${tempdir}/lisp/calc-2.02 -# ln calc.info* calc.texinfo calc-refcard.* ../../${tempdir}/lisp/calc-2.02 -# ln INSTALL Makefile README README.prev ../../${tempdir}/lisp/calc-2.02 -# cd ../../${tempdir}/lisp/calc-2.02 -# rm -f *~ TAGS) - -echo "Making links to \`lisp/term'." -### Don't distribute =*.el files or TAGS. -(cd lisp/term - ln [a-zA-Z]*.el ../../${tempdir}/lisp/term - ln [a-zA-Z]*.elc ../../${tempdir}/lisp/term - ln README ../../${tempdir}/lisp/term - rm -f =* TAGS) - -### echo "Making links to \`external-lisp'." -### ### Don't distribute =*.el files or TAGS. -### (cd external-lisp -### ln [a-zA-Z]*.el ../${tempdir}/external-lisp -### ln [a-zA-Z]*.elc ../${tempdir}/external-lisp -### ln ChangeLog README ../${tempdir}/external-lisp -### rm -f =* TAGS) - -echo "Making links to \`src'." + ln ChangeLog ChangeLog.*[0-9] ../${tempdir}/lisp + ln Makefile.in makefile.w32-in ../${tempdir}/lisp + test -f README && ln README ../${tempdir}/lisp + (cd ../${tempdir}/lisp + rm -f TAGS =* + 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 + ) + + ## Find all subdirs of lisp dir + for file in `find . -type d -print`; do + case $file in + . | .. | */Old | */CVS | */RCS | */=*) + ;; + *) + if [ -d $file ]; then + subdirs="$file $subdirs" + fi + ;; + esac + done + + for file in $subdirs; do + echo " lisp/$file" + mkdir ../${tempdir}/lisp/$file + ln $file/[a-zA-Z0-9]*.el ../${tempdir}/lisp/$file + ln $file/[a-zA-Z0-9]*.elc ../${tempdir}/lisp/$file + for img in $file/[a-zA-Z]*.xpm $file/[a-zA-Z]*.xbm $file/[a-zA-Z]*.pbm; do + if [ -f $img ]; then + ln $img ../${tempdir}/lisp/$file + fi + done + if [ -f $file/README ]; then + ln $file/README ../${tempdir}/lisp/$file + fi + + if [ -f $file/ChangeLog ]; then + ln $file/ChangeLog ../${tempdir}/lisp/$file + for f in $file/ChangeLog.*[0-9]; do + if [ -f $f ]; then + ln $f ../${tempdir}/lisp/$file + fi + done + fi + done ) + +echo "Making links to \`leim' and its subdirectories" +### Don't distribute TAGS, or =*.el files. +(cd leim + ln makefile.w32-in ../${tempdir}/leim + ln ChangeLog README ../${tempdir}/leim + + ln CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC + ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC + ln MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC + ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic + ln Makefile.in ../${tempdir}/leim/Makefile.in + ln leim-ext.el ../${tempdir}/leim/leim-ext.el + ## Lisp files that start with a capital are generated from TIT + ## dictionaries so we don't distribute them. + ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail + rm -f ../${tempdir}/leim/quail/quick-b5.* + rm -f ../${tempdir}/leim/quail/quick-cns.* + rm -f ../${tempdir}/leim/quail/tsang-b5.* + rm -f ../${tempdir}/leim/quail/tsang-cns.* + + cd ../${tempdir}/leim + rm -f TAGS =* */=*) + +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.)" + echo " (It is ok if ln fails in some cases.)" ln [a-zA-Z]*.c ../${tempdir}/src - ## Might be a symlink to a file on another filesystem. - 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 OChangeLog config.h.in paths.h.in \ - ../${tempdir}/src + ln [a-zA-Z]*.in ../${tempdir}/src + ln [a-zA-Z]*.opt ../${tempdir}/src + ## If we ended up with a symlink, or if we did not get anything + ## due to a cross-device symlink, copy the file. + for file in [a-zA-Z]*.[hcs] [a-zA-Z]*.in [a-zA-Z]*.opt; do + if test -f ../${tempdir}/src/$file; then + # test -f appears to succeed for a symlink + if test -L ../${tempdir}/src/$file; then + rm ../${tempdir}/src/$file + cp -p $file ../${tempdir}/src + chmod a-w ../${tempdir}/src/$file + fi + else + rm ../${tempdir}/src/$file + cp -p $file ../${tempdir}/src + chmod a-w ../${tempdir}/src/$file + fi + done + ln README ChangeLog ChangeLog.*[0-9] ../${tempdir}/src + ln makefile.w32-in ../${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 epaths.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 - ln README [a-zA-Z0-9]*.h ../../${tempdir}/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 ../../${tempdir}/src/s) -echo "Making links to \`lib-src'." +echo "Making links to \`lib-src'" (cd lib-src - ln [a-zA-Z]*.[chy] [a-zA-Z]*.lex ../${tempdir}/lib-src - ln ChangeLog Makefile.in README testfile vcdiff rcs2log ../${tempdir}/lib-src - ln emacs.csh rcs-checkin ../${tempdir}/lib-src + ln [a-zA-Z]*.[chy] ../${tempdir}/lib-src + ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src + ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src + ln makefile.w32-in ../${tempdir}/lib-src + ## If we ended up with a symlink, or if we did not get anything + ## due to a cross-device symlink, copy the file. + for file in [a-zA-Z]*.[chy]; do + if test -f ../${tempdir}/lib-src/$file; then + # test -f appears to succeed for a symlink + if test -L ../${tempdir}/lib-src/$file; then + rm ../${tempdir}/lib-src/$file + cp $file ../${tempdir}/lib-src + chmod a-w ../${tempdir}/lib-src/$file + fi + else + rm ../${tempdir}/lib-src/$file + cp $file ../${tempdir}/lib-src + chmod a-w ../${tempdir}/lib-src/$file + fi + done cd ../${tempdir}/lib-src - rm -f getdate.tab.c y.tab.c y.tab.h + rm -f Makefile.c + rm -f getopt.h rm -f =* TAGS) -echo "Making links to \`oldXMenu'." +echo "Making links to \`m4'" +(cd m4 + ln *.m4 ../${tempdir}/m4) + +echo "Making links to \`nt'" +(cd nt + ln emacs.rc config.nt [a-z]*.c ../${tempdir}/nt + ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt + ln [a-z]*.bat [a-z]*.h ../${tempdir}/nt + ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) + +echo "Making links to \`nt/inc'" +(cd nt/inc + ln [a-z]*.h ../../${tempdir}/nt/inc) + +echo "Making links to \`nt/inc/sys'" +(cd 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/inc/netinet'" +(cd nt/inc/netinet + ln [a-z]*.h ../../../${tempdir}/nt/inc/netinet) + +echo "Making links to \`nt/icons'" +(cd nt/icons + ln [a-z]*.ico ../../${tempdir}/nt/icons + ln [a-z]*.cur ../../${tempdir}/nt/icons) + +echo "Making links to \`mac'" +(cd mac + ln ChangeLog INSTALL README *.xml *.MPW ../${tempdir}/mac) + +echo "Making links to \`mac/inc'" +(cd mac/inc + ln [a-z]*.h ../../${tempdir}/mac/inc) + +echo "Making links to \`mac/inc/sys'" +(cd mac/inc/sys + ln [a-z]*.h ../../../${tempdir}/mac/inc/sys) + +echo "Making links to \`mac/src'" +(cd mac/src + ln [a-z]*.c *.r ../../${tempdir}/mac/src) + +echo "Making links to \`mac/Emacs.app/Contents'" +(cd mac/Emacs.app/Contents + ln Info.plist PkgInfo ../../../${tempdir}/mac/Emacs.app/Contents) + +echo "Making links to \`mac/Emacs.app/Contents/Resources/English.lproj'" +(cd mac/Emacs.app/Contents/Resources/English.lproj + ln InfoPlist.strings ../../../../../${tempdir}/mac/Emacs.app/Contents/Resources/English.lproj) + +echo "Making links to \`msdos'" +(cd msdos + ln ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos + ln is_exec.c sigaction.c mainmake mainmake.v2 sed*.inp ../${tempdir}/msdos + cd ../${tempdir}/msdos + rm -f =*) + +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 \`etc'." +echo "Making links to \`lwlib'" +(cd lwlib + ln *.c *.h *.in ../${tempdir}/lwlib + ln README ChangeLog ../${tempdir}/lwlib) + +echo "Making links to \`etc'" ### Don't distribute = files, TAGS, DOC files, backups, autosaves, or ### tex litter. +### Don't distribute gfdl.1, since no man page references it. (cd etc - ln `ls -d * | grep -v 'RCS' | grep -v 'Old'` ../${tempdir}/etc + files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$' \ + | grep -v '^images$' | grep -v '^tree-widget$'` + ln $files ../${tempdir}/etc + ## If we ended up with a symlink, or if we did not get anything + ## due to a cross-device symlink, copy the file. + for file in $files; do + if test -f ../${tempdir}/etc/$file; then + # test -f appears to succeed for a symlink + if test -L ../${tempdir}/etc/$file; then + rm ../${tempdir}/etc/$file + cp $file ../${tempdir}/etc + chmod a-w ../${tempdir}/etc/$file + fi + else + rm ../${tempdir}/etc/$file + cp $file ../${tempdir}/etc + chmod a-w ../${tempdir}/etc/$file + fi + done cd ../${tempdir}/etc - rm -f DOC* *~ \#*\# *.dvi *.log *,v =* core + rm -f fns*.el gfdl.1 + rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) -echo "Making links to \`cpp'." -(cd cpp - ln cccp.c cexp.y Makefile README ../${tempdir}/cpp) +echo "Making links to \`etc/e'" +(cd etc/e + ln `ls -d * | grep -v CVS | grep -v RCS` ../../${tempdir}/etc/e + cd ../../${tempdir}/etc/e + rm -f *~ \#*\# *,v =* core) + +echo "Making links to \`etc/images'" +(cd etc/images + for img in [a-zA-Z]*.xpm [a-zA-Z]*.xbm [a-zA-Z]*.pbm; do + if [ -f $img ]; then + ln $img ../../${tempdir}/etc/images + fi + done) + +for dir in etc/images/ezimage etc/images/gnus etc/images/gud etc/images/icons \ + etc/images/low-color etc/images/mail etc/images/smilies \ + etc/tree-widget/default etc/tree-widget/folder ; do + echo "Making links to \`${dir}'" + (cd ${dir} + ln `ls -d * | grep -v CVS | grep -v RCS` ../../../${tempdir}/${dir} + cd ../../../${tempdir}/${dir} + rm -f *~ \#*\# *,v =* core) +done -echo "Making links to \`info'." +echo "Making links to \`info'" # Don't distribute backups or autosaves. (cd info - ln [a-zA-Z]* ../${tempdir}/info + ln `find . -type f -print | grep -v CVS | grep -v RCS | grep -v cvsignore` ../${tempdir}/info + #ln [a-zA-Z]* ../${tempdir}/info cd ../${tempdir}/info # Avoid an error when expanding the wildcards later. 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 - test -f Makefile && ln Makefile ../${tempdir}/man - ln ChangeLog split-man ../${tempdir}/man - cp texinfo.tex texindex.c ../${tempdir}/man + test -f Makefile.in && ln Makefile.in ../${tempdir}/man + ln ChangeLog ../${tempdir}/man + test -f split-man && ln split-man ../${tempdir}/man + cp texinfo.tex ../${tempdir}/man cd ../${tempdir}/man rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux) -echo "Making links to \`shortnames'." -(cd shortnames - ln *.c ../${tempdir}/shortnames - ln Makefile reserved special ../${tempdir}/shortnames) - -echo "Making links to \`vms'." +echo "Making links to \`lispref'" +(cd lispref + ln `ls -1 *.texi` ../${tempdir}/lispref + ln *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/lispref + ln *.txt *.el spellfile tindex.pl ../${tempdir}/lispref + test -f README && ln README ../${tempdir}/lispref + test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref + ln ChangeLog ../${tempdir}/lispref + cd ../${tempdir}/lispref + rm -f \#*\# =* *~ core elisp-index* *.Z *.z xmail + rm -f elisp.?? *.log *.toc *.dvi *.oaux) + +echo "Making links to \`lispintro'" +(cd lispintro + ln *.texi *.aux *.cps *.fns *.kys *.vrs *.eps ../${tempdir}/lispintro + test -f texinfo.tex && ln texinfo.tex ../${tempdir}/lispintro + test -f README && ln README ../${tempdir}/lispintro + test -f Makefile.in && ln Makefile.in ../${tempdir}/lispintro + ln ChangeLog ../${tempdir}/lispintro + cd ../${tempdir}/lispintro + rm -f \#*\# =* *~ core *.Z *.z xmail + rm -f emacs-lisp-intro.?? *.log *.toc *.dvi *.oaux) + +echo "Making links to \`vms'" (cd vms - ln [0-9a-zA-Z]* ../${tempdir}/vms + test -f README && ln README ../${tempdir}/vms cd ../${tempdir}/vms rm -f *~) -### It would be nice if they could all be symlinks to etc's copy, but +### 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 \`etc/COPYING'." -rm -f ${tempdir}/etc/COPYING -cp etc/COPYING ${tempdir}/etc/COPYING -# I think we're not going to distribute anything in external-lisp, so -# I've removed it from this list. -for subdir in lisp src lib-src info shortnames; do - if [ -f ${tempdir}/${subdir}/COPYING ]; then - rm ${tempdir}/${subdir}/COPYING - fi - cp etc/COPYING ${tempdir}/${subdir} +echo "Making sure copying notices are all copies of \`COPYING'" +for subdir in . etc info leim lib-src lisp lwlib mac msdos nt src; do + rm -f ${tempdir}/${subdir}/COPYING + cp COPYING ${tempdir}/${subdir} done #### Make sure that there aren't any hard links between files in the #### distribution; people with afs can't deal with that. Okay, #### actually we just re-copy anything with a link count greater -#### than two. -echo "Breaking intra-tree links." -find ${tempdir} ! -type d -links +2 \ - -exec cp {} $$ \; -exec rm -f {} \; -exec mv $$ {} \; +#### 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.) +#### +#### 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. @@ -313,7 +696,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/:$/:./ @@ -329,15 +712,19 @@ 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} ..) rm -rf ${tempparent} fi +# arch-tag: 26e3eb50-a394-4ab2-82b2-d8e5af500de7 ### make-dist ends here