(comint-arguments): Rewrite for speed.

[gnu-emacs] / make-dist

diff --git a/make-dist b/make-dist
index d00207a5fdfb2bf8d2a0a0bdf03cbb86346b1e38..2d2c65762361cc5a22445991557c2eb8a11f84b0 100755 (executable)
--- a/make-dist
+++ b/make-dist
@@ -62,14 +62,18 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
 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'"
@@ -115,7 +119,16 @@ if [ "x`ls -t configure configure.in | head -1`" != "xconfigure" ]; then
 fi
 
 ### Update getdate.c.
-(cd lib-src; make -f Makefile.in getdate.c YACC="bison -y")
+(cd lib-src; make -f Makefile getdate.c YACC="bison -y")
+
+echo "Updating Info files."
+
+(cd man; make info)
+
+echo "Updating finder-inf.el."
+
+### update finder-inf.el.
+(cd src; emacs -batch -l finder -f finder-compile-keywords)
 
 echo "Creating staging directory: \`${tempparent}'"
 
@@ -136,9 +149,9 @@ 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 GETTING.GNU.SOFTWARE INSTALL PROBLEMS README move-if-change ${tempdir}
+ln GETTING.GNU.SOFTWARE INSTALL PROBLEMS README BUGS move-if-change ${tempdir}
 ln ChangeLog Makefile.in build-ins.in configure configure.in ${tempdir}
-ln make-dist vpath.sed ${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}
@@ -170,7 +183,7 @@ 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 ChangeLog.? README dired.todo ../${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
@@ -227,17 +240,18 @@ echo "Making links to \`src/bitmaps'."
 
 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'."
 (cd src/s
- ln README [a-zA-Z0-9]*.h ../../${tempdir}/src/s)
+ ln README [a-zA-Z0-9]*.h *.inp ../../${tempdir}/src/s)
 
 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.tab.c y.tab.c y.tab.h
  rm -f =* TAGS)
@@ -245,7 +259,7 @@ echo "Making links to \`lib-src'."
 echo "Making links to \`msdos'."
 (cd msdos
  ln  ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
- ln mainmake patch1 sed.in[123] ../${tempdir}/msdos
+ ln mainmake sed[1234].inp ../${tempdir}/msdos
  cd ../${tempdir}/msdos
  rm -f =*)