Use 7-zip for compression, as Info-zip's zip is not working as expected.

diff --git a/admin/nt/makedist.bat b/admin/nt/makedist.bat
index b160da93c4f82e05eb392f359f541e2be89eeb6e..729b77c48db87ba02d10e2fbe97a91414c713e35 100755 (executable)
--- a/admin/nt/makedist.bat
+++ b/admin/nt/makedist.bat
@@ -25,8 +25,6 @@ rem along with GNU Emacs; see the file COPYING.  If not, write to the
 rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\r
 rem Boston, MA 02110-1301, USA.\r
 \r
-set ZIP=zip\r
-\r
 if (%3) == () goto usage\r
 if not (%4) == () goto %4\r
 \r
@@ -34,18 +32,24 @@ if not (%4) == () goto %4
 \r
 echo Create full bin distribution\r
 copy %3\README.W32 emacs-%1\README.W32\r
-\r
-%ZIP% -x emacs.mdp -x *.pdb -x *.opt -x *~ -x CVS -9 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp %2-bin-i386.zip\r
+rem Info-ZIP zip seems to be broken on Windows.\r
+rem It always writes to zip.zip and treats the zipfile argument as one\r
+rem of the files to go in it.\r
+rem zip -9 -r %2-bin-i386 emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim -x emacs.mdp *.pdb *.opt *~ CVS\r
+7z a -tZIP -mx=9 -x!emacs.mdp -x!*.pdb -x!*.opt -x!*~ -x!CVS %2-bin-i386.zip emacs-%1/BUGS emacs-%1/README emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc emacs-%1/info emacs-%1/lisp emacs-%1/leim \r
 del emacs-%1\README.W32\r
 if not (%4) == () goto end\r
 \r
 :barebin\r
-\r
 echo Create archive with just the basic binaries and generated files\r
 echo (the user needs to unpack the full source distribution for\r
 echo  everything else)\r
 copy %3\README.W32 emacs-%1\README.W32\r
-%ZIP% -9 emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X %2-barebin-i386.zip\r
+rem Info-ZIP zip seems to be broken on Windows.\r
+rem It always writes to zip.zip and treats the zipfile argument as one\r
+rem of the files to go in it.\r
+rem zip -9 -r %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X\r
+7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC-X\r
 del emacs-%1\README.W32\r
 if not (%4) == () goto end\r
 \r