[Emacs-diffs] /srv/bzr/emacs/trunk r110918: Don't produce "barebin" zip file as part of MS-Windows distributions.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110918
author: Dani Moncayo <address@hidden>
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-11-17 10:55:07 +0200
message:
  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.
modified:
  nt/ChangeLog
  nt/zipdist.bat

=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog      2012-11-15 14:47:31 +0000
+++ b/nt/ChangeLog      2012-11-17 08:55:07 +0000
@@ -1,3 +1,10 @@
+2012-11-17  Dani Moncayo  <address@hidden>
+
+       * 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  <address@hidden>
 
        * config.nt: Sync with autogen/config.in.

=== modified file 'nt/zipdist.bat'
--- a/nt/zipdist.bat    2012-01-05 09:46:05 +0000
+++ b/nt/zipdist.bat    2012-11-17 08:55:07 +0000
@@ -25,9 +25,8 @@
 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 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