Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org

[gnu-emacs] / nt / zipdist.bat

diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index b87353347ba0edcbbdadcf6e92698bf3c9da24bb..2953e40ae89cece18059a3759a8b4414b62177dc 100644 (file)
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -1,5 +1,5 @@
 @echo off\r
-rem Copyright (C) 2001-2011  Free Software Foundation, Inc.\r
+rem Copyright (C) 2001-2013 Free Software Foundation, Inc.\r
 \r
 rem Author: Christoph Scholtes cschol2112 at gmail.com\r
 \r
@@ -25,9 +25,8 @@ set EMACS_VER=%1
 set TMP_DIST_DIR=emacs-%EMACS_VER%\r
 \r
 rem Check, if 7zip is installed and available on path\r
-:ZIP_CHECK\r
-7z\r
-if %ERRORLEVEL% NEQ 0 goto :ZIP_ERROR\r
+7z 1>NUL 2>NUL\r
+if %ERRORLEVEL% NEQ 0 goto ZIP_ERROR\r
 goto ZIP_DIST\r
 \r
 :ZIP_ERROR\r
@@ -35,14 +34,10 @@ echo.
 echo ERROR: Make sure 7zip is installed and available on the Windows Path!\r
 goto EXIT\r
 \r
-rem Build distributions\r
+rem Build and verify the binary distribution\r
 :ZIP_DIST\r
-rem Build and verify full distribution\r
 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%\r
 7z t emacs-%EMACS_VER%-bin-i386.zip\r
-rem Build and verify binary only distribution\r
-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\r
-7z t emacs-%EMACS_VER%-barebin-i386.zip\r
 goto EXIT\r
 \r
 :EXIT\r