3 files changed, 161 insertions, 149 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index ac21c3aeabc..dbc48dfa696 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-15  Jason Rumney  <jasonr@gnu.org>
+
+        * nt/makedist.bat: Do not rely on non-standard behaviour of
+        tar --exclude.
+
 2004-11-02  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * FOR-RELEASE (Indications): Remove two stage update for toolbar (Done).
@@ -31,7 +36,7 @@
 
         * FOR-RELEASE: Remove entry about GTK and monochrome displays (done).
 
-2002-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
+2004-06-26  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * FOR-RELEASE: Moved here from the etc directory.
 
@@ -44,6 +49,10 @@
         * quick-install-emacs: Don't use "function" keyword when defining
         shell functions.
 
+2003-09-29  Lute Kamstra  <lute@gnu.org>
+
+        * make-tarball.txt: Mention regenerating Emacs' AUTHORS file.
+
 2003-09-27  Miles Bader  <miles@gnu.ai.mit.edu>
 
         * quick-install-emacs: Remove fns-* pruning, since that file no
@@ -193,7 +202,7 @@
         version of tar used.
 
 ;; Local Variables:
-;; coding: iso-2022-7bit-unix
+;; coding: iso-2022-7bit
 ;; End:
 
     Copyright (C) 2001 Free Software Foundation, Inc.
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 55505c1ae6b..b4750dbc22d 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -218,40 +218,40 @@ man/anti.texi
 man/basic.texi      "Luc Teirlinck"  Chong Yidong
 man/buffers.texi    "Luc Teirlinck"  Chong Yidong
 man/building.texi   "Ted Zlatanov" <tzz@lifelogs.com>
-man/calendar.texi    Joakim Verona <joakim@verona.se>
+man/calendar.texi   joakim@verona.se
 man/cmdargs.texi    Chong Yidong
 man/commands.texi   "Luc Teirlinck"
 man/custom.texi     Chong Yidong
-man/dired.texi
-man/display.texi    "Luc Teirlinck"
+man/dired.texi      Chong Yidong     joakim@verona.se 
+man/display.texi    "Luc Teirlinck"  Chong Yidong
 man/emacs.texi      "Luc Teirlinck"
 man/entering.texi   "Luc Teirlinck"  Chong Yidong
 man/files.texi      "Luc Teirlinck"  Chong Yidong
 man/fixit.texi      "Luc Teirlinck"
 man/frames.texi     "Luc Teirlinck"  Chong Yidong
 man/glossary.texi
-man/help.texi       "Luc Teirlinck"
-man/indent.texi     "Luc Teirlinck"
+man/help.texi       "Luc Teirlinck"  Chong Yidong
+man/indent.texi     "Luc Teirlinck"  Chong Yidong
 man/killing.texi    "Luc Teirlinck"  Chong Yidong
-man/kmacro.texi     "Luc Teirlinck"
+man/kmacro.texi     "Luc Teirlinck"  Chong Yidong
 man/macos.texi
 man/maintaining.texi
-man/major.texi      "Luc Teirlinck"
+man/major.texi      "Luc Teirlinck"  Chong Yidong
 man/mark.texi       "Luc Teirlinck"
 man/mini.texi       "Luc Teirlinck"
 man/misc.texi
-man/msdog.texi
+man/msdog.texi      Chong Yidong
 man/mule.texi       "Luc Teirlinck"
 man/m-x.texi        "Luc Teirlinck"
 man/picture.texi    Joakim Verona <joakim@verona.se>
-man/programs.texi   "Stephen Eglen"
+man/programs.texi   "Stephen Eglen"  Chong Yidong
 man/regs.texi       "Luc Teirlinck"   Chong Yidong
 man/rmail.texi
 man/screen.texi     "Luc Teirlinck"
 man/search.texi     "Luc Teirlinck"
 man/sending.texi
 man/text.texi       "Luc Teirlinck"   Chong Yidong
-man/trouble.texi
+man/trouble.texi    Chong Yidong
 man/windows.texi    "Luc Teirlinck"   Chong Yidong
 man/xresources.texi
 
