From c398f8167e8212e088522a7a273131ee26ca3b25 Mon Sep 17 00:00:00 2001 From: Guillaume Roguez Date: Thu, 29 Sep 2016 11:23:55 -0400 Subject: [PATCH] contrib: add BATCH_MODE env var to reduce log size If BATCH_MODE is set to a non-empty string, downloads and uncompress tools are silented to reduce the size of the output console log. This is not enable by default to let manual usage fully verbose. This is useful in case of automatic builds. Change-Id: I7efa6c0f9e8a2edf991030cb7e30d25227ea6674 Reviewed-by: Stepan Salenikovich --- contrib/src/ffmpeg/rules.mak | 2 +- contrib/src/libav/rules.mak | 2 +- contrib/src/main.mak | 15 +++++++++------ contrib/src/speex/rules.mak | 2 +- contrib/src/speexdsp/rules.mak | 2 +- contrib/src/vpx/rules.mak | 2 +- contrib/src/x264/rules.mak | 2 +- extras/tools/tools.mak | 12 ++++++------ 8 files changed, 21 insertions(+), 18 deletions(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 007aed9fe..c1e7cd50d 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -184,7 +184,7 @@ $(TARBALLS)/ffmpeg-$(FFMPEG_HASH).tar.xz: ffmpeg: ffmpeg-$(FFMPEG_HASH).tar.xz .sum-ffmpeg rm -Rf $@ $@-$(FFMPEG_HASH) mkdir -p $@-$(FFMPEG_HASH) - (cd $@-$(FFMPEG_HASH) && tar xv --strip-components=1 -f ../$<) + (cd $@-$(FFMPEG_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<) $(UPDATE_AUTOCONFIG) $(APPLY) $(SRC)/ffmpeg/0004-avformat-fix-find_stream_info-not-considering-extradata.patch $(MOVE) diff --git a/contrib/src/libav/rules.mak b/contrib/src/libav/rules.mak index c0de28ac0..4b7c368ea 100644 --- a/contrib/src/libav/rules.mak +++ b/contrib/src/libav/rules.mak @@ -182,7 +182,7 @@ $(TARBALLS)/libav-$(LIBAV_HASH).tar.xz: libav: libav-$(LIBAV_HASH).tar.xz .sum-libav rm -Rf $@ $@-$(LIBAV_HASH) mkdir -p $@-$(LIBAV_HASH) - (cd $@-$(LIBAV_HASH) && tar xv --strip-components=1 -f ../$<) + (cd $@-$(LIBAV_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<) $(UPDATE_AUTOCONFIG) ifdef HAVE_MACOSX $(APPLY) $(SRC)/libav/0005-avfoundation-simple-capture.patch diff --git a/contrib/src/main.mak b/contrib/src/main.mak index 5e126d052..ee43e5fcc 100644 --- a/contrib/src/main.mak +++ b/contrib/src/main.mak @@ -33,6 +33,9 @@ PKGS_ALL := $(patsubst $(SRC)/%/rules.mak,%,$(wildcard $(SRC)/*/rules.mak)) DATE := $(shell date +%Y%m%d) VPATH := $(TARBALLS) +# Set following to non-empty to remove uneeded progression reports (i.e. with automatics builds) +# BATCH_MODE = 1 + # Common download locations GNU := http://ftpmirror.gnu.org/ SF := http://heanet.dl.sourceforge.net/sourceforge @@ -235,10 +238,10 @@ SVN ?= $(error subversion client (svn) not found!) ifeq ($(DISABLE_CONTRIB_DOWNLOADS),TRUE) download = $(error Trying to download $(1) but DISABLE_CONTRIB_DOWNLOADS is TRUE, aborting.) else ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),) -download = curl -f -L --retry-delay 10 --retry 2 -- "$(1)" > "$@" +download = curl $(if ${BATCH_MODE},-sS) -f -L --retry-delay 10 --retry 2 -- "$(1)" > "$@" else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),) download = rm -f $@.tmp && \ - wget --passive -t 2 -w 10 -c -p -O $@.tmp "$(1)" && \ + wget $(if ${BATCH_MODE},-nv) --passive -t 2 -w 10 -c -p -O $@.tmp "$(1)" && \ touch $@.tmp && \ mv $@.tmp $@ else ifeq ($(which fetch >/dev/null 2>&1 || echo FAIL),) @@ -343,10 +346,10 @@ else CHECK_SHA512 = $(call checksum,$(SHA512SUM),SHA512) endif UNPACK = $(RM) -R $@ \ - $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \ - $(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \ - $(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f)) \ - $(foreach f,$(filter %.zip,$^), && unzip $(f)) + $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xzf $(f) $(if ${BATCH_MODE},,-v)) \ + $(foreach f,$(filter %.tar.bz2,$^), && tar xjf $(f) $(if ${BATCH_MODE},,-v)) \ + $(foreach f,$(filter %.tar.xz,$^), && tar xJf $(f) $(if ${BATCH_MODE},,-v)) \ + $(foreach f,$(filter %.zip,$^), && unzip $(if ${BATCH_MODE},-q) $(f)) UNPACK_DIR = $(basename $(basename $(notdir $<))) APPLY = (cd $(UNPACK_DIR) && patch -fp1) < APPLY_BIN = (cd $(UNPACK_DIR) && patch --binary -flp1) < diff --git a/contrib/src/speex/rules.mak b/contrib/src/speex/rules.mak index 6312c79e5..a6ecd7cb8 100644 --- a/contrib/src/speex/rules.mak +++ b/contrib/src/speex/rules.mak @@ -19,7 +19,7 @@ $(TARBALLS)/speex-git.tar.gz: speex: speex-$(SPEEX_VERSION).tar.gz .sum-speex rm -Rf $@-git $@ mkdir -p $@-git - $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1) + $(ZCAT) "$<" | (cd $@-git && tar x $(if ${BATCH_MODE},,-v) --strip-components=1) $(MOVE) SPEEX_CONF := --disable-binaries diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak index 05f88a4c9..8ad2697bf 100644 --- a/contrib/src/speexdsp/rules.mak +++ b/contrib/src/speexdsp/rules.mak @@ -19,7 +19,7 @@ $(TARBALLS)/speexdsp-git.tar.gz: speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz .sum-speexdsp rm -Rf $@-git $@ mkdir -p $@-git - $(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1) + $(ZCAT) "$<" | (cd $@-git && tar x $(if ${BATCH_MODE},,-v) --strip-components=1) $(MOVE) SPEEXDSP_CONF := --enable-resample-full-sinc-table --disable-examples diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak index 0b552698a..507c37c25 100644 --- a/contrib/src/vpx/rules.mak +++ b/contrib/src/vpx/rules.mak @@ -19,7 +19,7 @@ $(TARBALLS)/libvpx-$(VPX_HASH).tar.gz: libvpx: libvpx-$(VPX_HASH).tar.gz .sum-vpx rm -Rf $@-$(VPX_HASH) mkdir -p $@-$(VPX_HASH) - (cd $@-$(VPX_HASH) && tar xv --strip-components=1 -f ../$<) + (cd $@-$(VPX_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<) $(MOVE) DEPS_vpx = diff --git a/contrib/src/x264/rules.mak b/contrib/src/x264/rules.mak index cf5f4d6b8..2e356bf2e 100644 --- a/contrib/src/x264/rules.mak +++ b/contrib/src/x264/rules.mak @@ -38,7 +38,7 @@ $(TARBALLS)/x264-$(X264_HASH).tar.xz: x264: x264-$(X264_HASH).tar.xz .sum-x264 rm -Rf $@-$(X264_HASH) mkdir -p $@-$(X264_HASH) - (cd $@-$(X264_HASH) && tar xv --strip-components=1 -f ../$<) + (cd $@-$(X264_HASH) && tar x $(if ${BATCH_MODE},,-v) --strip-components=1 -f ../$<) $(APPLY) $(SRC)/x264/remove-align.patch $(UPDATE_AUTOCONFIG) $(MOVE) diff --git a/extras/tools/tools.mak b/extras/tools/tools.mak index 9ecd71c8a..5cfd1ec63 100644 --- a/extras/tools/tools.mak +++ b/extras/tools/tools.mak @@ -25,10 +25,10 @@ AUTOCONF=$(PREFIX)/bin/autoconf export AUTOCONF ifeq ($(shell curl --version >/dev/null 2>&1 || echo FAIL),) -download = curl -f -L -- "$(1)" > "$@" +download = curl $(if ${BATCH_MODE},-sS) -f -L --retry-delay 10 --retry 2 -- "$(1)" > "$@" else ifeq ($(shell wget --version >/dev/null 2>&1 || echo FAIL),) download = rm -f $@.tmp && \ - wget --passive -c -p -O $@.tmp "$(1)" && \ + wget $(if ${BATCH_MODE},-nv) --passive -t 2 -w 10 -c -p -O $@.tmp "$(1)" && \ touch $@.tmp && \ mv $@.tmp $@ else ifeq ($(which fetch >/dev/null 2>&1 || echo FAIL),) @@ -41,10 +41,10 @@ download = $(error Neither curl nor wget found!) endif UNPACK = $(RM) -R $@ \ - $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xvzf $(f)) \ - $(foreach f,$(filter %.tar.bz2,$^), && tar xvjf $(f)) \ - $(foreach f,$(filter %.tar.xz,$^), && tar xvJf $(f)) \ - $(foreach f,$(filter %.zip,$^), && unzip $(f)) + $(foreach f,$(filter %.tar.gz %.tgz,$^), && tar xzf $(f) $(if ${BATCH_MODE},,-v)) \ + $(foreach f,$(filter %.tar.bz2,$^), && tar xjf $(f) $(if ${BATCH_MODE},,-v)) \ + $(foreach f,$(filter %.tar.xz,$^), && tar xJf $(f) $(if ${BATCH_MODE},,-v)) \ + $(foreach f,$(filter %.zip,$^), && unzip $(if ${BATCH_MODE},-q) $(f)) UNPACK_DIR = $(basename $(basename $(notdir $<))) APPLY = (cd $(UNPACK_DIR) && patch -p1) <