|
65 | 65 |
|
66 | 66 | # The default build directory. |
67 | 67 | #------------------------------------------------------------------------------ |
68 | | -BUILD_DIR="build-libbitcoin-protocol" |
| 68 | +BUILD_SRC_DIR="build-libbitcoin-protocol" |
69 | 69 |
|
70 | 70 | PRESUMED_CI_PROJECT_PATH=$(pwd) |
71 | 71 |
|
@@ -172,13 +172,13 @@ make_jobs() |
172 | 172 | shift 1 |
173 | 173 |
|
174 | 174 | VERBOSITY="" |
175 | | - if [[ DISPLAY_VERBOSE ]]; then |
| 175 | + if [[ $DISPLAY_VERBOSE ]]; then |
176 | 176 | VERBOSITY="VERBOSE=1" |
177 | 177 | fi |
178 | 178 |
|
179 | 179 | SEQUENTIAL=1 |
180 | 180 | # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]). |
181 | | - if [[ $JOBS > $SEQUENTIAL ]]; then |
| 181 | + if [[ $JOBS -gt $SEQUENTIAL ]]; then |
182 | 182 | make -j"$JOBS" "$@" $VERBOSITY |
183 | 183 | else |
184 | 184 | make "$@" $VERBOSITY |
@@ -285,7 +285,7 @@ parse_command_line_options() |
285 | 285 | (--build-secp256k1) BUILD_SECP256K1="yes";; |
286 | 286 |
|
287 | 287 | # Unique script options. |
288 | | - (--build-dir=*) BUILD_DIR="${OPTION#*=}";; |
| 288 | + (--build-dir=*) BUILD_SRC_DIR="${OPTION#*=}";; |
289 | 289 | (--preset=*) PRESET_ID="${OPTION#*=}";; |
290 | 290 |
|
291 | 291 | # Handle ndebug declarations due to disabled argument passthrough |
@@ -518,7 +518,7 @@ display_configuration() |
518 | 518 | display_message "BUILD_BOOST : $BUILD_BOOST" |
519 | 519 | display_message "BUILD_SECP256K1 : $BUILD_SECP256K1" |
520 | 520 | display_message "BOOST_ROOT : $BOOST_ROOT" |
521 | | - display_message "BUILD_DIR : $BUILD_DIR" |
| 521 | + display_message "BUILD_SRC_DIR : $BUILD_SRC_DIR" |
522 | 522 | display_message "PRESET_ID : $PRESET_ID" |
523 | 523 | display_message "CUMULATIVE_FILTERED_ARGS : $CUMULATIVE_FILTERED_ARGS" |
524 | 524 | display_message "CUMULATIVE_FILTERED_ARGS_CMAKE : $CUMULATIVE_FILTERED_ARGS_CMAKE" |
@@ -1107,10 +1107,10 @@ BITCOIN_PROTOCOL_OPTIONS=( |
1107 | 1107 | display_configuration |
1108 | 1108 |
|
1109 | 1109 | if [[ ! ($CI == true) ]]; then |
1110 | | - create_directory "$BUILD_DIR" |
1111 | | - push_directory "$BUILD_DIR" |
| 1110 | + create_directory "$BUILD_SRC_DIR" |
| 1111 | + push_directory "$BUILD_SRC_DIR" |
1112 | 1112 | else |
1113 | | - push_directory "$BUILD_DIR" |
| 1113 | + push_directory "$BUILD_SRC_DIR" |
1114 | 1114 | fi |
1115 | 1115 |
|
1116 | 1116 | initialize_git |
|
0 commit comments