X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/da6a8debb270a2e602f3b789ec3e27e815041164..51721edc6ba92f9c7cb6a2daab45bb538a696f3d:/make-dist diff --git a/make-dist b/make-dist index be34e33e8c..fba490547e 100755 --- a/make-dist +++ b/make-dist @@ -1,7 +1,7 @@ #!/bin/sh ### make-dist: create an Emacs distribution tar file from current srcdir -## Copyright (C) 1995, 1997-1998, 2000-2013 Free Software Foundation, Inc. +## Copyright (C) 1995, 1997-1998, 2000-2014 Free Software Foundation, Inc. ## This file is part of GNU Emacs. @@ -159,7 +159,7 @@ fi ### Find out which version of Emacs this is. version=` - sed -n 's/^AC_INIT(emacs,[ ]*\([^ )]*\).*/\1/p' &2 @@ -201,13 +201,11 @@ fi if [ $check = yes ]; then ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \ - leim/[a-z]*/[a-z]*.el > /tmp/el + lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el > /tmp/el ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \ lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \ - lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \ - leim/[a-z]*/[a-z]*.elc > /tmp/elc + lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc > /tmp/elc ## Check for .elc files with no corresponding .el file. sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc @@ -253,7 +251,7 @@ if [ $update = yes ]; then echo timestamp > src/stamp-h.in echo "Updating Info files" - make info-real + make info echo "Updating finder, custom and autoload data" (cd lisp && make updates EMACS="$EMACS") @@ -262,7 +260,7 @@ if [ $update = yes ]; then (cd leim && make leim-list.el EMACS="$EMACS") echo "Recompiling Lisp files" - $EMACS -batch -f batch-byte-recompile-directory lisp leim + $EMACS -batch -f batch-byte-recompile-directory lisp fi # $update = yes echo "Creating staging directory: \`${tempparent}'" @@ -291,8 +289,7 @@ ln aclocal.m4 ${tempdir} echo "Creating subdirectories" for subdir in site-lisp \ - leim leim/CXTERM-DIC leim/MISC-DIC \ - leim/SKK-DIC leim/ja-dic leim/quail \ + leim leim/CXTERM-DIC leim/MISC-DIC leim/SKK-DIC \ build-aux build-aux/snippet \ src src/bitmaps lib lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ @@ -326,7 +323,7 @@ files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \ -o -name 'README' \)` ### Don't distribute site-init.el, site-load.el, or default.el. -for file in lisp/Makefile.in $files; do +for file in lisp/Makefile.in lisp/makefile.w32-in $files; do case $file in */site-init*|*/site-load*|*/default*) continue ;; esac @@ -335,25 +332,21 @@ done echo "Making links to \`leim' and its subdirectories" (cd leim + ln makefile.w32-in ../${tempdir}/leim ln ChangeLog README ../${tempdir}/leim ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC ln MISC-DIC/README MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC - ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic ln Makefile.in ../${tempdir}/leim/Makefile.in - ln leim-ext.el ../${tempdir}/leim/leim-ext.el - ## Lisp files that start with a capital (also 4Corner.el) are - ## generated from TIT dictionaries so we don't distribute them. - ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail - rm -f ../${tempdir}/leim/quail/quick-b5.* - rm -f ../${tempdir}/leim/quail/quick-cns.* - rm -f ../${tempdir}/leim/quail/tsang-b5.* - rm -f ../${tempdir}/leim/quail/tsang-cns.*) + ln leim-ext.el ../${tempdir}/leim/leim-ext.el) +## FIXME Can we not just use the "find -type f" method for this one? echo "Making links to \`build-aux'" (cd build-aux - ln compile config.guess config.sub depcomp ../${tempdir}/build-aux - ln install-sh missing move-if-change update-subdirs ../${tempdir}/build-aux) + ln compile config.guess config.sub depcomp msys-to-w32 ../${tempdir}/build-aux + ln install-sh missing move-if-change ../${tempdir}/build-aux + ln update-copyright update-subdirs ../${tempdir}/build-aux + ln dir_top make-info-dir ../${tempdir}/build-aux) echo "Making links to \`build-aux/snippet'" (cd build-aux/snippet @@ -368,6 +361,7 @@ echo "Making links to \`src'" ln [a-zA-Z]*.in ../${tempdir}/src ln [a-zA-Z]*.mk ../${tempdir}/src ln README ChangeLog ChangeLog.*[0-9] ../${tempdir}/src + ln makefile.w32-in ../${tempdir}/src ln .gdbinit .dbxinit ../${tempdir}/src cd ../${tempdir}/src rm -f globals.h config.h epaths.h Makefile buildobj.h) @@ -380,7 +374,7 @@ echo "Making links to \`lib'" (snippet_h=`(cd build-aux/snippet && ls *.h)` cd lib ln [a-zA-Z]*.[ch] ../${tempdir}/lib - ln gnulib.mk Makefile.am Makefile.in ../${tempdir}/lib + ln gnulib.mk Makefile.am Makefile.in makefile.w32-in ../${tempdir}/lib cd ../${tempdir}/lib script='/[*]/d; s/\.in\.h$/.h/' rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`) @@ -388,8 +382,10 @@ echo "Making links to \`lib'" echo "Making links to \`lib-src'" (cd lib-src ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src - ln ChangeLog Makefile.in README testfile ../${tempdir}/lib-src - ln grep-changelog rcs2log ../${tempdir}/lib-src) + ln ChangeLog Makefile.in README ../${tempdir}/lib-src + ln grep-changelog rcs2log ../${tempdir}/lib-src + ln makefile.w32-in ../${tempdir}/lib-src + ln update-game-score.exe.manifest ../${tempdir}/lib-src) echo "Making links to \`m4'" (cd m4 @@ -398,12 +394,11 @@ echo "Making links to \`m4'" echo "Making links to \`nt'" (cd nt ln emacs-x86.manifest emacs-x64.manifest emacs.rc ../${tempdir}/nt - ln emacsclient.rc emacs-src.tags ../${tempdir}/nt + ln config.nt emacsclient.rc emacs-src.tags ../${tempdir}/nt ln nmake.defs gmake.defs subdirs.el [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt - rm -f ../${tempdir}/nt/configure.bat ln Makefile.in gnulib.mk ../${tempdir}/nt - ln msysconfig.sh mingw-cfg.site epaths.nt ../${tempdir}/nt - ln ChangeLog INSTALL README README.W32 ../${tempdir}/nt) + ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt + ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) echo "Making links to \`nt/inc' and its subdirectories" for f in `find nt/inc -type f -name '[a-z]*.h'`; do @@ -443,18 +438,20 @@ echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" echo "Making links to \`oldXMenu'" (cd oldXMenu - ln *.[ch] *.in ../${tempdir}/oldXMenu + ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu ln README ChangeLog ../${tempdir}/oldXMenu) echo "Making links to \`lwlib'" (cd lwlib - ln *.[ch] *.in ../${tempdir}/lwlib + ln *.[ch] *.in *.mk ../${tempdir}/lwlib ln README ChangeLog ../${tempdir}/lwlib) +## It is important to distribute admin/ because it contains sources +## for generated lisp/international/uni-*.el files. echo "Making links to \`admin' and its subdirectories" for f in `find admin -type f`; do case $f in - admin/unidata/Makefile|admin/unidata/makefile.w32-in) continue ;; + */Makefile) [ -f $f.in ] && continue ;; esac ln $f $tempdir/$f done @@ -463,6 +460,7 @@ if [ "$with_tests" = "yes" ]; then echo "Making links to \`test' and its subdirectories" for f in `find test -type f`; do case $f in + test/automated/*.log) continue ;; test/automated/flymake/warnpred/a.out) continue ;; test/automated/Makefile) continue ;; esac @@ -486,21 +484,21 @@ ln `find info -type f -print` ${tempdir}/info echo "Making links to \`doc/emacs'" (cd doc/emacs - ln *.texi *.in ChangeLog* ../../${tempdir}/doc/emacs) + ln *.texi *.in makefile.w32-in ChangeLog* ../../${tempdir}/doc/emacs) echo "Making links to \`doc/misc'" (cd doc/misc - ln *.texi *.tex *.in gnus-news.el ChangeLog* ../../${tempdir}/doc/misc) + ln *.texi *.tex *.in makefile.w32-in gnus-news.el ChangeLog* ../../${tempdir}/doc/misc) echo "Making links to \`doc/lispref'" (cd doc/lispref - ln *.texi *.in README ChangeLog* ../../${tempdir}/doc/lispref + ln *.texi *.in makefile.w32-in README ChangeLog* ../../${tempdir}/doc/lispref ln spellfile ../../${tempdir}/doc/lispref ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref) echo "Making links to \`doc/lispintro'" (cd doc/lispintro - ln *.texi *.in *.eps *.pdf ../../${tempdir}/doc/lispintro + ln *.texi *.in makefile.w32-in *.eps *.pdf ../../${tempdir}/doc/lispintro ln README ChangeLog* ../../${tempdir}/doc/lispintro cd ../../${tempdir}/doc/lispintro) @@ -512,7 +510,7 @@ echo "Making links to \`doc/man'" ### It would be nice if they could all be symlinks to top-level copy, but ### you're not supposed to have any symlinks in distribution tar files. echo "Making sure copying notices are all copies of \`COPYING'" -for subdir in . etc info leim lib lib-src lisp lwlib msdos nt src; do +for subdir in . etc leim lib lib-src lisp lwlib msdos nt src; do rm -f ${tempdir}/${subdir}/COPYING cp COPYING ${tempdir}/${subdir} done