forked from zeroonecoin/zeroonecoin
-
Notifications
You must be signed in to change notification settings - Fork 12
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 #48 from OwenRay/master
update to 0.12.4.0
- Loading branch information
Showing
358 changed files
with
65,754 additions
and
19,648 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 |
|---|---|---|
|
|
@@ -65,6 +65,7 @@ libconftest.dylib* | |
| *.o-* | ||
| .zeroone | ||
| *.patch | ||
| !depends/patches/*/*.patch | ||
| *.a | ||
| *.pb.cc | ||
| *.pb.h | ||
|
|
||
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 |
|---|---|---|
| @@ -1,15 +1,76 @@ | ||
| cmake_minimum_required(VERSION 3.3) | ||
| project(bitcoin) | ||
|
|
||
| set(CMAKE_CXX_STANDARD 11) | ||
| set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") | ||
|
|
||
| add_custom_target(build-zeroone ALL | ||
| COMMAND ./autogen.sh | ||
| COMMAND ./configure | ||
| COMMAND $(MAKE) WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} | ||
| COMMAND $(MAKE) install) | ||
|
|
||
| add_custom_target(debug-zerooned ALL) | ||
| add_custom_target(debug-zeroonetest ALL) | ||
| add_custom_target(debug-zeroone-qt ALL) | ||
| set(CMAKE_CXX_STANDARD 14) | ||
|
|
||
| include_directories( | ||
| src | ||
| src/qt/forms | ||
| src/leveldb/include | ||
| src/univalue/include | ||
| ) | ||
|
|
||
| if(UNIX AND NOT APPLE) | ||
| set(DEPENDS_PREFIX depends/x86_64-pc-linux-gnu) | ||
| elseif(APPLE) | ||
| set(DEPENDS_PREFIX depends/x86_64-apple-darwin11) | ||
| elseif(WIN32) | ||
| set(DEPENDS_PREFIX depends/x86_64-w64-mingw32) | ||
| endif() | ||
|
|
||
| message(STATUS "DEPENDS_PREFIX: ${DEPENDS_PREFIX}") | ||
|
|
||
| if(DEFINED DEPENDS_PREFIX) | ||
| include_directories(${DEPENDS_PREFIX}/include) | ||
| include_directories(${DEPENDS_PREFIX}/include/QtWidgets) | ||
| endif() | ||
|
|
||
| add_definitions( | ||
| -DENABLE_WALLET=1 | ||
| ) | ||
|
|
||
| file(GLOB SOURCE_FILES | ||
| src/bench/*.cpp | ||
| src/bench/*.h | ||
| src/compat/*.cpp | ||
| src/compat/*.h | ||
| src/consensus/*.h | ||
| src/consensus/*.cpp | ||
| src/crypto/*.c | ||
| src/crypto/*.h | ||
| src/crypto/*.cpp | ||
| src/leveldb/db/*.cc | ||
| src/leveldb/db/*.h | ||
| src/leveldb/include/*.h | ||
| src/policy/*.cpp | ||
| src/policy/*.h | ||
| src/primitives/*.cpp | ||
| src/primitives/*.h | ||
| src/qt/test/*.cpp | ||
| src/qt/test/*.h | ||
| src/qt/*.cpp | ||
| src/qt/*.h | ||
| src/script/*.cpp | ||
| src/script/*.h | ||
| src/secp256k1/include/*.h | ||
| src/test/*.cpp | ||
| src/test/*.h | ||
| src/univalue/include/*.h | ||
| src/univalue/lib/*.cpp | ||
| src/univalue/lib/*.h | ||
| src/wallet/test/*.cpp | ||
| src/wallet/*.cpp | ||
| src/wallet/*.h | ||
| src/zmq/*.cpp | ||
| src/zmq/*.h | ||
| src/*.cpp | ||
| src/*.h | ||
| src/evo/*.h | ||
| src/evo/*.cpp | ||
| src/llmq/*.h | ||
| src/llmq/*.cpp | ||
| src/rpc/*.cpp | ||
| src/rpc/*.h | ||
| ) | ||
|
|
||
| add_executable(dash ${SOURCE_FILES}) |
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,100 @@ | ||
| // This Jenkinsfile will build a builder image and then run the actual build and tests inside this image | ||
| // It's very important to not execute any scripts outside of the builder container, as it's our protection against | ||
| // external developers bringing in harmful code into Jenkins. | ||
| // Jenkins will only run the build if this Jenkinsfile was not modified in an external pull request. Only branches | ||
| // which are part of the Dash repo will allow modification to the Jenkinsfile. | ||
|
|
||
| def targets = [ | ||
| 'win32', | ||
| 'win64', | ||
| 'linux32', | ||
| 'linux64', | ||
| 'linux64_nowallet', | ||
| 'linux64_release', | ||
| 'mac', | ||
| ] | ||
|
|
||
| def tasks = [:] | ||
| for(int i = 0; i < targets.size(); i++) { | ||
| def target = targets[i] | ||
|
|
||
| tasks["${target}"] = { | ||
| node { | ||
| def BUILD_NUMBER = sh(returnStdout: true, script: 'echo $BUILD_NUMBER').trim() | ||
| def BRANCH_NAME = sh(returnStdout: true, script: 'echo $BRANCH_NAME').trim() | ||
| def UID = sh(returnStdout: true, script: 'id -u').trim() | ||
| def HOME = sh(returnStdout: true, script: 'echo $HOME').trim() | ||
| def pwd = sh(returnStdout: true, script: 'pwd').trim() | ||
|
|
||
| checkout scm | ||
|
|
||
| def env = [ | ||
| "BUILD_TARGET=${target}", | ||
| "PULL_REQUEST=false", | ||
| "JOB_NUMBER=${BUILD_NUMBER}", | ||
| ] | ||
| withEnv(env) { | ||
| def builderImageName="dash-builder-${target}" | ||
|
|
||
| def builderImage | ||
| stage("${target}/builder-image") { | ||
| builderImage = docker.build("${builderImageName}", "--build-arg BUILD_TARGET=${target} ci -f ci/Dockerfile.builder") | ||
| } | ||
|
|
||
| builderImage.inside("-t") { | ||
| // copy source into fixed path | ||
| // we must build under the same path everytime as otherwise caches won't work properly | ||
| sh "cp -ra ${pwd}/. /dash-src/" | ||
|
|
||
| // restore cache | ||
| def hasCache = false | ||
| try { | ||
| copyArtifacts(projectName: "dashpay-dash/${BRANCH_NAME}", optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz") | ||
| } catch (Exception e) { | ||
| } | ||
| if (fileExists("ci-cache-${target}.tar.gz")) { | ||
| hasCache = true | ||
| echo "Using cache from dashpay-dash/${BRANCH_NAME}" | ||
| } else { | ||
| try { | ||
| copyArtifacts(projectName: 'dashpay-dash/develop', optional: true, selector: lastSuccessful(), filter: "ci-cache-${target}.tar.gz"); | ||
| } catch (Exception e) { | ||
| } | ||
| if (fileExists("ci-cache-${target}.tar.gz")) { | ||
| hasCache = true | ||
| echo "Using cache from dashpay-dash/develop" | ||
| } | ||
| } | ||
|
|
||
| if (hasCache) { | ||
| sh "cd /dash-src && tar xzf ${pwd}/ci-cache-${target}.tar.gz" | ||
| } else { | ||
| sh "mkdir -p /dash-src/ci-cache-${target}" | ||
| } | ||
|
|
||
| stage("${target}/depends") { | ||
| sh 'cd /dash-src && ./ci/build_depends.sh' | ||
| } | ||
| stage("${target}/build") { | ||
| sh 'cd /dash-src && ./ci/build_src.sh' | ||
| } | ||
| stage("${target}/test") { | ||
| sh 'cd /dash-src && ./ci/test_unittests.sh' | ||
| } | ||
| stage("${target}/test") { | ||
| sh 'cd /dash-src && ./ci/test_integrationtests.sh' | ||
| } | ||
|
|
||
| // archive cache and copy it into the jenkins workspace | ||
| sh "cd /dash-src && tar czfv ci-cache-${target}.tar.gz ci-cache-${target} && cp ci-cache-${target}.tar.gz ${pwd}/" | ||
| } | ||
|
|
||
| // upload cache | ||
| archiveArtifacts artifacts: "ci-cache-${target}.tar.gz", fingerprint: true | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| parallel tasks | ||
|
|
Oops, something went wrong.