From c1149f73714a47139cce0d93e92e6b871905b0a1 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Mon, 4 May 2015 10:58:21 -0400 Subject: [PATCH 1/3] build: if there's no recent git tag, don't spew error messages --- share/genbuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/genbuild.sh b/share/genbuild.sh index ffa89ca6e4..a15cb34e47 100755 --- a/share/genbuild.sh +++ b/share/genbuild.sh @@ -22,7 +22,7 @@ if [ -e "$(which git 2>/dev/null)" -a "$(git rev-parse --is-inside-work-tree 2>/ # if latest commit is tagged and not dirty, then override using the tag name RAWDESC=$(git describe --abbrev=0 2>/dev/null) - if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC)" ]; then + if [ "$(git rev-parse HEAD)" = "$(git rev-list -1 $RAWDESC 2>/dev/null)" ]; then git diff-index --quiet HEAD -- && DESC=$RAWDESC fi From cc602d0f8306148ace743f4ed493ad5fe5f80958 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Mon, 4 May 2015 11:05:25 -0400 Subject: [PATCH 2/3] travis: don't spew fixme messages when running wine tests --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index e6578ee078..1f6eb15c27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,7 @@ env: - BASE_OUTDIR=$TRAVIS_BUILD_DIR/out - SDK_URL=https://bitcoincore.org/depends-sources/sdks - PYTHON_DEBUG=1 + - WINEDEBUG=fixme-all cache: apt: true directories: From 00ea54642249fa537f677499b0b4e006fd277481 Mon Sep 17 00:00:00 2001 From: Cory Fields Date: Mon, 4 May 2015 12:02:24 -0400 Subject: [PATCH 3/3] build: quiet the exe-installer output --- Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index c59648fd02..2cb933d5bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,8 +59,9 @@ $(BITCOIN_WIN_INSTALLER): all-recursive STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release - @test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \ + @test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \ echo error: could not build $@ + @echo built $@ $(if $(findstring src/,$(MAKECMDGOALS)),$(MAKECMDGOALS), none): FORCE $(MAKE) -C src $(patsubst src/%,%,$@)