1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-15 17:00:26 +00:00

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.
This commit is contained in:
Dani Moncayo 2012-11-17 10:55:07 +02:00 committed by Eli Zaretskii
parent de959d4da9
commit cd48a2e800
2 changed files with 10 additions and 8 deletions

View File

@ -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.

View File

@ -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