Don't produce "barebin" zip file as part of MS-Windows distributions.

 nt/zipdist.bat (ZIP_CHECK): Remove unused label.  When invoking 7z
 to check if it's installed, redirect standard output and standard
 error to the null device.
 (ZIP_DIST): Don't build the "barebin" distribution.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index d5df1e10857a41dba8c3f7f28c2dd836cace62f6..aa690e5d75fa86fe605f05ec32875d77759d8e03 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,10 @@
+2012-11-17  Dani Moncayo  <dmoncayo@gmail.com>
+
+       * zipdist.bat (ZIP_CHECK): Remove unused label.  When invoking 7z
+       to check if it's installed, redirect standard output and standard
+       error to the null device.
+       (ZIP_DIST): Don't build the "barebin" distribution.
+
 2012-11-15  Juanma Barranquero  <lekktu@gmail.com>
 
        * config.nt: Sync with autogen/config.in.

diff --git a/nt/zipdist.bat b/nt/zipdist.bat
index 806415054fd8291fd4ac55aea1026bc31824eded..e196299b6d6f9ccaef0da862c7bafa6a825b7d84 100644 (file)
--- a/nt/zipdist.bat
+++ b/nt/zipdist.bat
@@ -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