Browse Source
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)
try
Wladimir J. van der Laan
10 years ago
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
3 changed files with
4 additions and
2 deletions
-
.travis.yml
-
Makefile.am
-
share/genbuild.sh
|
|
|
@ -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: |
|
|
|
|
|
|
|
@ -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/%,%,$@) |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
|
