zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #2362 - daira:2361.disable-proton-by-default, r=nathan-at-least 

Disable building Proton by default

fixes #2361

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
This commit is contained in:
Homu 2017-05-12 18:07:58 -07:00
parent 20d61ac0ea b04529fefd
commit 2869db7993
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
zcutil/build.sh
View File

@ -33,7 +33,7 @@ Usage:
$0 --help $0 --help
Show this help message and exit. Show this help message and exit.
$0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ] [ --disable-proton ] [ MAKEARGS... ] $0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ] [ --enable-proton ] [ MAKEARGS... ]
Build Zcash and most of its transitive dependencies from Build Zcash and most of its transitive dependencies from
source. MAKEARGS are applied to both dependencies and Zcash itself. source. MAKEARGS are applied to both dependencies and Zcash itself.
@ -45,11 +45,11 @@ $0 [ --enable-lcov || --disable-tests ] [ --disable-mining ] [ --disable-rust ]
code. It must be passed after the test arguments, if present. code. It must be passed after the test arguments, if present.
If --disable-rust is passed, Zcash is configured to not build any Rust language If --disable-rust is passed, Zcash is configured to not build any Rust language
assets. It must be passed after mining/test arguments, if present. assets. It must be passed after test/mining arguments, if present.
If --disable-proton is passed, Zcash is configured to not build the Apache If --enable-proton is passed, Zcash is configured to build the Apache Qpid Proton
Qpid Proton library required for AMQP support. It must be passed after the library required for AMQP support. This library is not built by default.
test arguments, if present. It must be passed after the test/mining/Rust arguments, if present.
EOF EOF
exit 0 exit 0
fi fi
@ -88,11 +88,11 @@ then
shift shift
fi fi
# If --disable-proton is the next argument, disable building Proton code: # If --enable-proton is the next argument, enable building Proton code:
PROTON_ARG='' PROTON_ARG='--enable-proton=no'
if [ "x${1:-}" = 'x--disable-proton' ] if [ "x${1:-}" = 'x--enable-proton' ]
then then
PROTON_ARG='--enable-proton=no' PROTON_ARG=''
shift shift
fi fi