Commit b9f56298 authored by Glenn Morris's avatar Glenn Morris
Browse files

More make-dist simplification.

* make-dist: Remove --compress.  Check for the appropriate
gzip-like executable, and if not found, don't compress.
Check version number in README, don't change it.
Use find for nt/inc/*.h.
parent 7417851c
2010-10-13 Glenn Morris <rgm@gnu.org>
* make-dist: Remove --compress. Check for the appropriate
gzip-like executable, and if not found, don't compress.
Check version number in README, don't change it.
Use find for nt/inc/*.h.
2010-10-12 Dan Nicolaescu <dann@ics.uci.edu> 2010-10-12 Dan Nicolaescu <dann@ics.uci.edu>
* configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove
......
...@@ -49,6 +49,7 @@ update=yes ...@@ -49,6 +49,7 @@ update=yes
check=yes check=yes
clean_up=no clean_up=no
make_tar=no make_tar=no
default_gzip=gzip
newer="" newer=""
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
...@@ -78,12 +79,7 @@ while [ $# -gt 0 ]; do ...@@ -78,12 +79,7 @@ while [ $# -gt 0 ]; do
new_extension=".new" new_extension=".new"
shift shift
;; ;;
## This option tells make-dist to use `compress' instead of gzip. ## This option tells make-dist to use `bzip2' instead of gzip.
## Normally, make-dist uses gzip whenever it is present.
"--compress")
default_gzip="compress"
;;
## Same with bzip2.
"--bzip2") "--bzip2")
default_gzip="bzip2" default_gzip="bzip2"
;; ;;
...@@ -104,7 +100,6 @@ while [ $# -gt 0 ]; do ...@@ -104,7 +100,6 @@ while [ $# -gt 0 ]; do
echo "" echo ""
echo " --bzip2 use bzip2 instead of gzip" echo " --bzip2 use bzip2 instead of gzip"
echo " --clean-up delete staging directories when done" echo " --clean-up delete staging directories when done"
echo " --compress use compress instead of gzip"
echo " --lzma use lzma instead of gzip" echo " --lzma use lzma instead of gzip"
echo " --newer=TIME don't include files older than TIME" echo " --newer=TIME don't include files older than TIME"
echo " --no-check don't check for bad file names etc." echo " --no-check don't check for bad file names etc."
...@@ -161,12 +156,11 @@ fi ...@@ -161,12 +156,11 @@ fi
echo Version number is $version echo Version number is $version
if [ $update = yes ]; if [ $update = yes ]; then
then if ! grep -q "@set EMACSVER *${version}" doc/emacs/emacsver.texi || \
if grep -s "@set EMACSVER *${version}" ./doc/emacs/emacsver.texi > /dev/null; then ! grep -q "tree holds version *${version}" README; then
true echo "WARNING: README and/or emacsver.texi have the wrong version number"
else echo "Consider running M-x set-version from admin/admin.el"
echo "You must update the version number in \`./doc/emacs/emacsver.texi'"
sleep 5 sleep 5
fi fi
fi fi
...@@ -312,17 +306,6 @@ ln ChangeLog Makefile.in configure configure.in ${tempdir} ...@@ -312,17 +306,6 @@ ln ChangeLog Makefile.in configure configure.in ${tempdir}
ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir} ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
ln mkinstalldirs config.sub config.guess install-sh ${tempdir} ln mkinstalldirs config.sub config.guess install-sh ${tempdir}
## FIXME why do we bother doing this? set-version in admin/admin.el
## does this, and more besides.
echo "Updating version number in README"
(cd ${tempdir}
awk \
'$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 -f tmp.README README)
echo "Creating subdirectories" echo "Creating subdirectories"
for subdir in site-lisp \ for subdir in site-lisp \
leim leim/CXTERM-DIC leim/MISC-DIC \ leim leim/CXTERM-DIC leim/MISC-DIC \
...@@ -417,28 +400,18 @@ echo "Making links to \`m4'" ...@@ -417,28 +400,18 @@ echo "Making links to \`m4'"
(cd m4 (cd m4
ln *.m4 ../${tempdir}/m4) ln *.m4 ../${tempdir}/m4)
## Exclude README.W32 because it is specific to pre-built binaries(?).
echo "Making links to \`nt'" echo "Making links to \`nt'"
(cd nt (cd nt
ln emacs.manifest emacs.rc emacsclient.rc config.nt ../${tempdir}/nt ln emacs.manifest emacs.rc emacsclient.rc config.nt ../${tempdir}/nt
ln emacs-src.tags nmake.defs gmake.defs subdirs.el ../${tempdir}/nt ln emacs-src.tags nmake.defs gmake.defs subdirs.el ../${tempdir}/nt
ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt
ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt)
echo "Making links to \`nt/inc'" echo "Making links to \`nt/inc' and its subdirectories"
(cd nt/inc for f in `find nt/inc -type f -name '[a-z]*.h'`; do
ln [a-z]*.h ../../${tempdir}/nt/inc) ln $f $tempdir/$f
done
echo "Making links to \`nt/inc/sys'"
(cd nt/inc/sys
ln [a-z]*.h ../../../${tempdir}/nt/inc/sys)
echo "Making links to \`nt/inc/arpa'"
(cd nt/inc/arpa
ln [a-z]*.h ../../../${tempdir}/nt/inc/arpa)
echo "Making links to \`nt/inc/netinet'"
(cd nt/inc/netinet
ln [a-z]*.h ../../../${tempdir}/nt/inc/netinet)
echo "Making links to \`nt/icons'" echo "Making links to \`nt/icons'"
(cd nt/icons (cd nt/icons
...@@ -493,8 +466,7 @@ for f in `find etc -type f`; do ...@@ -493,8 +466,7 @@ for f in `find etc -type f`; do
done done
echo "Making links to \`info'" echo "Making links to \`info'"
(cd info ln `find info -type f -print` ${tempdir}/info
ln `find . -type f -print` ../${tempdir}/info)
echo "Making links to \`doc/emacs'" echo "Making links to \`doc/emacs'"
(cd doc/emacs (cd doc/emacs
...@@ -542,24 +514,23 @@ echo "Removing unwanted files" ...@@ -542,24 +514,23 @@ echo "Removing unwanted files"
find ${tempparent} \( -name '*~' -o -name '#*#' -o -name '.*ignore' -o -name '=*' -o -name 'TAGS' \) -exec rm -f {} \; find ${tempparent} \( -name '*~' -o -name '#*#' -o -name '.*ignore' -o -name '=*' -o -name 'TAGS' \) -exec rm -f {} \;
if [ "${make_tar}" = yes ]; then if [ "${make_tar}" = yes ]; then
if [ "${default_gzip}" = "" ]; then echo "Looking for $default_gzip"
echo "Looking for gzip" found=0
temppath=`echo $PATH | sed 's/^:/.:/ temppath=`echo $PATH | sed -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \
s/::/:.:/g -e 's/:/ /g'`
s/:$/:./ for dir in ${temppath}; do
s/:/ /g'` [ -x ${dir}/$default_gzip ] || continue
default_gzip=`( found=1; break
for dir in ${temppath}; do done
if [ -f ${dir}/gzip ]; then echo 'gzip --best'; exit 0; fi if [ "$found" = "0" ]; then
done echo "WARNING: \`$default_gzip' not found, will not compress" >&2
echo compress default_gzip=cat
)`
fi fi
case "${default_gzip}" in case "${default_gzip}" in
bzip2) gzip_extension=.bz2 ;; bzip2) gzip_extension=.bz2 ;;
compress* ) gzip_extension=.Z ;; lzma) gzip_extension=.lzma ;;
lzma) gzip_extension=.lzma ;; gzip) gzip_extension=.gz ; default_gzip="gzip --best";;
* ) gzip_extension=.gz ;; *) gzip_extension= ;;
esac esac
echo "Creating tar file" echo "Creating tar file"
(cd ${tempparent} ; tar cvf - ${emacsname} ) \ (cd ${tempparent} ; tar cvf - ${emacsname} ) \
......
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