@@ -271,47 +271,47 @@ lispref/backups.texi     "Luc Teirlinck"
 lispref/buffers.texi     "Luc Teirlinck"   Chong Yidong
 lispref/calendar.texi    Joakim Verona <joakim@verona.se>
 lispref/commands.texi    "Luc Teirlinck"
-lispref/compile.texi     "Luc Teirlinck"
-lispref/control.texi     "Luc Teirlinck"
+lispref/compile.texi     "Luc Teirlinck"   Chong Yidong
+lispref/control.texi     "Luc Teirlinck"   Chong Yidong
 lispref/customize.texi
 lispref/debugging.texi   Joakim Verona <joakim@verona.se>
 lispref/display.texi
 lispref/edebug.texi
 lispref/elisp.texi       "Luc Teirlinck"
 lispref/errors.texi      "Luc Teirlinck"
-lispref/eval.texi        "Luc Teirlinck"
+lispref/eval.texi        "Luc Teirlinck"   Chong Yidong
 lispref/files.texi       "Luc Teirlinck"   Chong Yidong
 lispref/frames.texi      "Luc Teirlinck"   Chong Yidong
-lispref/functions.texi   "Luc Teirlinck"
-lispref/hash.texi        "Luc Teirlinck"
+lispref/functions.texi   "Luc Teirlinck"   Chong Yidong
+lispref/hash.texi        "Luc Teirlinck"   Chong Yidong
 lispref/help.texi        "Luc Teirlinck"
 lispref/hooks.texi
 lispref/internals.texi   "Luc Teirlinck"
 lispref/intro.texi       "Luc Teirlinck"
 lispref/keymaps.texi     "Luc Teirlinck"
-lispref/lists.texi       "Luc Teirlinck"
-lispref/loading.texi     "Luc Teirlinck"
+lispref/lists.texi       "Luc Teirlinck"   Chong Yidong
+lispref/loading.texi     "Luc Teirlinck"   Chong Yidong
 lispref/locals.texi
 lispref/macros.texi      "Luc Teirlinck"
 lispref/maps.texi
 lispref/markers.texi     "Luc Teirlinck"
-lispref/minibuf.texi     "Luc Teirlinck"
+lispref/minibuf.texi     "Luc Teirlinck"   Chong Yidong
 lispref/modes.texi       Chong Yidong
 lispref/nonascii.texi    "Luc Teirlinck"
-lispref/numbers.texi     "Luc Teirlinck"
-lispref/objects.texi     "Luc Teirlinck"
+lispref/numbers.texi     "Luc Teirlinck"   Chong Yidong
+lispref/objects.texi     "Luc Teirlinck"   Chong Yidong
 lispref/os.texi          "Luc Teirlinck"
 lispref/positions.texi   "Luc Teirlinck"   Chong Yidong
 lispref/processes.texi
 lispref/searching.texi   "Luc Teirlinck"
 lispref/sequences.texi   "Luc Teirlinck"
-lispref/streams.texi     "Luc Teirlinck"
+lispref/streams.texi     "Luc Teirlinck"   Chong Yidong
 lispref/strings.texi     "Luc Teirlinck"   Chong Yidong
-lispref/symbols.texi     "Luc Teirlinck"
+lispref/symbols.texi     "Luc Teirlinck"   Chong Yidong
 lispref/syntax.texi      "Luc Teirlinck"
 lispref/text.texi        Chong Yidong
 lispref/tips.texi        "Luc Teirlinck"
-lispref/variables.texi   "Luc Teirlinck"
+lispref/variables.texi   "Luc Teirlinck"   Chong Yidong
 lispref/windows.texi     "Luc Teirlinck"   Chong Yidong
 
 
diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index feb6799080f..d48e6736004 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -1,127 +1,130 @@
-@echo off

-

-rem This batch file doesn't work with Cygwin tar because #files#

-rem has DOS line endings, which Cygwin tar misinterprets.

-rem I use the version of tar from

-rem    ftp://ftp.gnu.org/gnu/windows/emacs/utilities/i386/tar-1.11.2a.exe

