diff options
| -rw-r--r-- | .travis.yml | 8 | ||||
| -rw-r--r-- | doc/assets-attribution.md | 53 |
2 files changed, 34 insertions, 27 deletions
diff --git a/.travis.yml b/.travis.yml index 1f6eb15c27..c8785144ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ os: linux language: cpp +compiler: gcc env: global: - MAKEJOBS=-j3 @@ -30,18 +31,21 @@ matrix: - compiler: ": ARM" env: HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf" DEP_OPTS="NO_QT=1" GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" - compiler: ": Win32" - env: HOST=i686-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev wine bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2" + env: HOST=i686-w64-mingw32 PPA="ppa:ubuntu-wine/ppa" PACKAGES="nsis gcc-mingw-w64-i686 g++-mingw-w64-i686 binutils-mingw-w64-i686 mingw-w64-dev wine1.7 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2" - compiler: ": 32-bit + dash" env: HOST=i686-pc-linux-gnu PACKAGES="g++-multilib bc" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++" USE_SHELL="/bin/dash" - compiler: ": Win64" - env: HOST=x86_64-w64-mingw32 PACKAGES="nsis gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev wine bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2" + env: HOST=x86_64-w64-mingw32 PPA="ppa:ubuntu-wine/ppa" PACKAGES="nsis gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 binutils-mingw-w64-x86-64 mingw-w64-dev wine1.7 bc" RUN_TESTS=true GOAL="deploy" BITCOIN_CONFIG="--enable-gui --enable-reduce-exports" MAKEJOBS="-j2" - compiler: ": bitcoind" env: HOST=x86_64-unknown-linux-gnu PACKAGES="bc" DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER" - compiler: ": No wallet" env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" - compiler: ": Cross-Mac" env: HOST=x86_64-apple-darwin11 PACKAGES="cmake libcap-dev libz-dev libbz2-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy" + exclude: + - compiler: gcc install: + - if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi before_script: diff --git a/doc/assets-attribution.md b/doc/assets-attribution.md index b5a033dd79..460c1f8e2e 100644 --- a/doc/assets-attribution.md +++ b/doc/assets-attribution.md @@ -11,28 +11,28 @@ The following is a list of assets used in the bitcoin source and their proper at ### Assets Used src/qt/res/icons/add.png - src/qt/res/icons/address-book.png, + src/qt/res/icons/address-book.png src/qt/res/icons/configure.png src/qt/res/icons/debugwindow.png - src/qt/res/icons/edit.png, - src/qt/res/icons/exitcopy.png - src/qt/res/icons/editpaste.png, + src/qt/res/icons/edit.png + src/qt/res/icons/editcopy.png + src/qt/res/icons/editpaste.png src/qt/res/icons/export.png - src/qt/res/icons/eye.png, + src/qt/res/icons/eye.png src/qt/res/icons/filesave.png - src/qt/res/icons/history.png, + src/qt/res/icons/history.png src/qt/res/icons/info.png - src/qt/res/icons/key.png, + src/qt/res/icons/key.png src/qt/res/icons/lock_*.png - src/qt/res/icons/open.png, + src/qt/res/icons/open.png src/qt/res/icons/overview.png - src/qt/res/icons/quit.png, + src/qt/res/icons/quit.png src/qt/res/icons/receive.png - src/qt/res/icons/remove.png, + src/qt/res/icons/remove.png src/qt/res/icons/send.png - src/qt/res/icons/synced.png, + src/qt/res/icons/synced.png src/qt/res/icons/transaction*.png - src/qt/res/icons/tx_output.png, + src/qt/res/icons/tx_output.png src/qt/res/icons/warning.png Other @@ -40,28 +40,31 @@ Other ### Info * Designer: Jonas Schnelli, Bitboy, Stephen Hutchings, Marco Falke -* Bitcoin Icon: Based on the original bitcoin logo from Bitboy -* Network connection icon: Inspired by flow-merge.svg from Stephen Hutchings -* Some icons are based on Stephan Hutchings Typicons +* Bitcoin icon: Based on the original bitcoin logo from Bitboy +* Network connection icons: Marco Falke, inspired by flow-merge.svg from Stephen Hutchings +* Transaction-mined icon: Jonas Schnelli +* Other icons are based on Stephan Hutchings Typicons * License: MIT ### Assets Used src/qt/res/icons/about.png - src/qt/res/icons/about_qt.png, + src/qt/res/icons/about_qt.png src/qt/res/icons/bitcoin.icns - src/qt/res/icons/bitcoin.ico, + src/qt/res/icons/bitcoin.ico src/qt/res/icons/bitcoin.png - src/qt/res/icons/clock*.png, + src/qt/res/icons/clock*.png src/qt/res/icons/connect*.png - src/qt/res/icons/eye_minus.png, + src/qt/res/icons/eye_minus.png src/qt/res/icons/eye_plus.png - src/qt/res/icons/verify.png, + src/qt/res/icons/verify.png src/qt/res/icons/tx_inout.png - src/qt/res/icons/tx_input.png, - src/qt/res/src/bitcoin.svg, - src/qt/res/src/clock*.svg - src/qt/res/src/connect*.svg, + src/qt/res/icons/tx_input.png + src/qt/res/icons/tx_mined.png + src/qt/res/src/bitcoin.svg + src/qt/res/src/clock_*.svg + src/qt/res/src/connect-*.svg src/qt/res/src/mine.svg src/qt/res/src/qt.svg - src/qt/res/src/tx*.svg, + src/qt/res/src/tx_*.svg + src/qt/res/src/transaction0.svg src/qt/res/src/verify.svg |