[Emacs-diffs] Changes to emacs/admin/nt/makedist.bat, v [EMACS_22_BASE]

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jason Rumney <jasonr>   07/05/24 14:35:33

Index: makedist.bat
===================================================================
RCS file: /sources/emacs/emacs/admin/nt/makedist.bat,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- makedist.bat        22 May 2007 15:35:29 -0000      1.12.2.1
+++ makedist.bat        24 May 2007 14:35:33 -0000      1.12.2.2
@@ -25,8 +25,6 @@
 rem Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 rem Boston, MA 02110-1301, USA.
 
-set ZIP=zip
-
 if (%3) == () goto usage
 if not (%4) == () goto %4
 
@@ -34,18 +32,24 @@
 
 echo Create full bin distribution
 copy %3\README.W32 emacs-%1\README.W32
-
-%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
+rem Info-ZIP zip seems to be broken on Windows.
+rem It always writes to zip.zip and treats the zipfile argument as one
+rem of the files to go in it.
+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
+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 
 del emacs-%1\README.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
-%ZIP% -9 emacs-%1/README.W32 emacs-%1/bin emacs-%1/etc/DOC emacs-%1/etc/DOC-X 
%2-barebin-i386.zip
+rem Info-ZIP zip seems to be broken on Windows.
+rem It always writes to zip.zip and treats the zipfile argument as one
+rem of the files to go in it.
+rem zip -9 -r %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin 
emacs-%1/etc/DOC-X
+7z a -tZIP -mx=9 %2-barebin-i386.zip emacs-%1/README.W32 emacs-%1/bin 
emacs-%1/etc/DOC-X
 del emacs-%1\README.W32
 if not (%4) == () goto end