forked from PIVX-Project/PIVX
-
Notifications
You must be signed in to change notification settings - Fork 62
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #193 from wqking/pr-174-fix-conflicts
PR #174 conflictions fix
- Loading branch information
Showing
414 changed files
with
31,059 additions
and
9,072 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -86,11 +86,11 @@ src/leveldb/build_config.mk | |
| Makefile | ||
| phore-qt | ||
| phore-Qt.app | ||
| background.tiff* | ||
|
|
||
| # Unit-tests | ||
| Makefile.test | ||
| phore-qt_test | ||
| src/test/buildenv.py | ||
|
|
||
| # Resources cpp | ||
| qrc_*.cpp | ||
|
|
@@ -113,6 +113,8 @@ coverage_percent.txt | |
| linux-coverage-build | ||
| linux-build | ||
| win32-build | ||
| test/config.ini | ||
| test/cache/* | ||
| qa/pull-tester/run-bitcoind-for-test.sh | ||
| qa/pull-tester/tests-config.sh | ||
| qa/pull-tester/cache/* | ||
|
|
@@ -128,7 +130,7 @@ [email protected] | |
| /doc/doxygen/ | ||
| /doc/Doxyfile | ||
| /nbproject/ | ||
|
|
||
| libbitcoinconsensus.pc | ||
| .idea | ||
| cmake-build-debug | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| ## travis build scripts | ||
|
|
||
| The `.travis` directory contains scripts for each build step in each build stage. | ||
| Currently the travis build defines two stages `lint` and `test`. Each stage has | ||
| it's own [lifecycle](https://docs.travis-ci.com/user/customizing-the-build/#the-build-lifecycle). | ||
| Every script in here is named and numbered according to which stage and lifecycle | ||
| step it belongs to. | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C | ||
|
|
||
| travis_retry pip install flake8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C | ||
|
|
||
| git fetch --unshallow |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C | ||
|
|
||
| #Till we properly set it as a sub tree | ||
| #contrib/devtools/git-subtree-check.sh src/secp256k1 | ||
| #contrib/devtools/git-subtree-check.sh src/univalue | ||
| #contrib/devtools/git-subtree-check.sh src/leveldb | ||
| contrib/devtools/check-doc.py | ||
| contrib/devtools/logprint-scanner.py | ||
|
|
||
| if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then | ||
| contrib/devtools/lint-whitespace.sh | ||
| fi |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C.UTF-8 | ||
|
|
||
| PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g") | ||
| export PATH | ||
|
|
||
| BEGIN_FOLD () { | ||
| echo "" | ||
| CURRENT_FOLD_NAME=$1 | ||
| echo "travis_fold:start:${CURRENT_FOLD_NAME}" | ||
| } | ||
|
|
||
| END_FOLD () { | ||
| RET=$? | ||
| echo "travis_fold:end:${CURRENT_FOLD_NAME}" | ||
| if [ $RET != 0 ]; then | ||
| echo "${CURRENT_FOLD_NAME} failed with status code ${RET}" | ||
| fi | ||
| } | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C.UTF-8 | ||
|
|
||
| travis_retry docker pull "$DOCKER_NAME_TAG" | ||
| env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env | ||
| if [[ $HOST = *-mingw32 ]]; then | ||
| DOCKER_ADMIN="--cap-add SYS_ADMIN" | ||
| fi | ||
| DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG) | ||
|
|
||
| DOCKER_EXEC () { | ||
| docker exec $DOCKER_ID bash -c "cd $PWD && $*" | ||
| } | ||
|
|
||
| if [ -n "$DPKG_ADD_ARCH" ]; then | ||
| DOCKER_EXEC dpkg --add-architecture "$DPKG_ADD_ARCH" | ||
| fi | ||
|
|
||
| travis_retry DOCKER_EXEC apt-get update | ||
| travis_retry DOCKER_EXEC apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES $DOCKER_PACKAGES | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Copyright (c) 2018 The Bitcoin Core developers | ||
| # Distributed under the MIT software license, see the accompanying | ||
| # file COPYING or http://www.opensource.org/licenses/mit-license.php. | ||
|
|
||
| export LC_ALL=C.UTF-8 | ||
|
|
||
| #DOCKER_EXEC echo \> \$HOME/.phore # Make sure default datadir does not exist and is never read by creating a dummy file | ||
|
|
||
| mkdir -p depends/SDKs depends/sdk-sources | ||
|
|
||
| if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then | ||
| curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz | ||
| fi | ||
| if [ -n "$OSX_SDK" -a -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then | ||
| tar -C depends/SDKs -xf depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz | ||
| fi | ||
| if [[ $HOST = *-mingw32 ]]; then | ||
| DOCKER_EXEC update-alternatives --set $HOST-g++ \$\(which $HOST-g++-posix\) | ||
| fi | ||
| if [ -z "$NO_DEPENDS" ]; then | ||
| DOCKER_EXEC CONFIG_SHELL= make $MAKEJOBS -C depends HOST=$HOST $DEP_OPTS | ||
| fi | ||
|
|
Oops, something went wrong.