-rem renamed as wtar.exe.

-set TAR=wtar

-

-rem Make a copy of current Emacs source

-if (%3) == () goto usage

-if not (%4) == () goto %4

-if not (%4) == (src) goto :lisp

-

-:src

-

-echo Create full source distribution, excluding leim

-%TAR%  --exclude leim --exclude _marker --exclude DOC --exclude DOC-X --exclude TAGS --exclude bin --exclude obj --exclude obj-spd --exclude oo --exclude oo-spd --exclude *~ --exclude *.rej -cvf - emacs-%1 | gzip -9 > %2-src.tar.gz

-if not (%4) == () goto end

-

-:lisp

-echo Create limited elisp source distribution

-%TAR% --exclude *.rej --exclude *.elc --exclude *~ -cvf - emacs-%1/lisp | gzip -9 > %2-lisp.tar.gz

-if not (%4) == () goto end

-

-:bin

-

-set eld=emacs-%1/lisp

-

-rem Keep this list in sync with the DONTCOMPILE list in lisp/Makefile.in

-

-set elfiles=%eld%/cus-load.el %eld%/cus-start.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-maint.el %eld%/eshell/esh-groups.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.el %eld%/generic-x.el %eld%/international/latin-1.el %eld%/international/latin-2.el %eld%/international/latin-3.el %eld%/international/latin-4.el %eld%/international/latin-5.el %eld%/international/latin-8.el %eld%/international/latin-9.el %eld%/international/mule-conf.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/version.el

-

-set fns_el=

-for %%f in (emacs-%1/bin/fns*) do set fns_el=%fns_el% emacs-%1/bin/%%f

-

-echo Create bin distribution

-copy %3\README.W32 emacs-%1\README.W32

-

-del #files#

-for %%f in (emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32) do echo %%f>>#files#

-for %%f in (emacs-%1/bin/fns*) do echo emacs-%1/bin/%%f>>#files#

-for %%f in (emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp %elfiles%) do echo %%f>>#files#

