Browse Source

Rename all

Starwels Fork
tags/v0.16.1
SHI 1 year ago
parent
commit
c93b275591
100 changed files with 1126 additions and 1230 deletions
  1. 4
    4
      .github/ISSUE_TEMPLATE.md
  2. 19
    19
      .gitignore
  3. 15
    15
      .travis.yml
  4. 3
    3
      .tx/config
  5. 11
    11
      CONTRIBUTING.md
  6. 2
    2
      COPYING
  7. 2
    2
      INSTALL.md
  8. 43
    43
      Makefile.am
  9. 10
    12
      README.md
  10. 1
    1
      autogen.sh
  11. 4
    4
      build-aux/m4/starwels_find_bdb48.m4
  12. 125
    125
      build-aux/m4/starwels_qt.m4
  13. 3
    3
      build-aux/m4/starwels_subdir_to_include.m4
  14. 60
    60
      configure.ac
  15. 8
    8
      contrib/README.md
  16. 8
    8
      contrib/debian/README.md
  17. 0
    14
      contrib/debian/bitcoin-qt.desktop
  18. 0
    6
      contrib/debian/bitcoin-qt.install
  19. 0
    1
      contrib/debian/bitcoin-qt.manpages
  20. 0
    1
      contrib/debian/bitcoin-tx.bash-completion
  21. 0
    1
      contrib/debian/bitcoin-tx.install
  22. 0
    1
      contrib/debian/bitcoin-tx.manpages
  23. 0
    2
      contrib/debian/bitcoind.bash-completion
  24. 0
    1
      contrib/debian/bitcoind.examples
  25. 0
    2
      contrib/debian/bitcoind.install
  26. 0
    2
      contrib/debian/bitcoind.manpages
  27. 88
    88
      contrib/debian/changelog
  28. 15
    15
      contrib/debian/control
  29. 7
    7
      contrib/debian/copyright
  30. 12
    12
      contrib/debian/examples/starwels.conf
  31. 4
    4
      contrib/debian/rules
  32. 14
    0
      contrib/debian/starwels-qt.desktop
  33. 6
    0
      contrib/debian/starwels-qt.install
  34. 1
    1
      contrib/debian/starwels-qt.lintian-overrides
  35. 1
    0
      contrib/debian/starwels-qt.manpages
  36. 2
    2
      contrib/debian/starwels-qt.protocol
  37. 1
    0
      contrib/debian/starwels-tx.bash-completion
  38. 1
    0
      contrib/debian/starwels-tx.install
  39. 1
    0
      contrib/debian/starwels-tx.manpages
  40. 2
    0
      contrib/debian/starwelsd.bash-completion
  41. 1
    0
      contrib/debian/starwelsd.examples
  42. 2
    0
      contrib/debian/starwelsd.install
  43. 1
    1
      contrib/debian/starwelsd.lintian-overrides
  44. 2
    0
      contrib/debian/starwelsd.manpages
  45. 20
    20
      contrib/devtools/README.md
  46. 1
    1
      contrib/devtools/check-doc.py
  47. 1
    1
      contrib/devtools/check-rpc-mappings.py
  48. 1
    1
      contrib/devtools/commit-script-check.sh
  49. 26
    26
      contrib/devtools/copyright_header.py
  50. 12
    12
      contrib/devtools/gen-manpages.sh
  51. 1
    1
      contrib/devtools/git-subtree-check.sh
  52. 1
    1
      contrib/devtools/github-merge.py
  53. 1
    1
      contrib/devtools/lint-all.sh
  54. 1
    1
      contrib/devtools/lint-python.sh
  55. 1
    1
      contrib/devtools/lint-whitespace.sh
  56. 1
    1
      contrib/devtools/optimize-pngs.py
  57. 1
    1
      contrib/devtools/security-check.py
  58. 2
    2
      contrib/devtools/symbol-check.py
  59. 1
    1
      contrib/devtools/test-security-check.py
  60. 1
    1
      contrib/devtools/update-translations.py
  61. 32
    32
      contrib/gitian-build.sh
  62. 13
    12
      contrib/gitian-descriptors/gitian-linux.yml
  63. 5
    5
      contrib/gitian-descriptors/gitian-osx-signer.yml
  64. 13
    12
      contrib/gitian-descriptors/gitian-osx.yml
  65. 4
    4
      contrib/gitian-descriptors/gitian-win-signer.yml
  66. 21
    20
      contrib/gitian-descriptors/gitian-win.yml
  67. 6
    6
      contrib/init/README.md
  68. 0
    65
      contrib/init/bitcoind.conf
  69. 0
    67
      contrib/init/bitcoind.init
  70. 0
    92
      contrib/init/bitcoind.openrc
  71. 0
    33
      contrib/init/bitcoind.openrcconf
  72. 2
    2
      contrib/init/org.starwels.starwelsd.plist
  73. 65
    0
      contrib/init/starwelsd.conf
  74. 67
    0
      contrib/init/starwelsd.init
  75. 92
    0
      contrib/init/starwelsd.openrc
  76. 33
    0
      contrib/init/starwelsd.openrcconf
  77. 8
    8
      contrib/init/starwelsd.service
  78. 2
    2
      contrib/install_db4.sh
  79. 3
    3
      contrib/linearize/README.md
  80. 4
    4
      contrib/linearize/example-linearize.cfg
  81. 1
    1
      contrib/linearize/linearize-data.py
  82. 3
    3
      contrib/linearize/linearize-hashes.py
  83. 1
    1
      contrib/macdeploy/README.md
  84. 1
    1
      contrib/macdeploy/background.svg
  85. 5
    5
      contrib/macdeploy/custom_dsstore.py
  86. 1
    1
      contrib/macdeploy/detached-sig-apply.sh
  87. 2
    2
      contrib/macdeploy/detached-sig-create.sh
  88. 1
    1
      contrib/macdeploy/extract-osx-sdk.sh
  89. 1
    1
      contrib/macdeploy/fancy.plist
  90. 2
    2
      contrib/macdeploy/macdeployqtplus
  91. 2
    2
      contrib/qos/README.md
  92. 2
    2
      contrib/qos/tc.sh
  93. 16
    16
      contrib/rpm/README.md
  94. 0
    24
      contrib/rpm/bitcoin-0.12.0-libressl.patch
  95. 0
    8
      contrib/rpm/bitcoin.fc
  96. 0
    81
      contrib/rpm/bitcoin.te
  97. 8
    0
      contrib/rpm/starwels.fc
  98. 35
    35
      contrib/rpm/starwels.if
  99. 124
    124
      contrib/rpm/starwels.spec
  100. 0
    0
      contrib/rpm/starwels.te

+ 4
- 4
.github/ISSUE_TEMPLATE.md View File

@@ -1,8 +1,8 @@
<!-- This issue tracker is only for technical issues related to Bitcoin Core.
<!-- This issue tracker is only for technical issues related to Starwels.

General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.
General starwels questions and/or support requests are best directed to the Starwels StackExchange at https://bitcoin.stackexchange.com.

For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.
For reporting security issues, please read instructions at https://localhost/en/contact/.

If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->

@@ -13,7 +13,7 @@ If the node is "stuck" during sync or giving "block checksum mismatch" errors, p

<!--- How reliably can you reproduce the issue, what are the steps to do so? -->

<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->
<!-- What version of Starwels are you using, where did you get it (website, self-compiled, etc)? -->

<!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->


+ 19
- 19
.gitignore View File

@@ -1,13 +1,13 @@
*.tar.gz

*.exe
src/bitcoin
src/bitcoind
src/bitcoin-cli
src/bitcoin-tx
src/test/test_bitcoin
src/test/test_bitcoin_fuzzy
src/qt/test/test_bitcoin-qt
src/starwels
src/starwelsd
src/starwels-cli
src/starwels-tx
src/test/test_starwels
src/test/test_starwels_fuzzy
src/qt/test/test_starwels-qt

# autoreconf
Makefile.in
@@ -30,8 +30,8 @@ config.log
config.status
configure
libtool
src/config/bitcoin-config.h
src/config/bitcoin-config.h.in
src/config/starwels-config.h
src/config/starwels-config.h.in
src/config/stamp-h1
share/setup.nsi
share/qt/Info.plist
@@ -44,11 +44,11 @@ src/qt/forms/ui_*.h

src/qt/test/moc*.cpp

src/qt/bitcoin-qt.config
src/qt/bitcoin-qt.creator
src/qt/bitcoin-qt.creator.user
src/qt/bitcoin-qt.files
src/qt/bitcoin-qt.includes
src/qt/starwels-qt.config
src/qt/starwels-qt.creator
src/qt/starwels-qt.creator.user
src/qt/starwels-qt.files
src/qt/starwels-qt.includes

.deps
.dirstamp
@@ -80,13 +80,13 @@ src/qt/bitcoin-qt.includes
# Compilation and Qt preprocessor part
*.qm
Makefile
bitcoin-qt
Bitcoin-Qt.app
starwels-qt
Starwels-Qt.app
background.tiff*

# Unit-tests
Makefile.test
bitcoin-qt_test
starwels-qt_test

