Merge from trunk.

1 files changed, 3 insertions, 8 deletions

diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index 806415054fd..e196299b6d6 100644
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -25,9 +25,8 @@ set EMACS_VER=%1
 set TMP_DIST_DIR=emacs-%EMACS_VER%

 

 rem Check, if 7zip is installed and available on path

-:ZIP_CHECK

-7z

-if %ERRORLEVEL% NEQ 0 goto :ZIP_ERROR

+7z 1>NUL 2>NUL

+if %ERRORLEVEL% NEQ 0 goto ZIP_ERROR

 goto ZIP_DIST

 

 :ZIP_ERROR

@@ -35,14 +34,10 @@ echo.
 echo ERROR: Make sure 7zip is installed and available on the Windows Path!

 goto EXIT

 

-rem Build distributions

+rem Build and verify the binary distribution

 :ZIP_DIST

-rem Build and verify full distribution

 7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-bin-i386.zip %TMP_DIST_DIR%

 7z t emacs-%EMACS_VER%-bin-i386.zip

-rem Build and verify binary only distribution

-7z a -bd -tZIP -mx=9 -x!.bzrignore -x!.gitignore -xr!emacs.mdp -xr!*.pdb -xr!*.opt -xr!*~ -xr!CVS -xr!.arch-inventory emacs-%EMACS_VER%-barebin-i386.zip %TMP_DIST_DIR%/README.W32 %TMP_DIST_DIR%/bin %TMP_DIST_DIR%/etc/DOC-X %TMP_DIST_DIR%/COPYING

-7z t emacs-%EMACS_VER%-barebin-i386.zip

 goto EXIT

 

 :EXIT