Merge pull request #442 from pmienk/version3

Regenerate artifacts.

Author: evoskuil

.github/workflows/ci.yml

@@ -113,7 +113,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Prepare toolchain [generic]
+        run: |
+          git config --global init.defaultBranch master
 
       - name: Prepare toolchain [apt]
         if: ${{ matrix.packager == 'apt' }}
@@ -145,6 +149,7 @@ jobs:
       - name: Execute install.sh
         run: >
           ./install.sh
+          --enable-isystem
           --build-dir=${{ github.workspace }}/build
           --prefix=${{ github.workspace }}/prefixenv
           ${{ env.LINKAGE }}
@@ -162,7 +167,7 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: coverallsapp/github-action@master
+        uses: pmienk/coveralls-github-action@master
         with:
           path-to-lcov: "./coverage.info"
           github-token: ${{ secrets.github_token }}
@@ -318,7 +323,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
+
+      - name: Prepare toolchain [generic]
+        run: |
+          git config --global init.defaultBranch master
 
       - name: Prepare toolchain [apt]
         if: ${{ matrix.packager == 'apt' }}
@@ -370,7 +379,7 @@ jobs:
 
       - name: Coveralls.io Upload
         if: ${{ matrix.coverage == 'cov' }}
-        uses: coverallsapp/github-action@master
+        uses: pmienk/coveralls-github-action@master
         with:
           path-to-lcov: "./coverage.info"
           github-token: ${{ secrets.github_token }}
@@ -458,7 +467,7 @@ jobs:
         uses: microsoft/setup-msbuild@v1.1
 
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Initialize SDK
         shell: powershell

configure.ac

@@ -37,14 +37,14 @@ AM_PROG_AR
 
 # Initialize libtool.
 LT_PREREQ(2.4.2)
+
+# Enable shared libraries if available, and static if they don't conflict.
 LT_INIT
+AC_SUBST([LIBTOOL_DEPS])
 
 # Determine C++ compiler to use.
 AC_PROG_CXX
 
-# Enable shared libraries if available, and static if they don't conflict.
-AC_PROG_LIBTOOL
-
 # Enable sed for substitution.
 AC_PROG_SED
 

install-cmake.sh

@@ -23,6 +23,7 @@
 # --prefix=<absolute-path> Library install location (defaults to /usr/local).
 # --disable-shared         Disables shared library builds.
 # --disable-static         Disables static library builds.
+# --verbose                Display verbose output (defaults to quiet on called tooling).
 # --help                   Display usage, overriding script execution.
 #
 # Verified on Ubuntu 14.04, requires gcc-4.8 or newer.
@@ -46,17 +47,13 @@ SEQUENTIAL=1
 if [[ $GIT_CLONE_PARAMS ]]; then
     display_message "Using shell-defined GIT_CLONE_PARAMS value."
 else
-    GIT_CLONE_PARAMS=""
+    GIT_CLONE_PARAMS="--depth 1 --single-branch"
 fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
 BUILD_DIR="build-libbitcoin-node"
 
-# Git clone parameters.
-#------------------------------------------------------------------------------
-GIT_CLONE_PARAMS="--depth 1 --single-branch"
-
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
 # ICU archive.
@@ -156,12 +153,17 @@ make_jobs()
     local JOBS=$1
     shift 1
 
+    VERBOSITY=""
+    if [[ DISPLAY_VERBOSE ]]; then
+        VERBOSITY="VERBOSE=1"
+    fi
+
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
     if [[ $JOBS > $SEQUENTIAL ]]; then
-        make -j"$JOBS" "$@"
+        make -j"$JOBS" "$@" $VERBOSITY
     else
-        make "$@"
+        make "$@" $VERBOSITY
     fi
 }
 
@@ -245,6 +247,7 @@ parse_command_line_options()
         case $OPTION in
             # Standard script options.
             (--help)                DISPLAY_HELP="yes";;
+            (--verbose)             DISPLAY_VERBOSE="yes";;
 
             # Standard build options.
             (--prefix=*)            PREFIX="${OPTION#*=}";;
