diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-05 08:49:52 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-05-05 08:50:08 +0200 |
| commit | f0c4281f845e8f350acb01cd20ac7f4e085455b0 (patch) | |
| tree | 2a50dac0fef0d8f110e84801f1410f4ccf6ac210 | |
| parent | 12f78ed4f9ddeea66d29c6e7e5140fa9086a70fc (diff) | |
| parent | 00ea54642249fa537f677499b0b4e006fd277481 (diff) | |
| download | bitcoin-f0c4281f845e8f350acb01cd20ac7f4e085455b0.tar.xz | |
Merge pull request #6105
00ea546 build: quiet the exe-installer output (Cory Fields)
cc602d0 travis: don't spew fixme messages when running wine tests (Cory Fields)
c1149f7 build: if there's no recent git tag, don't spew error messages (Cory Fields)
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | share/genbuild.sh | 2 |
3 files changed, 4 insertions, 2 deletions
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: 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/%,%,$@) 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 |