X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/860484dd3c15543d6127cb7fb6a3268af66403b8..06626cf2afbfba299ec9e54c5dcd0c1f5a799fae:/make-dist diff --git a/make-dist b/make-dist index 43a7807153..93a5a5a2e8 100755 --- a/make-dist +++ b/make-dist @@ -6,7 +6,7 @@ #### 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 Free Software Foundation, Inc. # # This file is part of GNU Emacs. # @@ -129,7 +129,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 @@ -150,7 +150,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'" @@ -231,18 +231,27 @@ then 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 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") @@ -268,7 +277,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}'" @@ -309,20 +320,19 @@ echo "Updating version number in README" echo "Creating subdirectories" for subdir in lisp site-lisp lispref lispintro \ - leim real-leim real-leim/CXTERM-DIC real-leim/MISC-DIC \ - real-leim/SKK-DIC real-leim/ja-dic real-leim/quail \ + 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 info man 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 @@ -352,7 +362,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" @@ -385,32 +395,26 @@ 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.nt 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 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. @@ -508,7 +512,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 @@ -526,6 +531,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 @@ -542,9 +555,7 @@ 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 @@ -604,7 +615,8 @@ echo "Making links to \`man'" echo "Making links to \`lispref'" (cd lispref - ln *.texi *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref + ln `ls -1 *.texi` ../${tempdir}/lispref + ln *.aux *.cps *.fns *.kys *.vrs index.*perm ../${tempdir}/lispref ln *.txt *.el spellfile permute-index tindex.pl ../${tempdir}/lispref test -f README && ln README ../${tempdir}/lispref test -f Makefile.in && ln Makefile.in ../${tempdir}/lispref @@ -630,7 +642,7 @@ echo "Making links to \`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 \`COPYING'" for subdir in . etc info leim lib-src lisp lwlib mac msdos nt src; do @@ -679,21 +691,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