From b9f56298c1a62b98950087ff2b130caaaaa92216 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 12 Oct 2010 20:08:45 -0700 Subject: [PATCH] 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. --- ChangeLog | 7 +++++ make-dist | 87 +++++++++++++++++++------------------------------------ 2 files changed, 36 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76efd27416..3d1737619a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-10-13 Glenn Morris + + * 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 * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove diff --git a/make-dist b/make-dist index 2a51b91241..bee15a12a9 100755 --- a/make-dist +++ b/make-dist @@ -49,6 +49,7 @@ update=yes check=yes clean_up=no make_tar=no +default_gzip=gzip newer="" while [ $# -gt 0 ]; do @@ -78,12 +79,7 @@ while [ $# -gt 0 ]; do new_extension=".new" shift ;; - ## This option tells make-dist to use `compress' instead of gzip. - ## Normally, make-dist uses gzip whenever it is present. - "--compress") - default_gzip="compress" - ;; - ## Same with bzip2. + ## This option tells make-dist to use `bzip2' instead of gzip. "--bzip2") default_gzip="bzip2" ;; @@ -104,7 +100,6 @@ while [ $# -gt 0 ]; do echo "" echo " --bzip2 use bzip2 instead of gzip" echo " --clean-up delete staging directories when done" - echo " --compress use compress instead of gzip" echo " --lzma use lzma instead of gzip" echo " --newer=TIME don't include files older than TIME" echo " --no-check don't check for bad file names etc." @@ -161,12 +156,11 @@ fi echo Version number is $version -if [ $update = yes ]; -then - if grep -s "@set EMACSVER *${version}" ./doc/emacs/emacsver.texi > /dev/null; then - true - else - echo "You must update the version number in \`./doc/emacs/emacsver.texi'" +if [ $update = yes ]; then + if ! grep -q "@set EMACSVER *${version}" doc/emacs/emacsver.texi || \ + ! grep -q "tree holds version *${version}" README; then + echo "WARNING: README and/or emacsver.texi have the wrong version number" + echo "Consider running M-x set-version from admin/admin.el" sleep 5 fi fi @@ -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 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" for subdir in site-lisp \ leim leim/CXTERM-DIC leim/MISC-DIC \ @@ -417,28 +400,18 @@ echo "Making links to \`m4'" (cd m4 ln *.m4 ../${tempdir}/m4) +## Exclude README.W32 because it is specific to pre-built binaries(?). echo "Making links to \`nt'" (cd 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 [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'" -(cd nt/inc - ln [a-z]*.h ../../${tempdir}/nt/inc) - -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/inc' and its subdirectories" +for f in `find nt/inc -type f -name '[a-z]*.h'`; do + ln $f $tempdir/$f +done echo "Making links to \`nt/icons'" (cd nt/icons @@ -493,8 +466,7 @@ for f in `find etc -type f`; do done echo "Making links to \`info'" -(cd info - ln `find . -type f -print` ../${tempdir}/info) +ln `find info -type f -print` ${tempdir}/info echo "Making links to \`doc/emacs'" (cd doc/emacs @@ -542,24 +514,23 @@ echo "Removing unwanted files" find ${tempparent} \( -name '*~' -o -name '#*#' -o -name '.*ignore' -o -name '=*' -o -name 'TAGS' \) -exec rm -f {} \; if [ "${make_tar}" = yes ]; then - if [ "${default_gzip}" = "" ]; then - echo "Looking for gzip" - temppath=`echo $PATH | sed 's/^:/.:/ - s/::/:.:/g - s/:$/:./ - s/:/ /g'` - default_gzip=`( - for dir in ${temppath}; do - if [ -f ${dir}/gzip ]; then echo 'gzip --best'; exit 0; fi - done - echo compress - )` + echo "Looking for $default_gzip" + found=0 + temppath=`echo $PATH | sed -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \ + -e 's/:/ /g'` + for dir in ${temppath}; do + [ -x ${dir}/$default_gzip ] || continue + found=1; break + done + if [ "$found" = "0" ]; then + echo "WARNING: \`$default_gzip' not found, will not compress" >&2 + default_gzip=cat fi case "${default_gzip}" in - bzip2) gzip_extension=.bz2 ;; - compress* ) gzip_extension=.Z ;; - lzma) gzip_extension=.lzma ;; - * ) gzip_extension=.gz ;; + bzip2) gzip_extension=.bz2 ;; + lzma) gzip_extension=.lzma ;; + gzip) gzip_extension=.gz ; default_gzip="gzip --best";; + *) gzip_extension= ;; esac echo "Creating tar file" (cd ${tempparent} ; tar cvf - ${emacsname} ) \ -- 2.39.2