# Resources cpp
qrc_*.cpp
@@ -99,7 +99,7 @@ build
*.gcno
*.gcda
/*.info
test_bitcoin.coverage/
test_starwels.coverage/
total.coverage/
coverage_percent.txt

@@ -114,5 +114,5 @@ test/cache/*

/doc/doxygen/

libbitcoinconsensus.pc
libstarwelsconsensus.pc
contrib/devtools/split-debug.sh

+ 15
- 15
.travis.yml View File

@@ -19,25 +19,25 @@ env:
- CCACHE_TEMPDIR=/tmp/.ccache-temp
- CCACHE_COMPRESS=1
- BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
- SDK_URL=https://bitcoincore.org/depends-sources/sdks
- SDK_URL=https://localhost/depends-sources/sdks
- WINEDEBUG=fixme-all
matrix:
# ARM
- HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf python3-pip" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
- HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf python3-pip" DEP_OPTS="NO_QT=1" CHECK_DOC=1 GOAL="install" STARWELS_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
# Win32
- HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
- HOST=i686-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-i686 wine1.6" RUN_TESTS=true GOAL="install" STARWELS_CONFIG="--enable-reduce-exports"
# Qt4 & system libs
- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qt4-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.1++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev xvfb" NO_DEPENDS=1 NEED_XVFB=1 RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt4 CPPFLAGS=-DDEBUG_LOCKORDER"
- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qt4-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.1++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev xvfb" NO_DEPENDS=1 NEED_XVFB=1 RUN_TESTS=true GOAL="install" STARWELS_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt4 CPPFLAGS=-DDEBUG_LOCKORDER"
# 32-bit + dash
- HOST=i686-pc-linux-gnu PACKAGES="g++-multilib python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
- HOST=i686-pc-linux-gnu PACKAGES="g++-multilib python3-zmq" DEP_OPTS="NO_QT=1" RUN_TESTS=true GOAL="install" STARWELS_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash"
# Win64
- HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-reduce-exports"
- HOST=x86_64-w64-mingw32 DPKG_ADD_ARCH="i386" DEP_OPTS="NO_QT=1" PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine1.6" RUN_TESTS=true GOAL="install" STARWELS_CONFIG="--enable-reduce-exports"
# x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout)
- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
- HOST=x86_64-unknown-linux-gnu PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1" RUN_TESTS=true GOAL="install" STARWELS_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
# x86_64 Linux, No wallet
- HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
- HOST=x86_64-unknown-linux-gnu PACKAGES="python3" DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" STARWELS_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
# Cross-Mac
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror" OSX_SDK=10.11 GOAL="deploy"
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" STARWELS_CONFIG="--enable-gui --enable-reduce-exports --enable-werror" OSX_SDK=10.11 GOAL="deploy"

before_install:
- export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
@@ -63,19 +63,19 @@ before_script:
# Start xvfb if needed, as documented at https://docs.travis-ci.com/user/gui-and-headless-browsers/#Using-xvfb-to-Run-Tests-That-Require-a-GUI
- if [ "$NEED_XVFB" = 1 ]; then export DISPLAY=:99.0; /sbin/start-stop-daemon --start --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac; fi
script:
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "starwels/starwels" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
- if [ "$CHECK_DOC" = 1 -a "$TRAVIS_REPO_SLUG" = "starwels/starwels" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then contrib/verify-commits/verify-commits.sh; fi
- export TRAVIS_COMMIT_LOG=`git log --format=fuller -1`
- if [ -n "$USE_SHELL" ]; then export CONFIG_SHELL="$USE_SHELL"; fi
- OUTDIR=$BASE_OUTDIR/$TRAVIS_PULL_REQUEST/$TRAVIS_JOB_NUMBER-$HOST
- BITCOIN_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
- STARWELS_CONFIG_ALL="--disable-dependency-tracking --prefix=$TRAVIS_BUILD_DIR/depends/$HOST --bindir=$OUTDIR/bin --libdir=$OUTDIR/lib"
- if [ -z "$NO_DEPENDS" ]; then depends/$HOST/native/bin/ccache --max-size=$CCACHE_SIZE; fi
- test -n "$USE_SHELL" && eval '"$USE_SHELL" -c "./autogen.sh"' || ./autogen.sh
- mkdir build && cd build
- ../configure --cache-file=config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- ../configure --cache-file=config.cache $STARWELS_CONFIG_ALL $STARWELS_CONFIG || ( cat config.log && false)
- make distdir VERSION=$HOST
- cd bitcoin-$HOST
- ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
- cd starwels-$HOST
- ./configure --cache-file=../config.cache $STARWELS_CONFIG_ALL $STARWELS_CONFIG || ( cat config.log && false)
- make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && make $GOAL V=1 ; false )
- export LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib
- if [ "$RUN_TESTS" = "true" ]; then travis_wait 30 make $MAKEJOBS check VERBOSE=1; fi

+ 3
- 3
.tx/config View File

@@ -1,7 +1,7 @@
[main]
host = https://www.transifex.com

[bitcoin.qt-translation-016x]
file_filter = src/qt/locale/bitcoin_<lang>.ts
source_file = src/qt/locale/bitcoin_en.ts
[starwels.qt-translation-016x]
file_filter = src/qt/locale/starwels_<lang>.ts
source_file = src/qt/locale/starwels_en.ts
source_lang = en

+ 11
- 11
CONTRIBUTING.md View File

@@ -1,7 +1,7 @@
Contributing to Bitcoin Core
Contributing to Starwels
============================

The Bitcoin Core project operates an open contributor model where anyone is
The Starwels project operates an open contributor model where anyone is
welcome to contribute towards development in the form of peer review, testing
and patches. This document explains the practical process and guidelines for
contributing.
@@ -57,12 +57,12 @@ the pull request affects. Valid areas as:

- *Consensus* for changes to consensus critical code
- *Docs* for changes to the documentation
- *Qt* for changes to bitcoin-qt
- *Qt* for changes to starwels-qt
- *Mining* for changes to the mining code
- *Net* or *P2P* for changes to the peer-to-peer network code
- *RPC/REST/ZMQ* for changes to the RPC, REST or ZMQ APIs
- *Scripts and tools* for changes to the scripts and tools
- *Tests* for changes to the bitcoin unit tests or QA tests
- *Tests* for changes to the starwels unit tests or QA tests
- *Trivial* should **only** be used for PRs that do not change generated
executable code. Notably, refactors (change of function arguments and code
reorganization) and changes in behavior should **not** be marked as trivial.
@@ -82,7 +82,7 @@ Examples:
Trivial: Fix typo in init.cpp

Note that translations should not be submitted as pull requests, please see
[Translation Process](https://github.com/bitcoin/bitcoin/blob/master/doc/translation_process.md)
[Translation Process](https://github.com/starwels/starwels/blob/master/doc/translation_process.md)
for more information on helping with translations.

If a pull request is not to be considered for merging (yet), please
@@ -169,11 +169,11 @@ workload on reviewing.
"Decision Making" Process
-------------------------

The following applies to code changes to the Bitcoin Core project (and related
projects such as libsecp256k1), and is not to be confused with overall Bitcoin
The following applies to code changes to the Starwels project (and related
projects such as libsecp256k1), and is not to be confused with overall Starwels
Network Protocol consensus changes.

Whether a pull request is merged into Bitcoin Core rests with the project merge
Whether a pull request is merged into Starwels rests with the project merge
maintainers and ultimately the project lead.

Maintainers will take into consideration if a patch is in line with the general
@@ -191,7 +191,7 @@ In general, all pull requests must:
- Where bugs are fixed, where possible, there should be unit tests
demonstrating the bug and also proving the fix. This helps prevent regression.

Patches that change Bitcoin consensus rules are considerably more involved than
Patches that change Starwels consensus rules are considerably more involved than
normal because they affect the entire ecosystem and so must be preceded by
extensive mailing list discussions and have a numbered BIP. While each case will
be different, one should be prepared to expend more time and effort than for
@@ -232,7 +232,7 @@ higher in terms of discussion and peer review requirements, keeping in mind that
mistakes could be very costly to the wider community. This includes refactoring
of consensus critical code.

Where a patch set proposes to change the Bitcoin consensus, it must have been
Where a patch set proposes to change the Starwels consensus, it must have been
discussed extensively on the mailing list and IRC, be accompanied by a widely
discussed BIP and have a generally widely perceived technical consensus of being
a worthwhile change based on the judgement of the maintainers.
@@ -272,7 +272,7 @@ about:
Release Policy
--------------

The project leader is the release manager for each Bitcoin Core release.
The project leader is the release manager for each Starwels release.

Copyright
---------

+ 2
- 2
COPYING View File

@@ -1,7 +1,7 @@
The MIT License (MIT)

Copyright (c) 2009-2018 The Bitcoin Core developers
Copyright (c) 2009-2018 Bitcoin Developers
Copyright (c) 2009-2018 The Starwels developers
Copyright (c) 2009-2018 Starwels Developers

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

+ 2
- 2
INSTALL.md View File

@@ -1,5 +1,5 @@
Building Bitcoin
Building Starwels
================

See doc/build-*.md for instructions on building the various
elements of the Bitcoin Core reference implementation of Bitcoin.
elements of the Starwels reference implementation of Starwels.

+ 43
- 43
Makefile.am View File

@@ -1,4 +1,4 @@
# Copyright (c) 2013-2016 The Bitcoin Core developers
# Copyright (c) 2013-2016 The Starwels developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

@@ -11,20 +11,20 @@ endif

export PYTHONPATH

if BUILD_BITCOIN_LIBS
if BUILD_STARWELS_LIBS
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libbitcoinconsensus.pc
pkgconfig_DATA = libstarwelsconsensus.pc
endif

BITCOIND_BIN=$(top_builddir)/src/$(BITCOIN_DAEMON_NAME)$(EXEEXT)
BITCOIN_QT_BIN=$(top_builddir)/src/qt/$(BITCOIN_GUI_NAME)$(EXEEXT)
BITCOIN_CLI_BIN=$(top_builddir)/src/$(BITCOIN_CLI_NAME)$(EXEEXT)
BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
STARWELSD_BIN=$(top_builddir)/src/$(STARWELS_DAEMON_NAME)$(EXEEXT)
STARWELS_QT_BIN=$(top_builddir)/src/qt/$(STARWELS_GUI_NAME)$(EXEEXT)
STARWELS_CLI_BIN=$(top_builddir)/src/$(STARWELS_CLI_NAME)$(EXEEXT)
STARWELS_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)

empty :=
space := $(empty) $(empty)

OSX_APP=Bitcoin-Qt.app
OSX_APP=Starwels-Qt.app
OSX_VOLNAME = $(subst $(space),-,$(PACKAGE_NAME))
OSX_DMG = $(OSX_VOLNAME).dmg
OSX_BACKGROUND_SVG=background.svg
@@ -33,14 +33,14 @@ OSX_BACKGROUND_IMAGE_DPIS=36 72
OSX_DSSTORE_GEN=$(top_srcdir)/contrib/macdeploy/custom_dsstore.py
OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/starwels.icns
OSX_PLIST=$(top_builddir)/share/qt/Info.plist #not installed
OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW

DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
DIST_CONTRIB = $(top_srcdir)/contrib/bitcoin-cli.bash-completion \
$(top_srcdir)/contrib/bitcoin-tx.bash-completion \
$(top_srcdir)/contrib/bitcoind.bash-completion \
DIST_CONTRIB = $(top_srcdir)/contrib/starwels-cli.bash-completion \
$(top_srcdir)/contrib/starwels-tx.bash-completion \
$(top_srcdir)/contrib/starwelsd.bash-completion \
$(top_srcdir)/contrib/init \
$(top_srcdir)/contrib/install_db4.sh \
$(top_srcdir)/contrib/rpm
@@ -51,7 +51,7 @@ DIST_SHARE = \
BIN_CHECKS=$(top_srcdir)/contrib/devtools/symbol-check.py \
$(top_srcdir)/contrib/devtools/security-check.py

WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/starwels.ico \
$(top_srcdir)/share/pixmaps/nsis-header.bmp \
$(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
$(top_srcdir)/doc/README_windows.txt
@@ -63,18 +63,18 @@ OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
$(top_srcdir)/contrib/macdeploy/detached-sig-create.sh

COVERAGE_INFO = baseline.info \
test_bitcoin_filtered.info total_coverage.info \
test_starwels_filtered.info total_coverage.info \
baseline_filtered.info functional_test.info functional_test_filtered.info \
test_bitcoin_coverage.info test_bitcoin.info
test_starwels_coverage.info test_starwels.info

dist-hook:
-$(GIT) archive --format=tar HEAD -- src/clientversion.cpp | $(AMTAR) -C $(top_distdir) -xf -

$(BITCOIN_WIN_INSTALLER): all-recursive
$(STARWELS_WIN_INSTALLER): all-recursive
$(MKDIR_P) $(top_builddir)/release
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
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(STARWELSD_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(STARWELS_QT_BIN) $(top_builddir)/release
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(STARWELS_CLI_BIN) $(top_builddir)/release
@test -f $(MAKENSIS) && $(MAKENSIS) -V2 $(top_builddir)/share/setup.nsi || \
echo error: could not build $@
@echo built $@
@@ -91,11 +91,11 @@ $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
$(OSX_APP)/Contents/Resources/starwels.icns: $(OSX_INSTALLER_ICONS)
$(MKDIR_P) $(@D)
$(INSTALL_DATA) $< $@

$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
$(OSX_APP)/Contents/MacOS/Starwels-Qt: $(STARWELS_QT_BIN)
$(MKDIR_P) $(@D)
STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $< $@

@@ -104,8 +104,8 @@ $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings:
echo '{ CFBundleDisplayName = "$(PACKAGE_NAME)"; CFBundleName = "$(PACKAGE_NAME)"; }' > $@

OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
$(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/Bitcoin-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings
$(OSX_APP)/Contents/Resources/starwels.icns $(OSX_APP)/Contents/Info.plist \
$(OSX_APP)/Contents/MacOS/Starwels-Qt $(OSX_APP)/Contents/Resources/Base.lproj/InfoPlist.strings

osx_volname:
echo $(OSX_VOLNAME) >$@
@@ -130,7 +130,7 @@ $(APP_DIST_DIR)/Applications:
@rm -f $@
@cd $(@D); $(LN_S) /Applications $(@F)

$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt
$(APP_DIST_EXTRAS): $(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Starwels-Qt

$(OSX_DMG): $(APP_DIST_EXTRAS)
$(GENISOIMAGE) -no-cache-inodes -D -l -probe -V "$(OSX_VOLNAME)" -no-pad -r -dir-mode 0755 -apple -o $@ dist
@@ -145,7 +145,7 @@ $(APP_DIST_DIR)/.background/$(OSX_BACKGROUND_IMAGE): $(OSX_BACKGROUND_IMAGE_DPIF
$(APP_DIST_DIR)/.DS_Store: $(OSX_DSSTORE_GEN)
$(PYTHON) $< "$@" "$(OSX_VOLNAME)"

$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
$(APP_DIST_DIR)/$(OSX_APP)/Contents/MacOS/Starwels-Qt: $(OSX_APP_BUILT) $(OSX_PACKAGING)
INSTALLNAMETOOL=$(INSTALLNAMETOOL) OTOOL=$(OTOOL) STRIP=$(STRIP) $(PYTHON) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -translations-dir=$(QT_TRANSLATION_DIR) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2

deploydir: $(APP_DIST_EXTRAS)
@@ -156,16 +156,16 @@ appbundle: $(OSX_APP_BUILT)
deploy: $(OSX_DMG)
endif
if TARGET_WINDOWS
deploy: $(BITCOIN_WIN_INSTALLER)
deploy: $(STARWELS_WIN_INSTALLER)
endif

$(BITCOIN_QT_BIN): FORCE
$(STARWELS_QT_BIN): FORCE
$(MAKE) -C src qt/$(@F)

$(BITCOIND_BIN): FORCE
$(STARWELSD_BIN): FORCE
$(MAKE) -C src $(@F)

$(BITCOIN_CLI_BIN): FORCE
$(STARWELS_CLI_BIN): FORCE
$(MAKE) -C src $(@F)

if USE_LCOV
@@ -178,16 +178,16 @@ baseline_filtered.info: baseline.info
$(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@
$(LCOV) -a $@ $(LCOV_OPTS) -o $@

test_bitcoin.info: baseline_filtered.info
test_starwels.info: baseline_filtered.info
$(MAKE) -C src/ check
$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_bitcoin -o $@
$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src -t test_starwels -o $@
$(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src

test_bitcoin_filtered.info: test_bitcoin.info
test_starwels_filtered.info: test_starwels.info
$(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@
$(LCOV) -a $@ $(LCOV_OPTS) -o $@

functional_test.info: test_bitcoin_filtered.info
functional_test.info: test_starwels_filtered.info
-@TIMEOUT=15 test/functional/test_runner.py $(EXTENDED_FUNCTIONAL_TESTS)
$(LCOV) -c $(LCOV_OPTS) -d $(abs_builddir)/src --t functional-tests -o $@
$(LCOV) -z $(LCOV_OPTS) -d $(abs_builddir)/src
@@ -196,13 +196,13 @@ functional_test_filtered.info: functional_test.info
$(abs_builddir)/contrib/filter-lcov.py $(LCOV_FILTER_PATTERN) $< $@
$(LCOV) -a $@ $(LCOV_OPTS) -o $@

test_bitcoin_coverage.info: baseline_filtered.info test_bitcoin_filtered.info
$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -o $@
test_starwels_coverage.info: baseline_filtered.info test_starwels_filtered.info
$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_starwels_filtered.info -o $@

total_coverage.info: test_bitcoin_filtered.info functional_test_filtered.info
$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_bitcoin_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
total_coverage.info: test_starwels_filtered.info functional_test_filtered.info
$(LCOV) -a $(LCOV_OPTS) baseline_filtered.info -a test_starwels_filtered.info -a functional_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt

test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
test_starwels.coverage/.dirstamp: test_starwels_coverage.info
$(GENHTML) -s $(LCOV_OPTS) $< -o $(@D)
@touch $@

@@ -210,7 +210,7 @@ total.coverage/.dirstamp: total_coverage.info
$(GENHTML) -s $(LCOV_OPTS) $< -o $(@D)
@touch $@

cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
cov: test_starwels.coverage/.dirstamp total.coverage/.dirstamp

endif

@@ -219,8 +219,8 @@ dist_noinst_SCRIPTS = autogen.sh
EXTRA_DIST = $(DIST_SHARE) test/functional/test_runner.py test/functional $(DIST_CONTRIB) $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING) $(BIN_CHECKS)

EXTRA_DIST += \
test/util/bitcoin-util-test.py \
test/util/data/bitcoin-util-test.json \
test/util/starwels-util-test.py \
test/util/data/starwels-util-test.json \
test/util/data/blanktxv1.hex \
test/util/data/blanktxv1.json \
test/util/data/blanktxv2.hex \
@@ -271,12 +271,12 @@ EXTRA_DIST += \
test/util/data/txcreatesignv1.json \
test/util/data/txcreatesignv2.hex

CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
CLEANFILES = $(OSX_DMG) $(STARWELS_WIN_INSTALLER)

.INTERMEDIATE: $(COVERAGE_INFO)

DISTCHECK_CONFIGURE_FLAGS = --enable-man

clean-local:
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
rm -rf coverage_percent.txt test_starwels.coverage/ total.coverage/ test/tmp/ cache/ $(OSX_APP)
rm -rf test/functional/__pycache__ test/functional/test_framework/__pycache__ test/cache

+ 10
- 12
README.md View File

@@ -1,35 +1,33 @@
Bitcoin Core integration/staging tree
Starwels integration/staging tree
=====================================

[![Build Status](https://travis-ci.org/bitcoin/bitcoin.svg?branch=master)](https://travis-ci.org/bitcoin/bitcoin)

https://bitcoincore.org

What is Bitcoin?
What is Starwels?
----------------

Bitcoin is an experimental digital currency that enables instant payments to
anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
Starwels is an experimental digital currency that enables instant payments to
anyone, anywhere in the world. Starwels uses peer-to-peer technology to operate
with no central authority: managing transactions and issuing money are carried
out collectively by the network. Bitcoin Core is the name of open source
out collectively by the network. Starwels is the name of open source
software which enables the use of this currency.

For more information, as well as an immediately useable, binary version of
the Bitcoin Core software, see https://bitcoin.org/en/download, or read the
the Starwels software, see https://github.com/starwels/starwels/releases, or read the
[original whitepaper](https://bitcoincore.org/bitcoin.pdf).

License
-------

Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
Starwels is released under the terms of the MIT license. See [COPYING](COPYING) for more
information or see https://opensource.org/licenses/MIT.

Development Process
-------------------

The `master` branch is regularly built and tested, but is not guaranteed to be
completely stable. [Tags](https://github.com/bitcoin/bitcoin/tags) are created
regularly to indicate new official, stable release versions of Bitcoin Core.
completely stable. [Tags](https://github.com/starwels/starwels/tags) are created
regularly to indicate new official, stable release versions of Starwels.

The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md).

@@ -37,7 +35,7 @@ The developer [mailing list](https://lists.linuxfoundation.org/mailman/listinfo/
should be used to discuss complicated or controversial changes before working
on a patch set.

Developer IRC can be found on Freenode at #bitcoin-core-dev.
Developer IRC can be found on Freenode at #starwels-dev.

Testing
-------

+ 1
- 1
autogen.sh View File

@@ -1,5 +1,5 @@
#!/bin/sh
# Copyright (c) 2013-2016 The Bitcoin Core developers
# Copyright (c) 2013-2016 The Starwels developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.


build-aux/m4/bitcoin_find_bdb48.m4 → build-aux/m4/starwels_find_bdb48.m4 View File

@@ -1,8 +1,8 @@
dnl Copyright (c) 2013-2015 The Bitcoin Core developers
dnl Copyright (c) 2013-2015 The Starwels developers
dnl Distributed under the MIT software license, see the accompanying
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.

AC_DEFUN([BITCOIN_FIND_BDB48],[
AC_DEFUN([STARWELS_FIND_BDB48],[
AC_ARG_VAR(BDB_CFLAGS, [C compiler flags for BerkeleyDB, bypasses autodetection])
AC_ARG_VAR(BDB_LIBS, [Linker flags for BerkeleyDB, bypasses autodetection])

@@ -47,14 +47,14 @@ AC_DEFUN([BITCOIN_FIND_BDB48],[
AC_MSG_RESULT([no])
AC_MSG_ERROR([libdb_cxx headers missing, ]AC_PACKAGE_NAME[ requires this library for wallet functionality (--disable-wallet to disable wallet functionality)])
elif test "x$bdb48path" = "xX"; then
BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
STARWELS_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdbpath}],db_cxx)
AC_ARG_WITH([incompatible-bdb],[AS_HELP_STRING([--with-incompatible-bdb], [allow using a bdb version other than 4.8])],[
AC_MSG_WARN([Found Berkeley DB other than 4.8; wallets opened by this build will not be portable!])
],[
AC_MSG_ERROR([Found Berkeley DB other than 4.8, required for portable wallets (--with-incompatible-bdb to ignore or --disable-wallet to disable wallet functionality)])
])
else
BITCOIN_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx)
STARWELS_SUBDIR_TO_INCLUDE(BDB_CPPFLAGS,[${bdb48path}],db_cxx)
bdbpath="${bdb48path}"
fi
else

build-aux/m4/bitcoin_qt.m4 → build-aux/m4/starwels_qt.m4 View File

@@ -1,23 +1,23 @@
dnl Copyright (c) 2013-2016 The Bitcoin Core developers
dnl Copyright (c) 2013-2016 The Starwels developers
dnl Distributed under the MIT software license, see the accompanying
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.

dnl Helper for cases where a qt dependency is not met.
dnl Output: If qt version is auto, set bitcoin_enable_qt to false. Else, exit.
AC_DEFUN([BITCOIN_QT_FAIL],[
if test "x$bitcoin_qt_want_version" = xauto && test "x$bitcoin_qt_force" != xyes; then
if test "x$bitcoin_enable_qt" != xno; then
AC_MSG_WARN([$1; bitcoin-qt frontend will not be built])
dnl Output: If qt version is auto, set starwels_enable_qt to false. Else, exit.
AC_DEFUN([STARWELS_QT_FAIL],[
if test "x$starwels_qt_want_version" = xauto && test "x$starwels_qt_force" != xyes; then
if test "x$starwels_enable_qt" != xno; then
AC_MSG_WARN([$1; starwels-qt frontend will not be built])
fi
bitcoin_enable_qt=no
bitcoin_enable_qt_test=no
starwels_enable_qt=no
starwels_enable_qt_test=no
else
AC_MSG_ERROR([$1])
fi
])

AC_DEFUN([BITCOIN_QT_CHECK],[
if test "x$bitcoin_enable_qt" != xno && test "x$bitcoin_qt_want_version" != xno; then
AC_DEFUN([STARWELS_QT_CHECK],[
if test "x$starwels_enable_qt" != xno && test "x$starwels_qt_want_version" != xno; then
true
$1
else
@@ -26,43 +26,43 @@ AC_DEFUN([BITCOIN_QT_CHECK],[
fi
])

dnl BITCOIN_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing])
dnl STARWELS_QT_PATH_PROGS([FOO], [foo foo2], [/path/to/search/first], [continue if missing])
dnl Helper for finding the path of programs needed for Qt.
dnl Inputs: $1: Variable to be set
dnl Inputs: $2: List of programs to search for
dnl Inputs: $3: Look for $2 here before $PATH
dnl Inputs: $4: If "yes", don't fail if $2 is not found.
dnl Output: $1 is set to the path of $2 if found. $2 are searched in order.
AC_DEFUN([BITCOIN_QT_PATH_PROGS],[
BITCOIN_QT_CHECK([
AC_DEFUN([STARWELS_QT_PATH_PROGS],[
STARWELS_QT_CHECK([
if test "x$3" != x; then
AC_PATH_PROGS($1,$2,,$3)
else
AC_PATH_PROGS($1,$2)
fi
if test "x$$1" = x && test "x$4" != xyes; then
BITCOIN_QT_FAIL([$1 not found])
STARWELS_QT_FAIL([$1 not found])
fi
])
])

dnl Initialize qt input.
dnl This must be called before any other BITCOIN_QT* macros to ensure that
dnl This must be called before any other STARWELS_QT* macros to ensure that
dnl input variables are set correctly.
dnl CAUTION: Do not use this inside of a conditional.
AC_DEFUN([BITCOIN_QT_INIT],[
AC_DEFUN([STARWELS_QT_INIT],[
dnl enable qt support
AC_ARG_WITH([gui],
[AS_HELP_STRING([--with-gui@<:@=no|qt4|qt5|auto@:>@],
[build bitcoin-qt GUI (default=auto, qt5 tried first)])],
[build starwels-qt GUI (default=auto, qt5 tried first)])],
[
bitcoin_qt_want_version=$withval
if test "x$bitcoin_qt_want_version" = xyes; then
bitcoin_qt_force=yes
bitcoin_qt_want_version=auto
starwels_qt_want_version=$withval
if test "x$starwels_qt_want_version" = xyes; then
starwels_qt_force=yes
starwels_qt_want_version=auto
fi
],
[bitcoin_qt_want_version=auto])
[starwels_qt_want_version=auto])

AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], [])
AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-qt-libdir=LIB_DIR],[specify qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], [])
@@ -83,10 +83,10 @@ dnl Find the appropriate version of Qt libraries and includes.
dnl Inputs: $1: Whether or not pkg-config should be used. yes|no. Default: yes.
dnl Inputs: $2: If $1 is "yes" and --with-gui=auto, which qt version should be
dnl tried first.
dnl Outputs: See _BITCOIN_QT_FIND_LIBS_*
dnl Outputs: See _STARWELS_QT_FIND_LIBS_*
dnl Outputs: Sets variables for all qt-related tools.
dnl Outputs: bitcoin_enable_qt, bitcoin_enable_qt_dbus, bitcoin_enable_qt_test
AC_DEFUN([BITCOIN_QT_CONFIGURE],[
dnl Outputs: starwels_enable_qt, starwels_enable_qt_dbus, starwels_enable_qt_test
AC_DEFUN([STARWELS_QT_CONFIGURE],[
use_pkgconfig=$1

if test "x$use_pkgconfig" = x; then
@@ -94,9 +94,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
fi

if test "x$use_pkgconfig" = xyes; then
BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG([$2])])
STARWELS_QT_CHECK([_STARWELS_QT_FIND_LIBS_WITH_PKGCONFIG([$2])])
else
BITCOIN_QT_CHECK([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG])
STARWELS_QT_CHECK([_STARWELS_QT_FIND_LIBS_WITHOUT_PKGCONFIG])
fi

dnl This is ugly and complicated. Yuck. Works as follows:
@@ -106,19 +106,19 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
dnl Qt4 and Qt5. With Qt5, languages moved into core and the WindowsIntegration
dnl plugin was added. Since we can't tell if Qt4 is static or not, it is
dnl assumed for windows builds.
dnl _BITCOIN_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the
dnl _STARWELS_QT_CHECK_STATIC_PLUGINS does a quick link-check and appends the
dnl results to QT_LIBS.
BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
TEMP_CPPFLAGS=$CPPFLAGS
TEMP_CXXFLAGS=$CXXFLAGS
CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
CXXFLAGS="$PIC_FLAGS $CXXFLAGS"
if test "x$bitcoin_qt_got_major_vers" = x5; then
_BITCOIN_QT_IS_STATIC
if test "x$bitcoin_cv_static_qt" = xyes; then
_BITCOIN_QT_FIND_STATIC_PLUGINS
if test "x$starwels_qt_got_major_vers" = x5; then
_STARWELS_QT_IS_STATIC
if test "x$starwels_cv_static_qt" = xyes; then
_STARWELS_QT_FIND_STATIC_PLUGINS
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
AC_CACHE_CHECK(for Qt < 5.4, bitcoin_cv_need_acc_widget,[
AC_CACHE_CHECK(for Qt < 5.4, starwels_cv_need_acc_widget,[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <QtCore/qconfig.h>
#ifndef QT_VERSION
@@ -130,30 +130,30 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
choke
#endif
]])],
[bitcoin_cv_need_acc_widget=yes],
[bitcoin_cv_need_acc_widget=no])
[starwels_cv_need_acc_widget=yes],
[starwels_cv_need_acc_widget=no])
])
if test "x$bitcoin_cv_need_acc_widget" = xyes; then
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
if test "x$starwels_cv_need_acc_widget" = xyes; then
_STARWELS_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(AccessibleFactory)], [-lqtaccessiblewidgets])
fi
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal])
_STARWELS_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QMinimalIntegrationPlugin)],[-lqminimal])
AC_DEFINE(QT_QPA_PLATFORM_MINIMAL, 1, [Define this symbol if the minimal qt platform exists])
if test "x$TARGET_OS" = xwindows; then
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows])
_STARWELS_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin)],[-lqwindows])
AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows])
elif test "x$TARGET_OS" = xlinux; then
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static])
_STARWELS_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)],[-lqxcb -lxcb-static])
AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb])
elif test "x$TARGET_OS" = xdarwin; then
AX_CHECK_LINK_FLAG([[-framework IOKit]],[QT_LIBS="$QT_LIBS -framework IOKit"],[AC_MSG_ERROR(could not iokit framework)])
_BITCOIN_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa])
_STARWELS_QT_CHECK_STATIC_PLUGINS([Q_IMPORT_PLUGIN(QCocoaIntegrationPlugin)],[-lqcocoa])
AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa])
fi
fi
else
if test "x$TARGET_OS" = xwindows; then
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol if qt plugins are static])
_BITCOIN_QT_CHECK_STATIC_PLUGINS([
_STARWELS_QT_CHECK_STATIC_PLUGINS([
Q_IMPORT_PLUGIN(qcncodecs)
Q_IMPORT_PLUGIN(qjpcodecs)
Q_IMPORT_PLUGIN(qtwcodecs)
@@ -167,13 +167,13 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
])

if test "x$use_pkgconfig$qt_bin_path" = xyes; then
if test "x$bitcoin_qt_got_major_vers" = x5; then
if test "x$starwels_qt_got_major_vers" = x5; then
qt_bin_path="`$PKG_CONFIG --variable=host_bins Qt5Core 2>/dev/null`"
fi
fi

if test "x$use_hardening" != xno; then
BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
AC_MSG_CHECKING(whether -fPIE can be used with this Qt config)
TEMP_CPPFLAGS=$CPPFLAGS
TEMP_CXXFLAGS=$CXXFLAGS
@@ -197,7 +197,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
CXXFLAGS=$TEMP_CXXFLAGS
])
else
BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
AC_MSG_CHECKING(whether -fPIC is needed with this Qt config)
TEMP_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
@@ -219,23 +219,23 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
])
fi

BITCOIN_QT_PATH_PROGS([MOC], [moc-qt${bitcoin_qt_got_major_vers} moc${bitcoin_qt_got_major_vers} moc], $qt_bin_path)
BITCOIN_QT_PATH_PROGS([UIC], [uic-qt${bitcoin_qt_got_major_vers} uic${bitcoin_qt_got_major_vers} uic], $qt_bin_path)
BITCOIN_QT_PATH_PROGS([RCC], [rcc-qt${bitcoin_qt_got_major_vers} rcc${bitcoin_qt_got_major_vers} rcc], $qt_bin_path)
BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt${bitcoin_qt_got_major_vers} lrelease${bitcoin_qt_got_major_vers} lrelease], $qt_bin_path)
BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt${bitcoin_qt_got_major_vers} lupdate${bitcoin_qt_got_major_vers} lupdate],$qt_bin_path, yes)
STARWELS_QT_PATH_PROGS([MOC], [moc-qt${starwels_qt_got_major_vers} moc${starwels_qt_got_major_vers} moc], $qt_bin_path)
STARWELS_QT_PATH_PROGS([UIC], [uic-qt${starwels_qt_got_major_vers} uic${starwels_qt_got_major_vers} uic], $qt_bin_path)
STARWELS_QT_PATH_PROGS([RCC], [rcc-qt${starwels_qt_got_major_vers} rcc${starwels_qt_got_major_vers} rcc], $qt_bin_path)
STARWELS_QT_PATH_PROGS([LRELEASE], [lrelease-qt${starwels_qt_got_major_vers} lrelease${starwels_qt_got_major_vers} lrelease], $qt_bin_path)
STARWELS_QT_PATH_PROGS([LUPDATE], [lupdate-qt${starwels_qt_got_major_vers} lupdate${starwels_qt_got_major_vers} lupdate],$qt_bin_path, yes)

MOC_DEFS='-DHAVE_CONFIG_H -I$(srcdir)'
case $host in
*darwin*)
BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
MOC_DEFS="${MOC_DEFS} -DQ_OS_MAC"
base_frameworks="-framework Foundation -framework ApplicationServices -framework AppKit"
AX_CHECK_LINK_FLAG([[$base_frameworks]],[QT_LIBS="$QT_LIBS $base_frameworks"],[AC_MSG_ERROR(could not find base frameworks)])
])
;;
*mingw*)
BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
AX_CHECK_LINK_FLAG([[-mwindows]],[QT_LDFLAGS="$QT_LDFLAGS -mwindows"],[AC_MSG_WARN(-mwindows linker support not detected)])
])
esac
@@ -243,15 +243,15 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[

dnl enable qt support
AC_MSG_CHECKING(whether to build ]AC_PACKAGE_NAME[ GUI)
BITCOIN_QT_CHECK([
bitcoin_enable_qt=yes
bitcoin_enable_qt_test=yes
STARWELS_QT_CHECK([
starwels_enable_qt=yes
starwels_enable_qt_test=yes
if test "x$have_qt_test" = xno; then
bitcoin_enable_qt_test=no
starwels_enable_qt_test=no
fi
bitcoin_enable_qt_dbus=no
starwels_enable_qt_dbus=no
if test "x$use_dbus" != xno && test "x$have_qt_dbus" = xyes; then
bitcoin_enable_qt_dbus=yes
starwels_enable_qt_dbus=yes
fi
if test "x$use_dbus" = xyes && test "x$have_qt_dbus" = xno; then
AC_MSG_ERROR([libQtDBus not found. Install libQtDBus or remove --with-qtdbus.])
@@ -260,9 +260,9 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
AC_MSG_WARN([lupdate is required to update qt translations])
fi
],[
bitcoin_enable_qt=no
starwels_enable_qt=no
])
AC_MSG_RESULT([$bitcoin_enable_qt (Qt${bitcoin_qt_got_major_vers})])
AC_MSG_RESULT([$starwels_enable_qt (Qt${starwels_qt_got_major_vers})])

AC_SUBST(QT_PIE_FLAGS)
AC_SUBST(QT_INCLUDES)
@@ -272,7 +272,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
AC_SUBST(QT_DBUS_LIBS)
AC_SUBST(QT_TEST_INCLUDES)
AC_SUBST(QT_TEST_LIBS)
AC_SUBST(QT_SELECT, qt${bitcoin_qt_got_major_vers})
AC_SUBST(QT_SELECT, qt${starwels_qt_got_major_vers})
AC_SUBST(MOC_DEFS)
])

@@ -282,9 +282,9 @@ dnl ----

dnl Internal. Check if the included version of Qt is Qt5.
dnl Requires: INCLUDES must be populated as necessary.
dnl Output: bitcoin_cv_qt5=yes|no
AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
AC_CACHE_CHECK(for Qt 5, bitcoin_cv_qt5,[
dnl Output: starwels_cv_qt5=yes|no
AC_DEFUN([_STARWELS_QT_CHECK_QT5],[
AC_CACHE_CHECK(for Qt 5, starwels_cv_qt5,[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <QtCore/qconfig.h>
#ifndef QT_VERSION
@@ -296,17 +296,17 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT5],[
choke
#endif
]])],
[bitcoin_cv_qt5=yes],
[bitcoin_cv_qt5=no])
[starwels_cv_qt5=yes],
[starwels_cv_qt5=no])
])])

dnl Internal. Check if the linked version of Qt was built as static libs.
dnl Requires: Qt5. This check cannot determine if Qt4 is static.
dnl Requires: INCLUDES and LIBS must be populated as necessary.
dnl Output: bitcoin_cv_static_qt=yes|no
dnl Output: starwels_cv_static_qt=yes|no
dnl Output: Defines QT_STATICPLUGIN if plugins are static.
AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
AC_CACHE_CHECK(for static Qt, bitcoin_cv_static_qt,[
AC_DEFUN([_STARWELS_QT_IS_STATIC],[
AC_CACHE_CHECK(for static Qt, starwels_cv_static_qt,[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <QtCore/qconfig.h>
#ifndef QT_VERSION
@@ -318,10 +318,10 @@ AC_DEFUN([_BITCOIN_QT_IS_STATIC],[
choke
#endif
]])],
[bitcoin_cv_static_qt=yes],
[bitcoin_cv_static_qt=no])
[starwels_cv_static_qt=yes],
[starwels_cv_static_qt=no])
])
if test "x$bitcoin_cv_static_qt" = xyes; then
if test "x$starwels_cv_static_qt" = xyes; then
AC_DEFINE(QT_STATICPLUGIN, 1, [Define this symbol for static Qt plugins])
fi
])
@@ -331,7 +331,7 @@ dnl Requires: INCLUDES and LIBS must be populated as necessary.
dnl Inputs: $1: A series of Q_IMPORT_PLUGIN().
dnl Inputs: $2: The libraries that resolve $1.
dnl Output: QT_LIBS is prepended or configure exits.
AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
AC_DEFUN([_STARWELS_QT_CHECK_STATIC_PLUGINS],[
AC_MSG_CHECKING(for static Qt plugins: $2)
CHECK_STATIC_PLUGINS_TEMP_LIBS="$LIBS"
LIBS="$2 $QT_LIBS $LIBS"
@@ -341,16 +341,16 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_PLUGINS],[
$1]],
[[return 0;]])],
[AC_MSG_RESULT(yes); QT_LIBS="$2 $QT_LIBS"],
[AC_MSG_RESULT(no); BITCOIN_QT_FAIL(Could not resolve: $2)])
[AC_MSG_RESULT(no); STARWELS_QT_FAIL(Could not resolve: $2)])
LIBS="$CHECK_STATIC_PLUGINS_TEMP_LIBS"
])

dnl Internal. Find paths necessary for linking qt static plugins
dnl Inputs: bitcoin_qt_got_major_vers. 4 or 5.
dnl Inputs: starwels_qt_got_major_vers. 4 or 5.
dnl Inputs: qt_plugin_path. optional.
dnl Outputs: QT_LIBS is appended
AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
if test "x$bitcoin_qt_got_major_vers" = x5; then
AC_DEFUN([_STARWELS_QT_FIND_STATIC_PLUGINS],[
if test "x$starwels_qt_got_major_vers" = x5; then
if test "x$qt_plugin_path" != x; then
QT_LIBS="$QT_LIBS -L$qt_plugin_path/platforms"
if test -d "$qt_plugin_path/accessible"; then
@@ -372,7 +372,7 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
])
else
if test "x$TARGET_OS" = xwindows; then
AC_CACHE_CHECK(for Qt >= 5.6, bitcoin_cv_need_platformsupport,[
AC_CACHE_CHECK(for Qt >= 5.6, starwels_cv_need_platformsupport,[
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <QtCore/qconfig.h>
#ifndef QT_VERSION
@@ -384,11 +384,11 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
choke
#endif
]])],
[bitcoin_cv_need_platformsupport=yes],
[bitcoin_cv_need_platformsupport=no])
[starwels_cv_need_platformsupport=yes],
[starwels_cv_need_platformsupport=no])
])
if test "x$bitcoin_cv_need_platformsupport" = xyes; then
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}PlatformSupport not found)))
if test "x$starwels_cv_need_platformsupport" = xyes; then
STARWELS_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}PlatformSupport],[main],,STARWELS_QT_FAIL(lib${QT_LIB_PREFIX}PlatformSupport not found)))
fi
fi
fi
@@ -401,49 +401,49 @@ AC_DEFUN([_BITCOIN_QT_FIND_STATIC_PLUGINS],[
])

dnl Internal. Find Qt libraries using pkg-config.
dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to check
dnl Inputs: starwels_qt_want_version (from --with-gui=). The version to check
dnl first.
dnl Inputs: $1: If bitcoin_qt_want_version is "auto", check for this version
dnl Inputs: $1: If starwels_qt_want_version is "auto", check for this version
dnl first.
dnl Outputs: All necessary QT_* variables are set.
dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5".
dnl Outputs: starwels_qt_got_major_vers is set to "4" or "5".
dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[
AC_DEFUN([_STARWELS_QT_FIND_LIBS_WITH_PKGCONFIG],[
m4_ifdef([PKG_CHECK_MODULES],[
auto_priority_version=$1
if test "x$auto_priority_version" = x; then
auto_priority_version=qt5
fi
if test "x$bitcoin_qt_want_version" = xqt5 || ( test "x$bitcoin_qt_want_version" = xauto && test "x$auto_priority_version" = xqt5 ); then
if test "x$starwels_qt_want_version" = xqt5 || ( test "x$starwels_qt_want_version" = xauto && test "x$auto_priority_version" = xqt5 ); then
QT_LIB_PREFIX=Qt5
bitcoin_qt_got_major_vers=5
starwels_qt_got_major_vers=5
else
QT_LIB_PREFIX=Qt
bitcoin_qt_got_major_vers=4
starwels_qt_got_major_vers=4
fi
qt5_modules="Qt5Core Qt5Gui Qt5Network Qt5Widgets"
qt4_modules="QtCore QtGui QtNetwork"
BITCOIN_QT_CHECK([
if test "x$bitcoin_qt_want_version" = xqt5 || ( test "x$bitcoin_qt_want_version" = xauto && test "x$auto_priority_version" = xqt5 ); then
STARWELS_QT_CHECK([
if test "x$starwels_qt_want_version" = xqt5 || ( test "x$starwels_qt_want_version" = xauto && test "x$auto_priority_version" = xqt5 ); then
PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" have_qt=yes],[have_qt=no])
elif test "x$bitcoin_qt_want_version" = xqt4 || ( test "x$bitcoin_qt_want_version" = xauto && test "x$auto_priority_version" = xqt4 ); then
elif test "x$starwels_qt_want_version" = xqt4 || ( test "x$starwels_qt_want_version" = xauto && test "x$auto_priority_version" = xqt4 ); then
PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes], [have_qt=no])
fi

dnl qt version is set to 'auto' and the preferred version wasn't found. Now try the other.
if test "x$have_qt" = xno && test "x$bitcoin_qt_want_version" = xauto; then
if test "x$have_qt" = xno && test "x$starwels_qt_want_version" = xauto; then
if test "x$auto_priority_version" = xqt5; then
PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt; bitcoin_qt_got_major_vers=4], [have_qt=no])
PKG_CHECK_MODULES([QT4], [$qt4_modules], [QT_INCLUDES="$QT4_CFLAGS"; QT_LIBS="$QT4_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt; starwels_qt_got_major_vers=4], [have_qt=no])
else
PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt5; bitcoin_qt_got_major_vers=5], [have_qt=no])
PKG_CHECK_MODULES([QT5], [$qt5_modules], [QT_INCLUDES="$QT5_CFLAGS"; QT_LIBS="$QT5_LIBS" ; have_qt=yes; QT_LIB_PREFIX=Qt5; starwels_qt_got_major_vers=5], [have_qt=no])
fi
fi
if test "x$have_qt" != xyes; then
have_qt=no
BITCOIN_QT_FAIL([Qt dependencies not found])
STARWELS_QT_FAIL([Qt dependencies not found])
fi
])
BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
PKG_CHECK_MODULES([QT_TEST], [${QT_LIB_PREFIX}Test], [QT_TEST_INCLUDES="$QT_TEST_CFLAGS"; have_qt_test=yes], [have_qt_test=no])
if test "x$use_dbus" != xno; then
PKG_CHECK_MODULES([QT_DBUS], [${QT_LIB_PREFIX}DBus], [QT_DBUS_INCLUDES="$QT_DBUS_CFLAGS"; have_qt_dbus=yes], [have_qt_dbus=no])
@@ -455,66 +455,66 @@ AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITH_PKGCONFIG],[

dnl Internal. Find Qt libraries without using pkg-config. Version is deduced
dnl from the discovered headers.
dnl Inputs: bitcoin_qt_want_version (from --with-gui=). The version to use.
dnl If "auto", the version will be discovered by _BITCOIN_QT_CHECK_QT5.
dnl Inputs: starwels_qt_want_version (from --with-gui=). The version to use.
dnl If "auto", the version will be discovered by _STARWELS_QT_CHECK_QT5.
dnl Outputs: All necessary QT_* variables are set.
dnl Outputs: bitcoin_qt_got_major_vers is set to "4" or "5".
dnl Outputs: starwels_qt_got_major_vers is set to "4" or "5".
dnl Outputs: have_qt_test and have_qt_dbus are set (if applicable) to yes|no.
AC_DEFUN([_BITCOIN_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
AC_DEFUN([_STARWELS_QT_FIND_LIBS_WITHOUT_PKGCONFIG],[
TEMP_CPPFLAGS="$CPPFLAGS"
TEMP_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$PIC_FLAGS $CXXFLAGS"
TEMP_LIBS="$LIBS"
BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
if test "x$qt_include_path" != x; then
QT_INCLUDES="-I$qt_include_path -I$qt_include_path/QtCore -I$qt_include_path/QtGui -I$qt_include_path/QtWidgets -I$qt_include_path/QtNetwork -I$qt_include_path/QtTest -I$qt_include_path/QtDBus"
CPPFLAGS="$QT_INCLUDES $CPPFLAGS"
fi
])

BITCOIN_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,BITCOIN_QT_FAIL(QtCore headers missing))])
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QApplication],, BITCOIN_QT_FAIL(QtGui headers missing))])
BITCOIN_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, BITCOIN_QT_FAIL(QtNetwork headers missing))])
STARWELS_QT_CHECK([AC_CHECK_HEADER([QtPlugin],,STARWELS_QT_FAIL(QtCore headers missing))])
STARWELS_QT_CHECK([AC_CHECK_HEADER([QApplication],, STARWELS_QT_FAIL(QtGui headers missing))])
STARWELS_QT_CHECK([AC_CHECK_HEADER([QLocalSocket],, STARWELS_QT_FAIL(QtNetwork headers missing))])

BITCOIN_QT_CHECK([
if test "x$bitcoin_qt_want_version" = xauto; then
_BITCOIN_QT_CHECK_QT5
STARWELS_QT_CHECK([
if test "x$starwels_qt_want_version" = xauto; then
_STARWELS_QT_CHECK_QT5
fi
if test "x$bitcoin_cv_qt5" = xyes || test "x$bitcoin_qt_want_version" = xqt5; then
if test "x$starwels_cv_qt5" = xyes || test "x$starwels_qt_want_version" = xqt5; then
QT_LIB_PREFIX=Qt5
bitcoin_qt_got_major_vers=5
starwels_qt_got_major_vers=5
else
QT_LIB_PREFIX=Qt
bitcoin_qt_got_major_vers=4
starwels_qt_got_major_vers=4
fi
])

BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
LIBS=
if test "x$qt_lib_path" != x; then
LIBS="$LIBS -L$qt_lib_path"
fi

if test "x$TARGET_OS" = xwindows; then
AC_CHECK_LIB([imm32], [main],, BITCOIN_QT_FAIL(libimm32 not found))
AC_CHECK_LIB([imm32], [main],, STARWELS_QT_FAIL(libimm32 not found))
fi
])

BITCOIN_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
BITCOIN_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Core not found)))
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found)))
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Network not found)))
if test "x$bitcoin_qt_got_major_vers" = x5; then
BITCOIN_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,BITCOIN_QT_FAIL(lib${QT_LIB_PREFIX}Widgets not found)))
STARWELS_QT_CHECK(AC_CHECK_LIB([z] ,[main],,AC_MSG_WARN([zlib not found. Assuming qt has it built-in])))
STARWELS_QT_CHECK(AC_SEARCH_LIBS([png_error] ,[qtpng png],,AC_MSG_WARN([libpng not found. Assuming qt has it built-in])))
STARWELS_QT_CHECK(AC_SEARCH_LIBS([jpeg_create_decompress] ,[qtjpeg jpeg],,AC_MSG_WARN([libjpeg not found. Assuming qt has it built-in])))
STARWELS_QT_CHECK(AC_SEARCH_LIBS([pcre16_exec], [qtpcre pcre16],,AC_MSG_WARN([libpcre16 not found. Assuming qt has it built-in])))
STARWELS_QT_CHECK(AC_SEARCH_LIBS([hb_ot_tags_from_script] ,[qtharfbuzzng harfbuzz],,AC_MSG_WARN([libharfbuzz not found. Assuming qt has it built-in or support is disabled])))
STARWELS_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Core] ,[main],,STARWELS_QT_FAIL(lib${QT_LIB_PREFIX}Core not found)))
STARWELS_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Gui] ,[main],,STARWELS_QT_FAIL(lib${QT_LIB_PREFIX}Gui not found)))
STARWELS_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Network],[main],,STARWELS_QT_FAIL(lib${QT_LIB_PREFIX}Network not found)))
if test "x$starwels_qt_got_major_vers" = x5; then
STARWELS_QT_CHECK(AC_CHECK_LIB([${QT_LIB_PREFIX}Widgets],[main],,STARWELS_QT_FAIL(lib${QT_LIB_PREFIX}Widgets not found)))
fi
QT_LIBS="$LIBS"
LIBS="$TEMP_LIBS"

BITCOIN_QT_CHECK([
STARWELS_QT_CHECK([
LIBS=
if test "x$qt_lib_path" != x; then
LIBS="-L$qt_lib_path"

build-aux/m4/bitcoin_subdir_to_include.m4 → build-aux/m4/starwels_subdir_to_include.m4 View File

@@ -1,10 +1,10 @@
dnl Copyright (c) 2013-2014 The Bitcoin Core developers
dnl Copyright (c) 2013-2014 The Starwels developers
dnl Distributed under the MIT software license, see the accompanying
dnl file COPYING or http://www.opensource.org/licenses/mit-license.php.

dnl BITCOIN_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE])
dnl STARWELS_SUBDIR_TO_INCLUDE([CPPFLAGS-VARIABLE-NAME],[SUBDIRECTORY-NAME],[HEADER-FILE])
dnl SUBDIRECTORY-NAME must end with a path separator
AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[
AC_DEFUN([STARWELS_SUBDIR_TO_INCLUDE],[
if test "x$2" = "x"; then
AC_MSG_RESULT([default])
else

+ 60
- 60
configure.ac View File

@@ -7,17 +7,17 @@ define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Bitcoin Core]])
AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[bitcoin],[https://bitcoincore.org/])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[Starwels]])
AC_INIT([Starwels],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/bitcoin/bitcoin/issues],[starwels],[https://localhost/])
AC_CONFIG_SRCDIR([src/validation.cpp])
AC_CONFIG_HEADERS([src/config/bitcoin-config.h])
AC_CONFIG_HEADERS([src/config/starwels-config.h])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([build-aux/m4])

BITCOIN_DAEMON_NAME=bitcoind
BITCOIN_GUI_NAME=bitcoin-qt
BITCOIN_CLI_NAME=bitcoin-cli
BITCOIN_TX_NAME=bitcoin-tx
STARWELS_DAEMON_NAME=starwelsd
STARWELS_GUI_NAME=starwels-qt
STARWELS_CLI_NAME=starwels-cli
STARWELS_TX_NAME=starwels-tx

dnl Unless the user specified ARFLAGS, force it to be cr
AC_ARG_VAR(ARFLAGS, [Flags for the archiver, defaults to <cr> if not set])
@@ -27,9 +27,9 @@ fi

AC_CANONICAL_HOST

AH_TOP([#ifndef BITCOIN_CONFIG_H])
AH_TOP([#define BITCOIN_CONFIG_H])
AH_BOTTOM([#endif //BITCOIN_CONFIG_H])
AH_TOP([#ifndef STARWELS_CONFIG_H])
AH_TOP([#define STARWELS_CONFIG_H])
AH_BOTTOM([#endif //STARWELS_CONFIG_H])

dnl faketime breaks configure and is only needed for make. Disable it here.
unset FAKETIME
@@ -293,21 +293,21 @@ CPPFLAGS="$CPPFLAGS -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"

AC_ARG_WITH([utils],
[AS_HELP_STRING([--with-utils],
[build bitcoin-cli bitcoin-tx (default=yes)])],
[build_bitcoin_utils=$withval],
[build_bitcoin_utils=yes])
[build starwels-cli starwels-tx (default=yes)])],
[build_starwels_utils=$withval],
[build_starwels_utils=yes])

AC_ARG_WITH([libs],
[AS_HELP_STRING([--with-libs],
[build libraries (default=yes)])],
[build_bitcoin_libs=$withval],
[build_bitcoin_libs=yes])
[build_starwels_libs=$withval],
[build_starwels_libs=yes])

AC_ARG_WITH([daemon],
[AS_HELP_STRING([--with-daemon],
[build bitcoind daemon (default=yes)])],
[build_bitcoind=$withval],
[build_bitcoind=yes])
[build starwelsd daemon (default=yes)])],
[build_starwelsd=$withval],
[build_starwelsd=yes])

use_pkgconfig=yes
case $host in
@@ -505,7 +505,7 @@ AC_C_BIGENDIAN
dnl Check for pthread compile/link requirements
AX_PTHREAD

# The following macro will add the necessary defines to bitcoin-config.h, but
# The following macro will add the necessary defines to starwels-config.h, but
# they also need to be passed down to any subprojects. Pull the results out of
# the cache and add them to CPPFLAGS.
AC_SYS_LARGEFILE
@@ -734,7 +734,7 @@ AC_SUBST(LIBMEMENV)

if test x$enable_wallet != xno; then
dnl Check for libdb_cxx only if wallet enabled
BITCOIN_FIND_BDB48
STARWELS_FIND_BDB48
fi

dnl Check for libminiupnpc (optional)
@@ -746,12 +746,12 @@ if test x$use_upnp != xno; then
)
fi

BITCOIN_QT_INIT
STARWELS_QT_INIT

dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5])
dnl sets $starwels_enable_qt, $starwels_enable_qt_test, $starwels_enable_qt_dbus
STARWELS_QT_CONFIGURE([$use_pkgconfig], [qt5])

if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then
if test x$build_starwels_utils$build_starwelsd$starwels_enable_qt$use_tests$use_bench = xnonononono; then
use_boost=no
else
use_boost=yes
@@ -765,7 +765,7 @@ define(MINIMUM_REQUIRED_BOOST, 1.47.0)
dnl Check for boost libs
AX_BOOST_BASE([MINIMUM_REQUIRED_BOOST])
if test x$want_boost = xno; then
AC_MSG_ERROR([[only libbitcoinconsensus can be built without boost]])
AC_MSG_ERROR([[only libstarwelsconsensus can be built without boost]])
fi
AX_BOOST_SYSTEM
AX_BOOST_FILESYSTEM
@@ -936,11 +936,11 @@ if test x$use_pkgconfig = xyes; then
[
PKG_CHECK_MODULES([SSL], [libssl],, [AC_MSG_ERROR(openssl not found.)])
PKG_CHECK_MODULES([CRYPTO], [libcrypto],,[AC_MSG_ERROR(libcrypto not found.)])
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])
STARWELS_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [STARWELS_QT_FAIL(libprotobuf not found)])])
if test x$use_qr != xno; then
BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
STARWELS_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
fi
if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
if test x$build_starwels_utils$build_starwelsd$starwels_enable_qt$use_tests != xnononono; then
PKG_CHECK_MODULES([EVENT], [libevent],, [AC_MSG_ERROR(libevent not found.)])
if test x$TARGET_OS != xwindows; then
PKG_CHECK_MODULES([EVENT_PTHREADS], [libevent_pthreads],, [AC_MSG_ERROR(libevent_pthreads not found.)])
@@ -965,7 +965,7 @@ else
AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
AC_CHECK_LIB([ssl], [main],SSL_LIBS=-lssl, AC_MSG_ERROR(libssl missing))

if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests != xnononono; then
if test x$build_starwels_utils$build_starwelsd$starwels_enable_qt$use_tests != xnononono; then
AC_CHECK_HEADER([event2/event.h],, AC_MSG_ERROR(libevent headers missing),)
AC_CHECK_LIB([event],[main],EVENT_LIBS=-levent,AC_MSG_ERROR(libevent missing))
if test x$TARGET_OS != xwindows; then
@@ -996,10 +996,10 @@ else
esac
fi

BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], BITCOIN_QT_FAIL(libprotobuf not found)))
STARWELS_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],[PROTOBUF_LIBS=-lprotobuf], STARWELS_QT_FAIL(libprotobuf not found)))
if test x$use_qr != xno; then
BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])])
BITCOIN_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)])
STARWELS_QT_CHECK([AC_CHECK_LIB([qrencode], [main],[QR_LIBS=-lqrencode], [have_qrencode=no])])
STARWELS_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)])
fi
fi

@@ -1014,7 +1014,7 @@ dnl univalue check

need_bundled_univalue=yes

if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests$use_bench = xnonononono; then
if test x$build_starwels_utils$build_starwelsd$starwels_enable_qt$use_tests$use_bench = xnonononono; then
need_bundled_univalue=no
else

@@ -1058,23 +1058,23 @@ AM_CONDITIONAL([EMBEDDED_UNIVALUE],[test x$need_bundled_univalue = xyes])
AC_SUBST(UNIVALUE_CFLAGS)
AC_SUBST(UNIVALUE_LIBS)

BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
STARWELS_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)

AC_MSG_CHECKING([whether to build bitcoind])
AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
AC_MSG_RESULT($build_bitcoind)
AC_MSG_CHECKING([whether to build starwelsd])
AM_CONDITIONAL([BUILD_STARWELSD], [test x$build_starwelsd = xyes])
AC_MSG_RESULT($build_starwelsd)

AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)])
AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes])
AC_MSG_RESULT($build_bitcoin_utils)
AC_MSG_CHECKING([whether to build utils (starwels-cli starwels-tx)])
AM_CONDITIONAL([BUILD_STARWELS_UTILS], [test x$build_starwels_utils = xyes])
AC_MSG_RESULT($build_starwels_utils)

AC_MSG_CHECKING([whether to build libraries])
AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes])
if test x$build_bitcoin_libs = xyes; then
AM_CONDITIONAL([BUILD_STARWELS_LIBS], [test x$build_starwels_libs = xyes])
if test x$build_starwels_libs = xyes; then
AC_DEFINE(HAVE_CONSENSUS_LIB, 1, [Define this symbol if the consensus lib has been built])
AC_CONFIG_FILES([libbitcoinconsensus.pc:libbitcoinconsensus.pc.in])
AC_CONFIG_FILES([libstarwelsconsensus.pc:libstarwelsconsensus.pc.in])
fi
AC_MSG_RESULT($build_bitcoin_libs)
AC_MSG_RESULT($build_starwels_libs)

AC_LANG_POP

@@ -1136,13 +1136,13 @@ fi

dnl these are only used when qt is enabled
BUILD_TEST_QT=""
if test x$bitcoin_enable_qt != xno; then
if test x$starwels_enable_qt != xno; then
dnl enable dbus support
AC_MSG_CHECKING([whether to build GUI with support for D-Bus])
if test x$bitcoin_enable_qt_dbus != xno; then
if test x$starwels_enable_qt_dbus != xno; then
AC_DEFINE([USE_DBUS],[1],[Define if dbus support should be compiled in])
fi
AC_MSG_RESULT($bitcoin_enable_qt_dbus)
AC_MSG_RESULT($starwels_enable_qt_dbus)

dnl enable qr support
AC_MSG_CHECKING([whether to build GUI with support for QR codes])
@@ -1165,8 +1165,8 @@ if test x$bitcoin_enable_qt != xno; then
AC_MSG_WARN("xgettext is required to update qt translations")
fi

AC_MSG_CHECKING([whether to build test_bitcoin-qt])
if test x$use_gui_tests$bitcoin_enable_qt_test = xyesyes; then
AC_MSG_CHECKING([whether to build test_starwels-qt])
if test x$use_gui_tests$starwels_enable_qt_test = xyesyes; then
AC_MSG_RESULT([yes])
BUILD_TEST_QT="yes"
else
@@ -1176,7 +1176,7 @@ fi

AM_CONDITIONAL([ENABLE_ZMQ], [test "x$use_zmq" = "xyes"])

AC_MSG_CHECKING([whether to build test_bitcoin])
AC_MSG_CHECKING([whether to build test_starwels])
if test x$use_tests = xyes; then
AC_MSG_RESULT([yes])
BUILD_TEST="yes"
@@ -1192,7 +1192,7 @@ else
AC_MSG_RESULT([no])
fi

if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests = xnononononono; then
if test x$build_starwels_utils$build_starwels_libs$build_starwelsd$starwels_enable_qt$use_bench$use_tests = xnononononono; then
AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui --enable-bench or --enable-tests])
fi

@@ -1201,7 +1201,7 @@ AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet = xyes])
AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
AM_CONDITIONAL([ENABLE_QT],[test x$bitcoin_enable_qt = xyes])
AM_CONDITIONAL([ENABLE_QT],[test x$starwels_enable_qt = xyes])
AM_CONDITIONAL([ENABLE_QT_TESTS],[test x$BUILD_TEST_QT = xyes])
AM_CONDITIONAL([ENABLE_BENCH],[test x$use_bench = xyes])
AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
@@ -1230,10 +1230,10 @@ AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
AC_SUBST(COPYRIGHT_HOLDERS, "_COPYRIGHT_HOLDERS")
AC_SUBST(COPYRIGHT_HOLDERS_SUBSTITUTION, "_COPYRIGHT_HOLDERS_SUBSTITUTION")
AC_SUBST(COPYRIGHT_HOLDERS_FINAL, "_COPYRIGHT_HOLDERS_FINAL")
AC_SUBST(BITCOIN_DAEMON_NAME)
AC_SUBST(BITCOIN_GUI_NAME)
AC_SUBST(BITCOIN_CLI_NAME)
AC_SUBST(BITCOIN_TX_NAME)
AC_SUBST(STARWELS_DAEMON_NAME)
AC_SUBST(STARWELS_GUI_NAME)
AC_SUBST(STARWELS_CLI_NAME)
AC_SUBST(STARWELS_TX_NAME)

AC_SUBST(RELDFLAGS)
AC_SUBST(ERROR_CXXFLAGS)
@@ -1263,7 +1263,7 @@ AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/spl
AC_CONFIG_FILES([doc/Doxyfile])
AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])
AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
AC_CONFIG_LINKS([test/util/bitcoin-util-test.py:test/util/bitcoin-util-test.py])
AC_CONFIG_LINKS([test/util/starwels-util-test.py:test/util/starwels-util-test.py])

dnl boost's m4 checks do something really nasty: they export these vars. As a
dnl result, they leak into secp256k1's configure and crazy things happen.
@@ -1319,9 +1319,9 @@ esac
echo
echo "Options used to compile and link:"
echo " with wallet = $enable_wallet"
echo " with gui / qt = $bitcoin_enable_qt"
if test x$bitcoin_enable_qt != xno; then
echo " qt version = $bitcoin_qt_got_major_vers"
echo " with gui / qt = $starwels_enable_qt"
if test x$starwels_enable_qt != xno; then
echo " qt version = $starwels_qt_got_major_vers"
echo " with qr = $use_qr"
fi
echo " with zmq = $use_zmq"

+ 8
- 8
contrib/README.md View File

@@ -13,7 +13,7 @@ Construct a linear, no-fork, best version of the blockchain.

### [Qos](/contrib/qos) ###

A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
A Linux bash script that will set up traffic control (tc) to limit the outgoing bandwidth for connections to the Starwels network. This means one can have an always-on starwelsd instance running, and another local starwelsd/starwels-qt instance which connects to this node and receives blocks from it.

### [Seeds](/contrib/seeds) ###
Utility to generate the pnSeed[] array that is compiled into the client.
@@ -22,20 +22,20 @@ Build Tools and Keys
---------------------

### [Debian](/contrib/debian) ###
Contains files used to package bitcoind/bitcoin-qt
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
Contains files used to package starwelsd/starwels-qt
for Debian-based Linux systems. If you compile starwelsd/starwels-qt yourself, there are some useful files here.

### [Gitian-descriptors](/contrib/gitian-descriptors) ###
Files used during the gitian build process. For more information about gitian, see the [the Bitcoin Core documentation repository](https://github.com/bitcoin-core/docs).
Files used during the gitian build process. For more information about gitian, see the [the Starwels documentation repository](https://github.com/starwels/docs).

### [Gitian-keys](/contrib/gitian-keys)
PGP keys used for signing Bitcoin Core [Gitian release](/doc/release-process.md) results.
PGP keys used for signing Starwels [Gitian release](/doc/release-process.md) results.

### [MacDeploy](/contrib/macdeploy) ###
Scripts and notes for Mac builds.

### [RPM](/contrib/rpm) ###
RPM spec file for building bitcoin-core on RPM based distributions.
RPM spec file for building starwels on RPM based distributions.

### [Gitian-build](/contrib/gitian-build.sh) ###
Script for running full Gitian builds.
@@ -44,7 +44,7 @@ Test and Verify Tools
---------------------

### [TestGen](/contrib/testgen) ###
Utilities to generate test vectors for the data-driven Bitcoin tests.
Utilities to generate test vectors for the data-driven Starwels tests.

### [Verify Binaries](/contrib/verifybinaries) ###
This script attempts to download and verify the signature file SHA256SUMS.asc from bitcoin.org.
This script attempts to download and verify the signature file SHA256SUMS.asc from localhost.

+ 8
- 8
contrib/debian/README.md View File

@@ -1,21 +1,21 @@

Debian
====================
This directory contains files used to package bitcoind/bitcoin-qt
for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
This directory contains files used to package starwelsd/starwels-qt
for Debian-based Linux systems. If you compile starwelsd/starwels-qt yourself, there are some useful files here.

## bitcoin: URI support ##
## starwels: URI support ##


bitcoin-qt.desktop (Gnome / Open Desktop)
starwels-qt.desktop (Gnome / Open Desktop)
To install:

sudo desktop-file-install bitcoin-qt.desktop
sudo desktop-file-install starwels-qt.desktop
sudo update-desktop-database

If you build yourself, you will either need to modify the paths in
the .desktop file or copy or symlink your bitcoin-qt binary to `/usr/bin`
and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps`
the .desktop file or copy or symlink your starwels-qt binary to `/usr/bin`
and the `../../share/pixmaps/starwels128.png` to `/usr/share/pixmaps`

bitcoin-qt.protocol (KDE)
starwels-qt.protocol (KDE)


+ 0
- 14
contrib/debian/bitcoin-qt.desktop View File

@@ -1,14 +0,0 @@
[Desktop Entry]
Version=1.0
Name=Bitcoin Core
Comment=Connect to the Bitcoin P2P Network
Comment[de]=Verbinde mit dem Bitcoin peer-to-peer Netzwerk
Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
Exec=bitcoin-qt %u
Terminal=false
Type=Application
Icon=bitcoin128
MimeType=x-scheme-handler/bitcoin;
Categories=Office;Finance;
StartupWMClass=Bitcoin-qt

+ 0
- 6
contrib/debian/bitcoin-qt.install View File

@@ -1,6 +0,0 @@
usr/local/bin/bitcoin-qt usr/bin
share/pixmaps/bitcoin32.xpm usr/share/pixmaps
share/pixmaps/bitcoin16.xpm usr/share/pixmaps
share/pixmaps/bitcoin128.png usr/share/pixmaps
debian/bitcoin-qt.desktop usr/share/applications
debian/bitcoin-qt.protocol usr/share/kde4/services/

+ 0
- 1
contrib/debian/bitcoin-qt.manpages View File

@@ -1 +0,0 @@
doc/man/bitcoin-qt.1

+ 0
- 1
contrib/debian/bitcoin-tx.bash-completion View File

@@ -1 +0,0 @@
contrib/bitcoin-tx.bash-completion bitcoin-tx

+ 0
- 1
contrib/debian/bitcoin-tx.install View File

@@ -1 +0,0 @@
usr/local/bin/bitcoin-tx usr/bin

+ 0
- 1
contrib/debian/bitcoin-tx.manpages View File

@@ -1 +0,0 @@
doc/man/bitcoin-tx.1

+ 0
- 2
contrib/debian/bitcoind.bash-completion View File

@@ -1,2 +0,0 @@
contrib/bitcoind.bash-completion bitcoind
contrib/bitcoin-cli.bash-completion bitcoin-cli

+ 0
- 1
contrib/debian/bitcoind.examples View File

@@ -1 +0,0 @@
debian/examples/bitcoin.conf

+ 0
- 2
contrib/debian/bitcoind.install View File

@@ -1,2 +0,0 @@
usr/local/bin/bitcoind usr/bin
usr/local/bin/bitcoin-cli usr/bin

+ 0
- 2
contrib/debian/bitcoind.manpages View File

@@ -1,2 +0,0 @@
doc/man/bitcoind.1
doc/man/bitcoin-cli.1

+ 88
- 88
contrib/debian/changelog View File

@@ -1,364 +1,364 @@
bitcoin (0.14.1-trusty4) trusty; urgency=medium
starwels (0.14.1-trusty4) trusty; urgency=medium

* Re-enable UPnP support.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Fri, 05 May 2017 13:28:00 -0400

bitcoin (0.14.1-trusty3) trusty; urgency=medium
starwels (0.14.1-trusty3) trusty; urgency=medium

* Build with qt5 if we are on a non-Ubuntu (ie non-Unity) distro.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 04 May 2017 17:13:00 -0400

bitcoin (0.14.1-trusty2) trusty; urgency=medium
starwels (0.14.1-trusty2) trusty; urgency=medium

* Bump minimum boost version in deps.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 04 May 2017 17:12:00 -0400

bitcoin (0.14.1-trusty1) trusty; urgency=medium
starwels (0.14.1-trusty1) trusty; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Sat, 22 Apr 2017 17:10:00 -0400

bitcoin (0.14.0-trusty1) trusty; urgency=medium
starwels (0.14.0-trusty1) trusty; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Wed, 08 Mar 2017 10:30:00 -0500

bitcoin (0.13.2-trusty1) trusty; urgency=medium
starwels (0.13.2-trusty1) trusty; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 05 Jan 2017 09:59:00 -0500

bitcoin (0.13.1-trusty2) trusty; urgency=medium
starwels (0.13.1-trusty2) trusty; urgency=medium

* Revert to Qt4, due to https://github.com/bitcoin/bitcoin/issues/9038

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 31 Oct 2016 11:16:00 -0400

bitcoin (0.13.1-trusty1) trusty; urgency=medium
starwels (0.13.1-trusty1) trusty; urgency=medium

* New upstream release.
* Backport updated bitcoin-qt.desktop from upstream master
* Backport updated starwels-qt.desktop from upstream master
* Add zmq dependency
* Switch to Qt5 (breaks precise, but that was already broken by C++11)

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Thu, 27 Oct 2016 17:32:00 -0400

bitcoin (0.13.0-trusty1) trusty; urgency=medium
starwels (0.13.0-trusty1) trusty; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Sun, 04 Sep 2016 22:09:00 -0400

bitcoin (0.12.1-trusty1) trusty; urgency=medium
starwels (0.12.1-trusty1) trusty; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 18 Apr 2016 14:26:00 -0700

bitcoin (0.12.0-trusty6) trusty; urgency=medium
starwels (0.12.0-trusty6) trusty; urgency=medium

* Fix program-options dep.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Fri, 25 Mar 2016 21:41:00 -0700

bitcoin (0.12.0-trusty5) trusty; urgency=medium
starwels (0.12.0-trusty5) trusty; urgency=medium

* Test explicit --with-gui

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 23:25:00 -0800

bitcoin (0.12.0-trusty4) trusty; urgency=medium
starwels (0.12.0-trusty4) trusty; urgency=medium

* Fix libevent-dev dep.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 23:25:00 -0800

bitcoin (0.12.0-trusty3) trusty; urgency=medium
starwels (0.12.0-trusty3) trusty; urgency=medium

* Fix precise boost dep.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 19:55:00 -0800

bitcoin (0.12.0-trusty2) trusty; urgency=medium
starwels (0.12.0-trusty2) trusty; urgency=medium

* Fix libevent dep.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 19:53:00 -0800

bitcoin (0.12.0-trusty1) trusty; urgency=medium
starwels (0.12.0-trusty1) trusty; urgency=medium

* New upstream release
* Various updates to contrib/debian were merged, a few were not

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 23 Feb 2015 19:29:00 -0800

bitcoin (0.11.2-trusty1) trusty; urgency=low
starwels (0.11.2-trusty1) trusty; urgency=low

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Fri, 13 Nov 2015 18:39:00 -0800

bitcoin (0.11.1-trusty2) trusty; urgency=low
starwels (0.11.1-trusty2) trusty; urgency=low

* Remove minupnpc builddep.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Wed, 14 Oct 2015 23:06:00 -1000

bitcoin (0.11.1-trusty1) trusty; urgency=high
starwels (0.11.1-trusty1) trusty; urgency=high

* New upstream release.
* Disable all UPnP support.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Wed, 14 Oct 2015 13:57:00 -1000

bitcoin (0.11.0-precise1) precise; urgency=medium
starwels (0.11.0-precise1) precise; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 14 Jul 2015 14:39:00 -1000

bitcoin (0.10.2-precise1) precise; urgency=medium
starwels (0.10.2-precise1) precise; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Mon, 29 Jun 2015 17:33:00 -1000

bitcoin (0.10.1-precise3) precise; urgency=medium
starwels (0.10.1-precise3) precise; urgency=medium

* Fix build dep (include python).

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 5 May 2015 09:28:00 -1000

bitcoin (0.10.1-precise2) precise; urgency=medium
starwels (0.10.1-precise2) precise; urgency=medium

* Fix miniupnpc dep.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 5 May 2015 00:33:00 -1000

bitcoin (0.10.1-precise1) precise; urgency=medium
starwels (0.10.1-precise1) precise; urgency=medium

* New upstream release.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Tue, 5 May 2015 00:07:00 -1000

bitcoin (0.10.0-precise1) precise; urgency=medium
starwels (0.10.0-precise1) precise; urgency=medium

* New upstream releases.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Wed, 18 Feb 2015 13:22:00 -1000

bitcoin (0.9.4-precise1) precise; urgency=high
starwels (0.9.4-precise1) precise; urgency=high

* New upstream releases.

-- Matt Corallo (laptop - only while traveling) <matt@mattcorallo.com> Mon, 12 Jan 2015 23:30:00 -1000

bitcoin (0.9.3-precise1) precise; urgency=medium
starwels (0.9.3-precise1) precise; urgency=medium

* New upstream releases.

-- Matt Corallo (BlueMatt) <matt@mattcorallo.com> Fri, 26 Sep 2014 12:01:00 -0700

bitcoin (0.9.1-precise1) precise; urgency=medium
starwels (0.9.1-precise1) precise; urgency=medium

* New upstream release.
* Backport pull #4019

-- Matt Corallo <matt@bluematt.me> Sat, 19 Apr 2014 17:29:00 -0400

bitcoin (0.9.0-precise1) precise; urgency=medium
starwels (0.9.0-precise1) precise; urgency=medium

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Thu, 20 Mar 2014 13:10:00 -0400

bitcoin (0.8.6-precise1) precise; urgency=medium
starwels (0.8.6-precise1) precise; urgency=medium

* New upstream release.
* Make .desktop paths non-fixed (suggested by prusnak@github)

-- Matt Corallo <matt@bluematt.me> Fri, 13 Dec 2013 13:31:00 -0400

bitcoin (0.8.5-precise1) precise; urgency=medium
starwels (0.8.5-precise1) precise; urgency=medium

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Sun, 15 Sep 2013 14:02:00 -0400

bitcoin (0.8.4-precise1) precise; urgency=medium
starwels (0.8.4-precise1) precise; urgency=medium

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Wed, 4 Sep 2013 10:25:00 -0400

bitcoin (0.8.3-natty1) natty; urgency=low
starwels (0.8.3-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Wed, 26 Jun 2013 00:18:00 +0100

bitcoin (0.8.2-natty1) natty; urgency=low
starwels (0.8.2-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Wed, 29 Mar 2013 23:23:00 +0100

bitcoin (0.8.1-natty3) natty; urgency=low
starwels (0.8.1-natty3) natty; urgency=low

* New pixmaps

-- Jonas Schnelli <jonas.schnelli@include7.ch> Mon, 13 May 2013 16:14:00 +0100

bitcoin (0.8.1-natty2) natty; urgency=low
starwels (0.8.1-natty2) natty; urgency=low

* Remove dumb broken launcher script

-- Matt Corallo <matt@bluematt.me> Sun, 24 Mar 2013 20:01:00 -0400

bitcoin (0.8.1-natty1) natty; urgency=low
starwels (0.8.1-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Tue, 19 Mar 2013 13:03:00 -0400

bitcoin (0.8.0-natty1) natty; urgency=low
starwels (0.8.0-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Sat, 23 Feb 2013 16:01:00 -0500

bitcoin (0.7.2-natty1) natty; urgency=low
starwels (0.7.2-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Sat, 15 Dec 2012 10:59:00 -0400

bitcoin (0.7.1-natty1) natty; urgency=low
starwels (0.7.1-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Wed, 24 Oct 2012 15:06:00 -0400

bitcoin (0.7.0-natty1) natty; urgency=low
starwels (0.7.0-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Mon, 17 Sep 2012 13:45:00 +0200

bitcoin (0.6.3-natty1) natty; urgency=low
starwels (0.6.3-natty1) natty; urgency=low

* New upstream release.

-- Matt Corallo <matt@bluematt.me> Mon, 25 Jun 2012 23:47:00 +0200

bitcoin (0.6.2-natty1) natty; urgency=low
starwels (0.6.2-natty1) natty; urgency=low

* Update package description and launch scripts.

-- Matt Corallo <matt@bluematt.me> Sat, 2 Jun 2012 16:41:00 +0200

bitcoin (0.6.2-natty0) natty; urgency=low
starwels (0.6.2-natty0) natty; urgency=low

* New upstream release.