diff options
| author | Dani Moncayo <dmoncayo@gmail.com> | 2012-11-17 10:55:07 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2012-11-17 10:55:07 +0200 |
| commit | cd48a2e800819bee7a3d9189cf2478e5a8c256a2 (patch) | |
| tree | 482f6e7cbfdb3c3702e45277671403802cd51297 | |
| parent | de959d4da90f7a74fdebe3aa1d8b5ba93bca02ba (diff) | |
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.
| -rw-r--r-- | nt/ChangeLog | 7 | ||||
| -rw-r--r-- | nt/zipdist.bat | 11 |
2 files changed, 10 insertions, 8 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index d5df1e10857..aa690e5d75f 100644 --- 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 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
|