if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
echo "${progname}: Can't find \`src/lisp.h' and \`lisp/version.el'." >&2
echo "${progname} must be run in the top directory of the Emacs" >&2
- echo "distribution tree. Cd to that directory and try again." >&2
+ echo "distribution tree. cd to that directory and try again." >&2
exit 1
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
+echo $version and $shortversion
+
+if grep -s "GNU Emacs version ${shortversion}" ./man/emacs.texi > /dev/null; then
true
else
echo "You must update the version number in \`./man/emacs.texi'"
+ sleep 5
+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 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 "\`./configure.in' seems to be newer than \`./configure.'" >&2
echo "Attempting to run autoconf." >&2
autoconf
fi
### Update getdate.c.
-(cd lib-src; make -f Makefile.in getdate.c)
+(cd lib-src; make -f Makefile getdate.c YACC="bison -y")
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
### 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-install.in configure configure.in ${tempdir}
-ln make-dist ${tempdir}
-### Copy config.guess and config.sub; they're cross-filesystem symlinks.
+ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README BUGS move-if-change ${tempdir}
+ln ChangeLog Makefile.in build-ins.in configure configure.in ${tempdir}
+ln config.bat make-dist vpath.sed ${tempdir}
+### Copy these files; they're cross-filesystem symlinks.
cp config.sub ${tempdir}
cp config.guess ${tempdir}
+cp install.sh ${tempdir}
echo "Updating version number in README."
(cd ${tempdir}
# 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
+ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \
+ etc lock cpp info man msdos shortnames vms; do
mkdir ${tempdir}/${subdir}
done
(cd lisp
ln [a-zA-Z]*.el ../${tempdir}/lisp
ln [a-zA-Z]*.elc ../${tempdir}/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 README ../${tempdir}/lisp
+ ln ChangeLog Makefile ChangeLog.? README dired.todo ../${tempdir}/lisp
cd ../${tempdir}/lisp
rm -f TAGS =*
rm -f site-init site-init.el site-init.elc
(cd lisp/term
ln [a-zA-Z]*.el ../../${tempdir}/lisp/term
ln [a-zA-Z]*.elc ../../${tempdir}/lisp/term
- ln README ChangeLog ../../${tempdir}/lisp/term
+ ln README ../../${tempdir}/lisp/term
rm -f =* TAGS)
### echo "Making links to \`external-lisp'."
echo "Making links to \`src'."
### Don't distribute =*.[ch] files, or the configured versions of
-### config.h.in, paths.h.in, or Makefile.in, or TAGS.
+### config.h.in, paths.h.in, or Makefile.in.in, or TAGS.
(cd src
echo " (If we can't link gmalloc.c, that's okay.)"
ln [a-zA-Z]*.c ../${tempdir}/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 ymakefile ChangeLog config.h.in paths.h.in \
+ ln README Makefile.in.in ChangeLog ChangeLog.? config.h.in paths.h.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
- if [ -z "${newer}" ]; then
- etags *.h *.c ../lisp/*.el
- fi
rm -f =* TAGS)
echo "Making links to \`src/bitmaps'."
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 ChangeLog Makefile.in.in README testfile vcdiff ../${tempdir}/lib-src
+ ln emacs.csh rcs2log rcs-checkin ../${tempdir}/lib-src
cd ../${tempdir}/lib-src
- rm -f getdate.c getdate.tab.c y.tab.c y.tab.h
+ rm -f getdate.tab.c y.tab.c y.tab.h
rm -f =* TAGS)
+echo "Making links to \`msdos'."
+(cd msdos
+ ln ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
+ ln mainmake sed[123].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 \`lwlib'."
+(cd lwlib
+ ln *.c *.h *.in ../${tempdir}/lwlib
+ ln README Imakefile ChangeLog ../${tempdir}/lwlib)
+
echo "Making links to \`etc'."
### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
### tex litter.
echo "Making links to \`man'."
(cd man
- ln *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/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
+ cp texinfo.tex texindex.c getopt.c ../${tempdir}/man
cd ../${tempdir}/man
rm -f \#*\# =* *~ core emacs-index* *.Z *.z xmail
rm -f emacs.?? termcap.?? gdb.?? *.log *.toc *.dvi *.oaux)
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
+for subdir in lisp src lib-src info shortnames msdos; do
if [ -f ${tempdir}/${subdir}/COPYING ]; then
rm ${tempdir}/${subdir}/COPYING
fi
#### than two.
echo "Breaking intra-tree links."
find ${tempdir} ! -type d -links +2 \
- -exec cp {} $$ \; -exec rm -f {} \; -exec mv $$ {} \;
+ -exec cp -p {} $$ \; -exec rm -f {} \; -exec mv $$ {} \;
if [ "${newer}" ]; then
echo "Removing files older than $newer."
fi
case "${default_gzip}" in
compress* ) gzip_extension=.Z ;;
- * ) gzip_extension=.z ;;
+ * ) gzip_extension=.gz ;;
esac
echo "Creating tar file."
(cd ${tempparent} ; tar cvf - ${emacsname} ) \
if [ "${clean_up}" = yes ]; then
echo "Cleaning up the staging directory."
rm -rf ${tempparent}
+else
+ (cd ${tempparent}; mv ${emacsname} ..)
+ rm -rf ${tempparent}
fi
### make-dist ends here
HCoop / bpt / emacs.git / blobdiff