@@ -317,7 +320,7 @@ set_os_specific_compiler_settings()
 
 link_to_standard_library()
 {
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         export LDLIBS="-l$STDLIB $LDLIBS"
         export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
     fi
@@ -509,9 +512,18 @@ extract_from_tarball()
     push_directory "$TARGET_DIR"
 
     # Extract the source locally.
-    wget --output-document "$ARCHIVE" "$URL"
-    tar --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1
+    WGET="wget --quiet"
+    TAR="tar"
+
+    if [[ $DISPLAY_VERBOSE ]]; then
+        WGET="wget --verbose"
+        TAR="tar --verbose"
+    fi
+
+    $WGET --output-document "$ARCHIVE" "$URL"
+    $TAR --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1
 
+    display_message "Completed download and extraction successfully."
     pop_directory
 }
 
@@ -751,7 +763,7 @@ initialize_boost_configuration()
         BOOST_TOOLSET="toolset=$CC"
     fi
 
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         STDLIB_FLAG="-stdlib=lib$STDLIB"
         BOOST_CXXFLAGS="cxxflags=$STDLIB_FLAG"
         BOOST_LINKFLAGS="linkflags=$STDLIB_FLAG"

install.sh

@@ -23,6 +23,7 @@
 # --prefix=<absolute-path> Library install location (defaults to /usr/local).
 # --disable-shared         Disables shared library builds.
 # --disable-static         Disables static library builds.
+# --verbose                Display verbose output (defaults to quiet on called tooling).
 # --help                   Display usage, overriding script execution.
 #
 # Verified on Ubuntu 14.04, requires gcc-4.8 or newer.
@@ -46,17 +47,13 @@ SEQUENTIAL=1
 if [[ $GIT_CLONE_PARAMS ]]; then
     display_message "Using shell-defined GIT_CLONE_PARAMS value."
 else
-    GIT_CLONE_PARAMS=""
+    GIT_CLONE_PARAMS="--depth 1 --single-branch"
 fi
 
 # The default build directory.
 #------------------------------------------------------------------------------
 BUILD_DIR="build-libbitcoin-node"
 
-# Git clone parameters.
-#------------------------------------------------------------------------------
-GIT_CLONE_PARAMS="--depth 1 --single-branch"
-
 PRESUMED_CI_PROJECT_PATH=$(pwd)
 
 # ICU archive.
@@ -156,12 +153,17 @@ make_jobs()
     local JOBS=$1
     shift 1
 
+    VERBOSITY=""
+    if [[ DISPLAY_VERBOSE ]]; then
+        VERBOSITY="VERBOSE=1"
+    fi
+
     SEQUENTIAL=1
     # Avoid setting -j1 (causes problems on single threaded systems [TRAVIS]).
     if [[ $JOBS > $SEQUENTIAL ]]; then
-        make -j"$JOBS" "$@"
+        make -j"$JOBS" "$@" $VERBOSITY
     else
-        make "$@"
+        make "$@" $VERBOSITY
     fi
 }
 
@@ -245,6 +247,7 @@ parse_command_line_options()
         case $OPTION in
             # Standard script options.
             (--help)                DISPLAY_HELP="yes";;
+            (--verbose)             DISPLAY_VERBOSE="yes";;
 
             # Standard build options.
             (--prefix=*)            PREFIX="${OPTION#*=}";;
@@ -312,7 +315,7 @@ set_os_specific_compiler_settings()
 
 link_to_standard_library()
 {
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         export LDLIBS="-l$STDLIB $LDLIBS"
         export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
     fi
@@ -446,9 +449,18 @@ extract_from_tarball()
     push_directory "$TARGET_DIR"
 
     # Extract the source locally.
-    wget --output-document "$ARCHIVE" "$URL"
-    tar --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1
+    WGET="wget --quiet"
+    TAR="tar"
+
+    if [[ $DISPLAY_VERBOSE ]]; then
+        WGET="wget --verbose"
+        TAR="tar --verbose"
+    fi
+
+    $WGET --output-document "$ARCHIVE" "$URL"
+    $TAR --extract --file "$ARCHIVE" "--$COMPRESSION" --strip-components=1
 
+    display_message "Completed download and extraction successfully."
     pop_directory
 }
 
@@ -625,7 +637,7 @@ initialize_boost_configuration()
         BOOST_TOOLSET="toolset=$CC"
     fi
 
-    if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
+    if [[ ($OS == Linux && $CC == clang*) || ($OS == OpenBSD) ]]; then
         STDLIB_FLAG="-stdlib=lib$STDLIB"
         BOOST_CXXFLAGS="cxxflags=$STDLIB_FLAG"
         BOOST_LINKFLAGS="linkflags=$STDLIB_FLAG"