-for %%f in (%eld%/term/*.el) do echo %eld%/term/%%f>>#files#

-for %%f in (emacs-%1/lock emacs-%1/site-lisp emacs-%1/site-lisp/subdirs.el) do echo %%f>>#files#

-%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude *.el --exclude *~ -T #files# -cvf - | gzip -9 > %2-bin-i386.tar.gz

-del emacs-%1\README.W32

-del #files#

-if not (%4) == () goto end

-

-:fullbin

-

-echo Create full bin distribution

-copy %3\README.W32 emacs-%1\README.W32

-

-%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude *~ -cvf - emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/lock emacs-%1/site-lisp | gzip -9 > %2-fullbin-i386.tar.gz

-del emacs-%1\README.W32

-if not (%4) == () goto end

-

-:leim

-

-echo Create archive with precompiled leim files

-%TAR% -cvf - emacs-%1/leim/leim-list.el emacs-%1/leim/quail emacs-%1/leim/ja-dic | gzip -9 > %2-leim.tar.gz

-if not (%4) == () goto end

-

-:undumped

-

-echo Create archive with extra files needed for redumping emacs

-copy %3\README-UNDUMP.W32 emacs-%1\README-UNDUMP.W32

-copy %3\dump.bat emacs-%1\bin

-if exist emacs-%1\src\obj-spd\i386\temacs.exe copy emacs-%1\src\obj-spd\i386\temacs.exe emacs-%1\bin

-if exist emacs-%1\src\oo-spd\i386\temacs.exe copy emacs-%1\src\oo-spd\i386\temacs.exe emacs-%1\bin

-%TAR% -cvf - emacs-%1/README-UNDUMP.W32 emacs-%1/bin/dump.bat emacs-%1/bin/temacs.exe | gzip -9 > %2-undumped-i386.tar.gz

-del emacs-%1\bin\temacs.exe

-del emacs-%1\bin\dump.bat

-del emacs-%1\README-UNDUMP.W32

-if not (%4) == () goto end

-

-:barebin

-

-echo Create archive with just the basic binaries and generated files

-echo (the user needs to unpack the full source distribution for

-echo  everything else)

-copy %3\README.W32 emacs-%1\README.W32

-%TAR% -cvf - emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X | gzip -9 > %2-barebin-i386.tar.gz

-del emacs-%1\README.W32

-if not (%4) == () goto end

-

-goto end

-

-rem Only do this if explicitly requested

-:zipfiles

-

-echo Create zip files for bin and lisp archives

-mkdir distrib

-cd distrib

-gunzip -c ..\%2-bin-i386.tar.gz | %TAR% xf -

-rem Need to split emacs.exe into fragments because it is too big now

-rem to fit on a floppy even by itself.

-copy %3\stitch.bat %2\bin

-cd %2\bin

-split -b 1000000 emacs.exe emacs

-del emacs.exe

-cd ..\..

-zip -rp9 em%5bin %2

-rm -rf %2

-zipsplit -n 1400000 -b .. em%5bin.zip

-del em%5bin.zip

-gunzip -c ..\%2-lisp.tar.gz | %TAR% xf -

-zip -rp9 em%5lis %2

-rm -rf %2

-zipsplit -n 1400000 -b .. em%5lis.zip

-del em%5lis.zip

-cd ..

-

-goto end

-

-:usage

-echo Generate source and binary distributions of emacs.

-echo Usage: %0 emacs-version dist-basename distfiles [lisp,bin,undumped,barebin]

-echo   (e.g., %0 19.34 emacs-19.34.5 d:\andrewi\distfiles)

-echo Or: %0 emacs-version dist-basename distfiles "zipfiles" short-version

-echo   (e.g., %0 20.6 emacs-20.6 d:\andrewi\distfiles zipfiles 206)

-:end

+@echo off
+
+rem Beware broken ports of tar. Recent cygwin versions work well, older
+rem cygwin versions and the current MSys port have problems with DOS
+rem line ends when reading file names from a file. Other ports have their
+rem own problems too.
+set TAR=tar
+
+rem Make a copy of current Emacs source
+if (%3) == () goto usage
+if not (%4) == () goto %4
+if not (%4) == (src) goto :lisp
+
+:src
+
+echo Create full source distribution, excluding leim
+%TAR%  --exclude leim --exclude _marker --exclude DOC --exclude DOC-X --exclude TAGS --exclude bin --exclude obj --exclude obj-spd --exclude oo --exclude oo-spd --exclude *~ --exclude *.rej -cvf - emacs-%1 | gzip -9 > %2-src.tar.gz
+if not (%4) == () goto end
+
+:lisp
+echo Create limited elisp source distribution
+%TAR% --exclude *.rej --exclude *.elc --exclude *~ -cvf - emacs-%1/lisp | gzip -9 > %2-lisp.tar.gz
+if not (%4) == () goto end
+
+:bin
+
+set eld=emacs-%1/lisp
+
+rem Keep this list in sync with the DONTCOMPILE list in lisp/makefile.w32-in
+
+set elfiles=%eld%/cus-load.el %eld%/cus-start.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-maint.el %eld%/eshell/esh-groups.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.el %eld%/generic-x.el %eld%/international/latin-1.el %eld%/international/latin-2.el %eld%/international/latin-3.el %eld%/international/latin-4.el %eld%/international/latin-5.el %eld%/international/latin-8.el %eld%/international/latin-9.el %eld%/international/mule-conf.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/version.el
+
+set fns_el=
+for %%f in (emacs-%1/bin/fns*) do set fns_el=%fns_el% emacs-%1/bin/%%f
+
+echo Create bin distribution
+copy %3\README.W32 emacs-%1\README.W32
+
+del #files# #elfiles#
+for %%f in (emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32) do echo %%f>>#files#
+for %%f in (emacs-%1/bin/fns*) do echo emacs-%1/bin/%%f>>#elfiles#
+for %%f in (emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp) do echo %%f>>#files#
+for %%f in (emacs-%1/lock emacs-%1/site-lisp) do echo %%f>>#files#
+for %%f in (%elfiles% emacs-%1/site-lisp/subdirs.el) do echo %%f>>#elfiles#
+for %%f in (%eld%/term/*.el) do echo %eld%/term/%%f>>#elfiles#
+
+%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude "*.el" --exclude "*~" -T #files# -cvf %2-bin-i386.tar
+%TAR% -T #elfiles# -rvf %2-bin-i386.tar
+gzip -9 %2-bin-i386.tar
+del emacs-%1\README.W32
+rem del #files# #elfiles#
+if not (%4) == () goto end
+
+:fullbin
+
+echo Create full bin distribution
+copy %3\README.W32 emacs-%1\README.W32
+
+%TAR% --exclude temacs.exe --exclude emacs.mdp --exclude *.pdb --exclude *.opt --exclude *~ -cvf - emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/lock emacs-%1/site-lisp | gzip -9 > %2-fullbin-i386.tar.gz
+del emacs-%1\README.W32
+if not (%4) == () goto end
+
+:leim
+
+echo Create archive with precompiled leim files
+%TAR% -cvf - emacs-%1/leim/leim-list.el emacs-%1/leim/quail emacs-%1/leim/ja-dic | gzip -9 > %2-leim.tar.gz
+if not (%4) == () goto end
+
+:undumped
+
+echo Create archive with extra files needed for redumping emacs
+copy %3\README-UNDUMP.W32 emacs-%1\README-UNDUMP.W32
+copy %3\dump.bat emacs-%1\bin
+if exist emacs-%1\src\obj-spd\i386\temacs.exe copy emacs-%1\src\obj-spd\i386\temacs.exe emacs-%1\bin
+if exist emacs-%1\src\oo-spd\i386\temacs.exe copy emacs-%1\src\oo-spd\i386\temacs.exe emacs-%1\bin
+%TAR% -cvf - emacs-%1/README-UNDUMP.W32 emacs-%1/bin/dump.bat emacs-%1/bin/temacs.exe | gzip -9 > %2-undumped-i386.tar.gz
+del emacs-%1\bin\temacs.exe
+del emacs-%1\bin\dump.bat
+del emacs-%1\README-UNDUMP.W32
+if not (%4) == () goto end
+
+:barebin
+
+echo Create archive with just the basic binaries and generated files
+echo (the user needs to unpack the full source distribution for
+echo  everything else)
+copy %3\README.W32 emacs-%1\README.W32
+%TAR% -cvf - emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X | gzip -9 > %2-barebin-i386.tar.gz
+del emacs-%1\README.W32
+if not (%4) == () goto end
+
+goto end
+
+rem Only do this if explicitly requested
+:zipfiles
+
+echo Create zip files for bin and lisp archives
+mkdir distrib
+cd distrib
+gunzip -c ..\%2-bin-i386.tar.gz | %TAR% xf -
+rem Need to split emacs.exe into fragments because it is too big now
+rem to fit on a floppy even by itself.
+copy %3\stitch.bat %2\bin
+cd %2\bin
+split -b 1000000 emacs.exe emacs
+del emacs.exe
+cd ..\..
+zip -rp9 em%5bin %2
+rm -rf %2
+zipsplit -n 1400000 -b .. em%5bin.zip
+del em%5bin.zip
+gunzip -c ..\%2-lisp.tar.gz | %TAR% xf -
+zip -rp9 em%5lis %2
+rm -rf %2
+zipsplit -n 1400000 -b .. em%5lis.zip
+del em%5lis.zip
+cd ..
+
+goto end
+
+:usage
+echo Generate source and binary distributions of emacs.
+echo Usage: %0 emacs-version dist-basename distfiles [lisp,bin,undumped,barebin]
+echo   (e.g., %0 19.34 emacs-19.34.5 d:\andrewi\distfiles)
+echo Or: %0 emacs-version dist-basename distfiles "zipfiles" short-version
+echo   (e.g., %0 20.6 emacs-20.6 d:\andrewi\distfiles zipfiles 206)
+:end
 
 goto skipArchTag
    arch-tag: 6e2ddd92-c1c9-4992-b6b5-207aaab72f68