X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/7f39d6bb67b41576fe2aaf73a414df6bc445698a..fbc284f6f71ec837ca5d6b518235fc70413361dd:/make-dist diff --git a/make-dist b/make-dist index a8247415ab..ac23fcfa82 100755 --- a/make-dist +++ b/make-dist @@ -6,7 +6,8 @@ #### 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 Free Software Foundation, Inc. +# Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2005, 2006 +# Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -22,8 +23,8 @@ # # 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., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. progname="$0" @@ -33,6 +34,12 @@ progname="$0" ### 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 + ## Don't restrict access to any files. umask 0 @@ -123,7 +130,7 @@ then EMACS=`pwd`/src/emacs else if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ]; - then + then echo You must specify the EMACS environment variable 2>&1 exit 1 fi @@ -144,7 +151,7 @@ echo Version numbers are $version and $shortversion if [ $update = yes ]; then - if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; 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'" @@ -177,9 +184,9 @@ fi if [ $check = yes ]; then ### Check for .elc files with no corresponding .el file. - ls -1 lisp/[a-z]*.el lisp/[a-z]*/[a-z]*.el \ + 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-z]*.elc lisp/[a-z]*/[a-z]*.elc \ + 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 @@ -189,21 +196,17 @@ then rm -f /tmp/el /tmp/elc ### Check for .el files with no corresponding .elc file. - (cd lisp; ls -1 [a-z]*.el [a-z]*/[a-z]*.el ; \ - cd ../leim; ls -1 [a-z]*/[a-z]*.el) > /tmp/el - (cd lisp; ls -1 [a-z]*.elc [a-z]*/[a-z]*.elc; \ - cd ../leim; ls -1 [a-z]*/[a-z]*.elc) | sed 's/\.elc$/.el/' > /tmp/elc + 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 - file1=`echo $file | sed -e "s|.*/||"` - if ! sed -n -e "/^DONTCOMPILE/,/[^\\]\$/p" lisp/Makefile.in | - grep -q "[ ]$file1\($\| \)"; then + if ! grep -q "no-byte-compile: t" $file; then case $file in site-init.el | site-load.el | site-start.el | default.el) ;; - term/*) - ;; *) bogosities="$file $bogosities" ;; @@ -215,26 +218,30 @@ then echo "${bogosities}" fi rm -f /tmp/el /tmp/elc - - ### Check for .el files that would overflow the 14-char limit if compiled. - long=`find lisp leim -name '[a-zA-Z0-9]??????????*.el' -print` - if [ "$long" != "" ]; then - echo "The following .el file names are too long:" - echo "$long" - fi fi ### Make sure configure is newer than configure.in. -if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then +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 +### 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") @@ -260,7 +267,9 @@ echo "Making lisp/MANIFEST" files="$files $thisdir" fi done - head -1 $files | grep '^;' | sed -e 's/;;; //' | sort > MANIFEST) + for file in $files + do sed -n 's/^;;; //p; q' $file + done | sort > MANIFEST) echo "Creating staging directory: \`${tempparent}'" @@ -281,8 +290,8 @@ mkdir ${tempdir} ### 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 FTP INSTALL README BUGS move-if-change ${tempdir} -ln ChangeLog Makefile.in configure configure.in aclocal.m4 ${tempdir} +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} @@ -300,21 +309,24 @@ echo "Updating version number in README" echo "Creating subdirectories" -for subdir in lisp site-lisp \ - leim real-leim real-leim/CXTERM-DIC real-leim/MISC-DIC \ - real-leim/SKK-DIC real-leim/ja-dic real-leim/quail \ +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 lock info man msdos vms mac mac/inc mac/inc/sys \ - mac/src + 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 "Initializing \`leim' subdirectory" -cp noleim-Makefile.in ${tempdir}/leim/Makefile.in - 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 @@ -329,8 +341,8 @@ echo "Making links to \`lisp' and its subdirectories" done ## simula.el doesn't keep abbreviations in simula.defns any more. ## ln [a-zA-Z]*.defns ../${tempdir}/lisp - ln ChangeLog Makefile.in makefile.nt ChangeLog.? ../${tempdir}/lisp - ln makefile.w32-in ../${tempdir}/lisp + 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 =* @@ -344,7 +356,7 @@ echo "Making links to \`lisp' and its subdirectories" for file in `find . -type d -print`; do case $file in . | .. | */Old | */CVS | */RCS | */=*) - ;; + ;; *) if [ -d $file ]; then subdirs="$file $subdirs" @@ -369,7 +381,7 @@ echo "Making links to \`lisp' and its subdirectories" if [ -f $file/ChangeLog ]; then ln $file/ChangeLog ../${tempdir}/lisp/$file - for f in $file/ChangeLog.[0-9]; do + for f in $file/ChangeLog.*[0-9]; do if [ -f $f ]; then ln $f ../${tempdir}/lisp/$file fi @@ -377,32 +389,29 @@ echo "Making links to \`lisp' and its subdirectories" fi done ) -echo "Making links to \`leim' and its subdirectories for the LEIM distribution" +echo "Making links to \`leim' and its subdirectories" ### Don't distribute TAGS, or =*.el files. (cd leim - ln makefile.nt makefile.w32-in ../${tempdir}/real-leim - ln ChangeLog README ../${tempdir}/real-leim - - ln CXTERM-DIC/*.tit ../${tempdir}/real-leim/CXTERM-DIC - ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/real-leim/SKK-DIC - ln MISC-DIC/*.* ../${tempdir}/real-leim/MISC-DIC - ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/real-leim/ja-dic - ln Makefile.in ../${tempdir}/real-leim/Makefile.in - ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/real-leim/quail - rm -f ../${tempdir}/real-leim/quail/quick-b5.* - rm -f ../${tempdir}/real-leim/quail/quick-cns.* - rm -f ../${tempdir}/real-leim/quail/tsang-b5.* - rm -f ../${tempdir}/real-leim/quail/tsang-cns.* - - cd ../${tempdir}/real-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 =* */=*) -### Move the real-leim directory outside of Emacs proper. -(cd ${tempparent} - mkdir ${emacsname}-leim - mkdir ${emacsname}-leim/${emacsname} - mv ${emacsname}/real-leim ${emacsname}-leim/${emacsname}/leim) - echo "Making links to \`src'" ### Don't distribute =*.[ch] files, or the configured versions of ### config.in, paths.in, or Makefile.in, or TAGS. @@ -430,7 +439,7 @@ echo "Making links to \`src'" fi done ln README ChangeLog ChangeLog.*[0-9] ../${tempdir}/src - ln makefile.nt makefile.w32-in vms-pp.trans ../${tempdir}/src + ln makefile.w32-in ../${tempdir}/src ln .gdbinit .dbxinit ../${tempdir}/src cd ../${tempdir}/src rm -f config.h epaths.h Makefile Makefile.c @@ -453,7 +462,7 @@ echo "Making links to \`lib-src'" (cd 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 makefile.nt ../${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. @@ -473,14 +482,19 @@ echo "Making links to \`lib-src'" done cd ../${tempdir}/lib-src rm -f Makefile.c + rm -f getopt.h rm -f =* TAGS) +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]*.in [a-z]*.c ../${tempdir}/nt - ln _emacs nmake.defs gmake.defs ../${tempdir}/nt - ln [a-z]*.bat [a-z]*.h makefile.def makefile.nt ../${tempdir}/nt - ln TODO ChangeLog INSTALL README makefile.w32-in ../${tempdir}/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 @@ -500,7 +514,8 @@ echo "Making links to \`nt/inc/netinet'" echo "Making links to \`nt/icons'" (cd nt/icons - ln [a-z]*.ico ../../${tempdir}/nt/icons) + ln [a-z]*.ico ../../${tempdir}/nt/icons + ln [a-z]*.cur ../../${tempdir}/nt/icons) echo "Making links to \`mac'" (cd mac @@ -518,6 +533,14 @@ 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 @@ -534,15 +557,15 @@ echo "Making links to \`oldXMenu'" echo "Making links to \`lwlib'" (cd lwlib ln *.c *.h *.in ../${tempdir}/lwlib - ln README Imakefile ChangeLog ../${tempdir}/lwlib - cd ../${tempdir}/lwlib - rm -f lwlib-Xol*) + 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 - files=`ls -d * | grep -v CVS | grep -v RCS | grep -v 'Old' | grep -v '^e$'` + 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. @@ -561,7 +584,7 @@ echo "Making links to \`etc'" fi done cd ../${tempdir}/etc - rm -f fns*.el + rm -f fns*.el gfdl.1 rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core rm -f TAGS) @@ -571,6 +594,24 @@ echo "Making links to \`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'" # Don't distribute backups or autosaves. (cd info @@ -588,27 +629,46 @@ echo "Making links to \`man'" test -f Makefile.in && ln Makefile.in ../${tempdir}/man ln ChangeLog ../${tempdir}/man test -f split-man && ln split-man ../${tempdir}/man - test -f texinfo.tex && cp texinfo.tex ../${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 \`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 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 -for subdir in lisp src lib-src info msdos; 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 @@ -652,21 +712,19 @@ if [ "${make_tar}" = yes ]; then compress* ) gzip_extension=.Z ;; * ) gzip_extension=.gz ;; esac - echo "Creating tar files" + echo "Creating tar file" (cd ${tempparent} ; tar cvf - ${emacsname} ) \ | ${default_gzip} \ > ${emacsname}.tar${gzip_extension} - (cd ${tempparent}/${emacsname}-leim ; tar cvf - ${emacsname} ) \ - | ${default_gzip} \ - > leim-${version}${new_extension}.tar${gzip_extension} fi if [ "${clean_up}" = yes ]; then echo "Cleaning up the staging directory" rm -rf ${tempparent} else - (cd ${tempparent}; mv ${emacsname} ${emacsname}-leim ..) + (cd ${tempparent}; mv ${emacsname} ..) rm -rf ${tempparent} fi +# arch-tag: 26e3eb50-a394-4ab2-82b2-d8e5af500de7 ### make-dist ends here