Commit 76fb0a58 authored by Jim Blandy's avatar Jim Blandy
Browse files

* make-dist: Explain what's going on if config.sub and gmalloc.c

	can't be linked.  Place the code which copies them near the code
	which links the rest of the files around them.
parent c809458b
#!/bin/sh #!/bin/sh
#
# make-dist: create an Emacs distribution tar file from the current #### make-dist: create an Emacs distribution tar file from the current
# source tree. This basically creates a duplicate directory #### source tree. This basically creates a duplicate directory
# structure, and then hard links into it only those files that should #### structure, and then hard links into it only those files that should
# be distributed. This means that if you add a file with an odd name, #### be distributed. This means that if you add a file with an odd name,
# you should make sure that this script will include it. #### you should make sure that this script will include it.
progname="$0" progname="$0"
# Exit if a command fails. ### Exit if a command fails.
# set -e ### set -e
# Print out each line we read, for debugging's sake. ### Print out each line we read, for debugging's sake.
# set -v ### set -v
clean_up=yes clean_up=yes
make_tar=yes make_tar=yes
...@@ -20,21 +20,21 @@ newer="" ...@@ -20,21 +20,21 @@ newer=""
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
# This option tells make-dist not to delete the staging directory ## This option tells make-dist not to delete the staging directory
# after it's done making the tar file. ## after it's done making the tar file.
"--no-clean-up" ) "--no-clean-up" )
clean_up=no clean_up=no
;; ;;
# This option tells make-dist not to make a tar file. Since it's ## This option tells make-dist not to make a tar file. Since it's
# rather pointless to build the whole staging directory and then ## rather pointless to build the whole staging directory and then
# nuke it, using this option also selects '--no-clean-up'. ## nuke it, using this option also selects '--no-clean-up'.
"--no-tar" ) "--no-tar" )
make_tar=no make_tar=no
clean_up=no clean_up=no
;; ;;
# This option tells make-dist to make the distribution normally, then ## This option tells make-dist to make the distribution normally, then
# remove all files newer than the given timestamp file. This is useful ## remove all files newer than the given timestamp file. This is useful
# for creating incremental or patch distributions ## for creating incremental or patch distributions
"--newer") "--newer")
newer="$2" newer="$2"
new_extension=".new" new_extension=".new"
...@@ -48,7 +48,7 @@ while [ $# -gt 0 ]; do ...@@ -48,7 +48,7 @@ while [ $# -gt 0 ]; do
shift shift
done done
# Make sure we're running in the right place. ### Make sure we're running in the right place.
if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then 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}: 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 "${progname} must be run in the top directory of the Emacs" >&2
...@@ -56,7 +56,7 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then ...@@ -56,7 +56,7 @@ if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/version.el ]; then
exit 1 exit 1
fi fi
# Find out which version of Emacs this is. ### Find out which version of Emacs this is.
version=`grep 'defconst[ ]*emacs-version' lisp/version.el \ version=`grep 'defconst[ ]*emacs-version' lisp/version.el \
| sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'` | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\)\..*$/\1/'`
if [ ! "${version}" ]; then if [ ! "${version}" ]; then
...@@ -64,7 +64,7 @@ if [ ! "${version}" ]; then ...@@ -64,7 +64,7 @@ if [ ! "${version}" ]; then
exit 1 exit 1
fi fi
# Make sure the subdirectory is available. ### Make sure the subdirectory is available.
tempparent="make-dist.tmp.$$" tempparent="make-dist.tmp.$$"
if [ -d ${tempparent} ]; then if [ -d ${tempparent} ]; then
echo "${progname}: staging directory \`${tempparent}' already exists. echo "${progname}: staging directory \`${tempparent}' already exists.
...@@ -80,8 +80,8 @@ mkdir ${tempparent} ...@@ -80,8 +80,8 @@ mkdir ${tempparent}
emacsname="emacs-${version}${new_extension}" emacsname="emacs-${version}${new_extension}"
tempdir="${tempparent}/${emacsname}" tempdir="${tempparent}/${emacsname}"
# This trap ensures that the staging directory will be cleaned up even ### This trap ensures that the staging directory will be cleaned up even
# when the script is interrupted in mid-career. ### when the script is interrupted in mid-career.
if [ "${clean_up}" = yes ]; then if [ "${clean_up}" = yes ]; then
trap "echo 'Interrupted...cleaning up the staging directory.'; rm -rf ${tempparent}; exit 1" 1 2 15 trap "echo 'Interrupted...cleaning up the staging directory.'; rm -rf ${tempparent}; exit 1" 1 2 15
fi fi
...@@ -89,14 +89,22 @@ fi ...@@ -89,14 +89,22 @@ fi
echo "Creating top directory: \`${tempdir}'" echo "Creating top directory: \`${tempdir}'"
mkdir ${tempdir} mkdir ${tempdir}
# We copy in the top-level files before creating the subdirectories in echo
# hopes that this will make the top-level files appear first in the
# tar file; this means that people can start reading the INSTALL and echo "Don't worry if `ln' complains that it can't make
# README while the rest of the tar file is still unpacking. Whoopee. echo "cross-filesystem links for these files; we take care of them
echo "later.
### We copy in the top-level files before creating the subdirectories in
### hopes that this will make the top-level files appear first in the
### 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." 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 move-if-change ${tempdir}
ln ChangeLog Makefile.in build-install.in configure config.sub ${tempdir} ln ChangeLog Makefile.in build-install.in configure ${tempdir}
ln make-dist ${tempdir} ln make-dist ${tempdir}
### Copy config.sub; it's a cross-filesystem symlink.
cp config.sub ${tempdir}
echo "Creating subdirectories." echo "Creating subdirectories."
for subdir in lisp lisp/term local-lisp external-lisp \ for subdir in lisp lisp/term local-lisp external-lisp \
...@@ -106,12 +114,12 @@ for subdir in lisp lisp/term local-lisp external-lisp \ ...@@ -106,12 +114,12 @@ for subdir in lisp lisp/term local-lisp external-lisp \
done done
echo "Making links to \`lisp'." echo "Making links to \`lisp'."
# Don't distribute =*.el files, site-init.el, site-load.el, or default.el. ### Don't distribute =*.el files, site-init.el, site-load.el, or default.el.
(cd lisp (cd lisp
ln [a-zA-Z]*.el ../${tempdir}/lisp ln [a-zA-Z]*.el ../${tempdir}/lisp
ln [a-zA-Z]*.elc ../${tempdir}/lisp ln [a-zA-Z]*.elc ../${tempdir}/lisp
# simula.el doesn't keep abbreviations in simula.defns any more. ## simula.el doesn't keep abbreviations in simula.defns any more.
# ln [a-zA-Z]*.defns ../${tempdir}/lisp ## ln [a-zA-Z]*.defns ../${tempdir}/lisp
ln ChangeLog README ../${tempdir}/lisp ln ChangeLog README ../${tempdir}/lisp
cd ../${tempdir}/lisp cd ../${tempdir}/lisp
rm -f site-init site-init.el site-init.elc rm -f site-init site-init.el site-init.elc
...@@ -119,24 +127,27 @@ echo "Making links to \`lisp'." ...@@ -119,24 +127,27 @@ echo "Making links to \`lisp'."
rm -f default default.el default.elc) rm -f default default.el default.elc)
echo "Making links to \`lisp/term'." echo "Making links to \`lisp/term'."
# Don't distribute =*.el files. ### Don't distribute =*.el files.
(cd lisp/term (cd lisp/term
ln [a-zA-Z]*.el ../../${tempdir}/lisp/term ln [a-zA-Z]*.el ../../${tempdir}/lisp/term
ln [a-zA-Z]*.elc ../../${tempdir}/lisp/term ln [a-zA-Z]*.elc ../../${tempdir}/lisp/term
ln README ../../${tempdir}/lisp/term) ln README ../../${tempdir}/lisp/term)
echo "Making links to \`external-lisp'." echo "Making links to \`external-lisp'."
# Don't distribute =*.el files. ### Don't distribute =*.el files.
(cd external-lisp (cd external-lisp
ln [a-zA-Z]*.el ../${tempdir}/external-lisp ln [a-zA-Z]*.el ../${tempdir}/external-lisp
ln [a-zA-Z]*.elc ../${tempdir}/external-lisp ln [a-zA-Z]*.elc ../${tempdir}/external-lisp
ln ChangeLog README ../${tempdir}/external-lisp) ln ChangeLog README ../${tempdir}/external-lisp)
echo "Making links to \`src'." echo "Making links to \`src'."
# Don't distribute =*.[ch] files, or the configured versions of ### Don't distribute =*.[ch] files, or the configured versions of
# config.h.in, paths.h.in, or Makefile.in. ### config.h.in, paths.h.in, or Makefile.in.
(cd src (cd src
echo " (If we can't link gmalloc.c, that's okay.)"
ln [a-zA-Z]*.c ../${tempdir}/src ln [a-zA-Z]*.c ../${tempdir}/src
## Might be a symlink to a file on another filesystem.
cp gmalloc.c ../${tempdir}/src
ln [a-zA-Z]*.h ../${tempdir}/src ln [a-zA-Z]*.h ../${tempdir}/src
ln [a-zA-Z]*.s ../${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 ymakefile ChangeLog config.h.in paths.h.in \
...@@ -171,35 +182,35 @@ echo "Making links to \`oldXMenu'." ...@@ -171,35 +182,35 @@ echo "Making links to \`oldXMenu'."
ln README Makefile Imakefile ChangeLog ../${tempdir}/oldXMenu) ln README Makefile Imakefile ChangeLog ../${tempdir}/oldXMenu)
echo "Making links to \`etc'." echo "Making links to \`etc'."
# Don't distribute DOC files, backups, autosaves, or tex litter. ### Don't distribute DOC files, backups, autosaves, or tex litter.
(cd etc (cd etc
ln [0-9a-zA-Z]* ../${tempdir}/etc ln [0-9a-zA-Z]* ../${tempdir}/etc
cd ../${tempdir}/etc cd ../${tempdir}/etc
# Avoid an error when expanding the wildcards later. ## Avoid an error when expanding the wildcards later.
for dummy in DOC-dummy dummy~ \#dummy\# dummy.dvi dummy.log; do for dummy in DOC-dummy dummy~ \#dummy\# dummy.dvi dummy.log; do
ln MACHINES ${dummy} ln MACHINES ${dummy}
done done
rm -f DOC* *~ \#*\# *.dvi *.log core) rm -f DOC* *~ \#*\# *.dvi *.log core)
# For now, we comment these out, since I'm not changing them any. ### For now, we comment these out, since I'm not changing them any.
#!! echo "Making links to \`cpp'." ###!! echo "Making links to \`cpp'."
#!! (cd cpp ###!! (cd cpp
#!! ln cccp.c cexp.y Makefile README ../${tempdir}/cpp) ###!! ln cccp.c cexp.y Makefile README ../${tempdir}/cpp)
#!! ###!!
#!! echo "Making links to \`info'." ###!! echo "Making links to \`info'."
#!! # Don't distribute backups or autosaves. ###!! # Don't distribute backups or autosaves.
#!! (cd info ###!! (cd info
#!! ln [a-zA-Z]* ../${tempdir}/info ###!! ln [a-zA-Z]* ../${tempdir}/info
#!! cd ../${tempdir}/info ###!! cd ../${tempdir}/info
#!! # Avoid an error when expanding the wildcards later. ###!! # Avoid an error when expanding the wildcards later.
#!! ln emacs dummy~ ; ln emacs \#dummy\# ###!! ln emacs dummy~ ; ln emacs \#dummy\#
#!! rm -f *~ \#*\# core) ###!! rm -f *~ \#*\# core)
#!! ###!!
#!! echo "Making links to \`man'." ###!! echo "Making links to \`man'."
#!! (cd man ###!! (cd man
#!! ln *.tex *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man ###!! ln *.tex *.texinfo *.texi *.aux *.cps *.fns *.kys *.vrs ../${tempdir}/man
#!! ln *.c ../${tempdir}/man ###!! ln *.c ../${tempdir}/man
#!! ln ChangeLog Makefile README split-man ../${tempdir}/man) ###!! ln ChangeLog Makefile README split-man ../${tempdir}/man)
echo "Making links to \`shortnames'." echo "Making links to \`shortnames'."
(cd shortnames (cd shortnames
...@@ -212,21 +223,6 @@ echo "Making links to \`vms'." ...@@ -212,21 +223,6 @@ echo "Making links to \`vms'."
cd ../${tempdir}/vms cd ../${tempdir}/vms
rm -f *~) rm -f *~)
### On the GNU machines, these files are symbolic links to files on
### another device, meaning that we can't make hard links to them in
### the staging directory. I can't think of a better solution, so I
### just have a special kludge here which knows exactly which files
### this might happen to and copies them if they don't seem to have
### been linked.
echo "Making sure we got all the files that may be cross-device"
echo "symbolic links."
for file in ./config.sub ./src/gmalloc.c ; do
if [ ! -f ${tempdir}/${file} ] ; then
echo " \`${file}' was missed; copying it."
cp ${file} ${tempdir}/${file}
fi
done
echo "Making sure copying notices are all symlinks to \`etc/COPYING'." echo "Making sure copying notices are all symlinks to \`etc/COPYING'."
rm -f ${tempdir}/etc/COPYING rm -f ${tempdir}/etc/COPYING
cp etc/COPYING ${tempdir}/etc/COPYING cp etc/COPYING ${tempdir}/etc/COPYING
...@@ -239,9 +235,9 @@ done ...@@ -239,9 +235,9 @@ done
if [ "${newer}" ]; then if [ "${newer}" ]; then
echo "Removing files older than $newer." echo "Removing files older than $newer."
# We remove .elc files unconditionally, on the theory that anyone picking ## We remove .elc files unconditionally, on the theory that anyone picking
# up an incremental distribution already has a running Emacs to byte-compile ## up an incremental distribution already has a running Emacs to byte-compile
# them with. ## them with.
find ${tempparent} \( -name '*.elc' -o ! -newer ${newer} \) -exec rm -f {} \; find ${tempparent} \( -name '*.elc' -o ! -newer ${newer} \) -exec rm -f {} \;
fi fi
...@@ -255,4 +251,4 @@ if [ "${clean_up}" = yes ]; then ...@@ -255,4 +251,4 @@ if [ "${clean_up}" = yes ]; then
rm -rf ${tempparent} rm -rf ${tempparent}
fi fi
# make-dist ends here ### make-dist ends here
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment