#### 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 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
#
### Print out each line we read, for debugging's sake.
### set -v
+## Don't restrict access to any files.
+umask 0
+
update=yes
+check=yes
clean_up=no
make_tar=no
newer=""
"--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
## for creating incremental or patch distributions.
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 ];
+ if [ "x$EMACS" = "x" -o "x$EMACS" = "xt" ];
then
echo You must specify the EMACS environment variable 2>&1
exit 1
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}"
-fi
-rm -f /tmp/el /tmp/elc
+### Find where to run Emacs.
+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 \
+ leim/[a-z]*.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 \
+ leim/[a-z]*.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.
+ (cd lisp; ls -1 [a-z]*.el [a-z]*/[a-z]*.el ; \
+ cd ../leim; ls -1 [a-z]*.el [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]*.elc [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 ! grep -q "dontcompilefiles:.* $file1\($\| \)" lisp/Makefile; then
+ case $file in
+ site-init.el | site-load.el | site-start.el | default.el)
+ ;;
+ term/*)
+ ;;
+ *)
+ 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
-### Check for .el files that would overflow the 14-char limit if compiled.
-long=`find lisp -name '[a-zA-Z0-9]??????????*.el' -print`
-if [ "$long" != "" ]; then
- echo "The following .el file names are too long:"
- echo "$long"
+ ### 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.
then
echo "Updating Info files"
- (cd man; make info)
+ (cd man; make -f Makefile.in srcdir=. info)
- echo "Updating finder-inf.el"
+ echo "Updating finder, custom and autoload data"
- (cd lisp; $EMACS -batch -l finder -f finder-compile-keywords-make-dist)
+ (cd lisp; make updates EMACS="$EMACS")
- echo "Recompiling Lisp files"
+ echo "Updating leim-list.el"
- $EMACS -batch -f batch-byte-recompile-directory lisp
+ (cd leim; make leim-list.el EMACS="$EMACS")
- echo "Updating autoloads"
+ echo "Recompiling Lisp files"
- $EMACS -batch -f batch-update-autoloads lisp
+ $EMACS -batch -f batch-byte-recompile-directory lisp leim
fi
echo "Making lisp/MANIFEST"
-(cd lisp; head -1 [!=]*.el | grep '^;' | sed -e 's/;;; //' > 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 != RCS ]; then
+ echo $dir
+ thisdir=`echo $dir/[!=]*.el | sed -e 's/ subdirs.el / /'`
+ files="$files $thisdir"
+ fi
+ done
+ head -1 $files | grep '^;' | sed -e 's/;;; //' | sort > MANIFEST)
echo "Creating staging directory: \`${tempparent}'"
### 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 BUGS move-if-change ${tempdir}
+ln GETTING.GNU.SOFTWARE 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.
'$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)
+ mv -f tmp.README README)
echo "Creating subdirectories"
-for subdir in lisp lisp/term site-lisp \
+for subdir in lisp site-lisp leim real-leim real-leim/CXTERM-DIC \
+ real-leim/SKK-DIC real-leim/skk real-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 \
- etc etc/e lock cpp info man msdos vms; do
+ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
+ etc etc/e lock info man msdos vms; do
mkdir ${tempdir}/${subdir}
done
-echo "Making links to \`lisp'"
+echo "Initializing \`leim' subdirectory"
+cp leim-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
ln [a-zA-Z]*.el ../${tempdir}/lisp
## simula.el doesn't keep abbreviations in simula.defns any more.
## ln [a-zA-Z]*.defns ../${tempdir}/lisp
ln ChangeLog Makefile makefile.nt ChangeLog.? README ../${tempdir}/lisp
- cd ../${tempdir}/lisp
- rm -f TAGS =*
- rm -f subdirs.el
- 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)
-
-#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)
+ (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 | */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-Z]*.el ../${tempdir}/lisp/$file
+ ln $file/[a-zA-Z]*.elc ../${tempdir}/lisp/$file
+ if [ -f $file/README ]; then
+ ln $file/README ../${tempdir}/lisp/$file
+ fi
+ if [ -f $file/ChangeLog ]; then
+ ln $file/ChangeLog ../${tempdir}/lisp/$file
+ fi
+ done )
+
+echo "Making links to \`leim' and its subdirectories for the LEIM distribution"
+### Don't distribute TAGS, or =*.el files.
+(cd leim
+ ln Makefile.in makefile.nt ../${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 skk/*.el skk/*.elc ../${tempdir}/real-leim/skk
+ ln quail/*.el quail/*.elc ../${tempdir}/real-leim/quail
+
+ cd ../${tempdir}/real-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
# test -f appears to succeed for a symlink
if test -L ../${tempdir}/src/$file; then
rm ../${tempdir}/src/$file
- cp $file ../${tempdir}/src
+ cp -p $file ../${tempdir}/src
chmod a-w ../${tempdir}/src/$file
fi
else
rm ../${tempdir}/src/$file
- cp $file ../${tempdir}/src
+ cp -p $file ../${tempdir}/src
chmod a-w ../${tempdir}/src/$file
fi
done
(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)
+
echo "Making links to \`msdos'"
(cd msdos
ln ChangeLog emacs.ico emacs.pif ../${tempdir}/msdos
### Don't distribute = files, TAGS, DOC files, backups, autosaves, or
### tex litter.
(cd etc
- ln `ls -d * | grep -v 'RCS' | grep -v 'Old' | grep -v '^e$'` ../${tempdir}/etc
+ files=`ls -d * | grep -v 'RCS' | grep -v 'Old' | grep -v '^e$'`
+ 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 fns*.el
rm -f DOC* *~ \#*\# *.dvi *.log *.orig *.rej *,v =* core
rm -f TAGS)
cd ../../${tempdir}/etc/e
rm -f *~ \#*\# *,v =* core)
-echo "Making links to \`cpp'"
-(cd cpp
- ln cccp.c cexp.y Makefile README ../${tempdir}/cpp)
-
echo "Making links to \`info'"
# Don't distribute backups or autosaves.
(cd info
compress* ) gzip_extension=.Z ;;
* ) gzip_extension=.gz ;;
esac
- echo "Creating tar file"
+ echo "Creating tar files"
(cd ${tempparent} ; tar cvf - ${emacsname} ) \
| ${default_gzip} \
> ${emacsname}.tar${gzip_extension}
+ (cd ${tempparent}/${emacsname}-leim ; tar cvf - ${emacsname} ) \
+ | ${default_gzip} \
+ > ${emacsname}-leim.tar${gzip_extension}
fi
if [ "${clean_up}" = yes ]; then
echo "Cleaning up the staging directory"
rm -rf ${tempparent}
else
- (cd ${tempparent}; mv ${emacsname} ..)
+ (cd ${tempparent}; mv ${emacsname} ${emacsname}-leim ..)
rm -rf ${tempparent}
fi
HCoop / bpt / emacs.git / blobdiff