Change EOL format to DOS. Don't use redirection characters in REM lines.

1 files changed, 161 insertions, 158 deletions

diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index a04a11acd35..435462df6bd 100755
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -1,158 +1,161 @@
-@echo off
-
-rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
-rem   Free Software Foundation, Inc.
-rem
-rem Author: Andrew Innes <andrewi@gnu.org>
-rem
-rem This file is part of GNU Emacs.
-rem
-rem GNU Emacs is free software; you can redistribute it and/or modify
-rem it under the terms of the GNU General Public License as published by
-rem the Free Software Foundation; either version 2, or (at your option)
-rem any later version.
-rem
-rem GNU Emacs is distributed in the hope that it will be useful,
-rem but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem GNU General Public License for more details.
-rem
-rem You should have received a copy of the GNU General Public License
-rem along with GNU Emacs; see the file COPYING.  If not, write to the
-rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-rem Boston, MA 02110-1301, USA.
-
-
-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 List of Lisp files that are not compiled and that should be
-rem included in the bin distribution.
-
-rem It would be better to generate this list automatically.  It is the
-rem list of all .el files for which there is no corresponding .elc
-rem file, minus ldefs-boot.el.  --lute
-
-set elfiles=%eld%/cus-load.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-groups.el %eld%/eshell/esh-maint.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.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%/language/czech.el %eld%/language/devanagari.el %eld%/language/english.el %eld%/language/georgian.el %eld%/language/greek.el %eld%/language/hebrew.el %eld%/language/japanese.el %eld%/language/kannada.el %eld%/language/korean.el %eld%/language/lao.el %eld%/language/malayalam.el %eld%/language/misc-lang.el %eld%/language/romanian.el %eld%/language/slovak.el %eld%/language/tamil.el %eld%/language/thai.el %eld%/language/utf-8-lang.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/mh-e/mh-acros.el %eld%/mh-e/mh-gnus.el %eld%/mh-e/mh-loaddefs.el %eld%/obsolete/keyswap.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/term/AT386.el %eld%/term/apollo.el %eld%/term/bobcat.el %eld%/term/internal.el %eld%/term/iris-ansi.el %eld%/term/linux.el %eld%/term/lk201.el %eld%/term/news.el %eld%/term/vt102.el %eld%/term/vt125.el %eld%/term/vt200.el %eld%/term/vt201.el %eld%/term/vt220.el %eld%/term/vt240.el %eld%/term/vt300.el %eld%/term/vt320.el %eld%/term/vt400.el %eld%/term/vt420.el %eld%/term/wyse50.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#
-
-%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
-:skipArchTag
+@echo off

+

+rem Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007

+rem   Free Software Foundation, Inc.

+rem

+rem Cannot use brackets in andrewi's email below because

+rem older Windows shells will treat that as redirection.

+rem

+rem Author: Andrew Innes andrewi@gnu.org

+rem

+rem This file is part of GNU Emacs.

+rem

+rem GNU Emacs is free software; you can redistribute it and/or modify

+rem it under the terms of the GNU General Public License as published by

+rem the Free Software Foundation; either version 2, or (at your option)

+rem any later version.

+rem

+rem GNU Emacs is distributed in the hope that it will be useful,

+rem but WITHOUT ANY WARRANTY; without even the implied warranty of

+rem MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+rem GNU General Public License for more details.

+rem

+rem You should have received a copy of the GNU General Public License

+rem along with GNU Emacs; see the file COPYING.  If not, write to the

+rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,

+rem Boston, MA 02110-1301, USA.

+

+

+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 List of Lisp files that are not compiled and that should be

+rem included in the bin distribution.

+

+rem It would be better to generate this list automatically.  It is the

+rem list of all .el files for which there is no corresponding .elc

+rem file, minus ldefs-boot.el.  --lute

+

+set elfiles=%eld%/cus-load.el %eld%/emacs-lisp/cl-specs.el %eld%/eshell/esh-groups.el %eld%/eshell/esh-maint.el %eld%/finder-inf.el %eld%/forms-d2.el %eld%/forms-pass.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%/language/czech.el %eld%/language/devanagari.el %eld%/language/english.el %eld%/language/georgian.el %eld%/language/greek.el %eld%/language/hebrew.el %eld%/language/japanese.el %eld%/language/kannada.el %eld%/language/korean.el %eld%/language/lao.el %eld%/language/malayalam.el %eld%/language/misc-lang.el %eld%/language/romanian.el %eld%/language/slovak.el %eld%/language/tamil.el %eld%/language/thai.el %eld%/language/utf-8-lang.el %eld%/loaddefs.el %eld%/loadup.el %eld%/mail/blessmail.el %eld%/mh-e/mh-acros.el %eld%/mh-e/mh-gnus.el %eld%/mh-e/mh-loaddefs.el %eld%/obsolete/keyswap.el %eld%/patcomp.el %eld%/paths.el %eld%/play/bruce.el %eld%/subdirs.el %eld%/term/AT386.el %eld%/term/apollo.el %eld%/term/bobcat.el %eld%/term/internal.el %eld%/term/iris-ansi.el %eld%/term/linux.el %eld%/term/lk201.el %eld%/term/news.el %eld%/term/vt102.el %eld%/term/vt125.el %eld%/term/vt200.el %eld%/term/vt201.el %eld%/term/vt220.el %eld%/term/vt240.el %eld%/term/vt300.el %eld%/term/vt320.el %eld%/term/vt400.el %eld%/term/vt420.el %eld%/term/wyse50.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#

+

+%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

+:skipArchTag