Skip to content

Commit

Permalink
Regenerate artifacts.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pmienk
pmienk committed Aug 3, 2018
1 parent 88d1896 commit ef9e9e9
Show file tree
Hide file tree
Showing 2 changed files with 71 additions and 90 deletions.
12 changes: 6 additions & 6 deletions configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,12 @@ AS_CASE([${CC}], [*],
[AX_CHECK_COMPILE_FLAG([-Wno-missing-braces],
[CXXFLAGS="$CXXFLAGS -Wno-missing-braces"])])

# Ignore comments within comments or commenting of backslash extended lines.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*],
[AX_CHECK_COMPILE_FLAG([-Wno-comment],
[CXXFLAGS="$CXXFLAGS -Wno-comment"])])

# Conflict in stdlib under clang. Enabled in clang only.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*clang*],
Expand All @@ -290,12 +296,6 @@ AS_CASE([${CC}], [*],
[AX_CHECK_LINK_FLAG([-fstack-protector-all],
[LDFLAGS="$LDFLAGS -fstack-protector-all"])])

# Hide inlines from external libs. Enabled in gcc only.
#------------------------------------------------------------------------------
AS_CASE([${CC}], [*gcc*],
[AX_CHECK_COMPILE_FLAG([-fvisibility-inlines-hidden],
[CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"])])


# Process outputs into templates.
#==============================================================================
Expand Down
149 changes: 65 additions & 84 deletions install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,12 @@
#
# Script options:
# --build-boost Builds Boost libraries.
# --build-zmq Build ZeroMQ libraries.
# --build-zmq Builds ZeroMQ libraries.
# --build-dir=<path> Location of downloaded and intermediate files.
# --prefix=<absolute-path> Library install location (defaults to /usr/local).
# --disable-shared Disables shared library builds.
# --disable-static Disables static library builds.
# --help Display usage, overriding script execution.
#
# Verified on Ubuntu 14.04, requires gcc-4.8 or newer.
# Verified on OSX 10.10, using MacPorts and Homebrew repositories, requires
Expand Down Expand Up @@ -44,6 +45,14 @@ BOOST_ARCHIVE="boost_1_57_0.tar.bz2"

# Define utility functions.
#==============================================================================
configure_links()
{
# Configure dynamic linker run-time bindings when installing to system.
if [[ ($OS == Linux) && ($PREFIX == "/usr/local") ]]; then
ldconfig
fi
}

configure_options()
{
display_message "configure options:"
Expand All @@ -56,14 +65,6 @@ configure_options()
./configure "$@"
}

configure_links()
{
# Configure dynamic linker run-time bindings when installing to system.
if [[ ($OS == Linux) && ($PREFIX == "/usr/local") ]]; then
ldconfig
fi
}

create_directory()
{
local DIRECTORY="$1"
Expand Down Expand Up @@ -91,6 +92,8 @@ display_error()

initialize_git()
{
display_heading_message "Initialize git"

# Initialize git repository at the root of the current directory.
git init
git config user.name anonymous
Expand Down Expand Up @@ -161,13 +164,59 @@ push_directory()
pushd "$DIRECTORY" >/dev/null
}

display_help()
{
display_message "Usage: ./install.sh [OPTION]..."
display_message "Manage the installation of libbitcoin-client."
display_message "Script options:"
display_message " --build-boost Builds Boost libraries."
display_message " --build-zmq Build ZeroMQ libraries."
display_message " --build-dir=<path> Location of downloaded and intermediate files."
display_message " --prefix=<absolute-path> Library install location (defaults to /usr/local)."
display_message " --disable-shared Disables shared library builds."
display_message " --disable-static Disables static library builds."
display_message " --help Display usage, overriding script execution."
display_message ""
display_message "All unrecognized options provided shall be passed as configuration options for "
display_message "all dependencies."
}

# Initialize the build environment.
#==============================================================================
# Exit this script on the first build error.
#------------------------------------------------------------------------------
set -e

# Parse command line options that are handled by this script.
#------------------------------------------------------------------------------
for OPTION in "$@"; do
case $OPTION in
# Standard script options.
(--help) DISPLAY_HELP="yes";;

# Standard build options.
(--prefix=*) PREFIX="${OPTION#*=}";;
(--disable-shared) DISABLE_SHARED="yes";;
(--disable-static) DISABLE_STATIC="yes";;

# Common project options.
(--with-icu) WITH_ICU="yes";;
(--with-png) WITH_PNG="yes";;
(--with-qrencode) WITH_QRENCODE="yes";;

# Custom build options (in the form of --build-<option>).
(--build-icu) BUILD_ICU="yes";;
(--build-zlib) BUILD_ZLIB="yes";;
(--build-png) BUILD_PNG="yes";;
(--build-qrencode) BUILD_QRENCODE="yes";;
(--build-zmq) BUILD_ZMQ="yes";;
(--build-boost) BUILD_BOOST="yes";;

# Unique script options.
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;
esac
done

# Configure build parallelism.
#------------------------------------------------------------------------------
SEQUENTIAL=1
Expand All @@ -180,6 +229,9 @@ elif [[ ($OS == Darwin) || ($OS == OpenBSD) ]]; then
PARALLEL=`sysctl -n hw.ncpu`
else
display_error "Unsupported system: $OS"
display_error " Explicit shell-definition of PARALLEL will avoid system detection."
display_error ""
display_help
exit 1
fi

Expand All @@ -205,32 +257,6 @@ if [[ ($OS == Linux && $CC == "clang") || ($OS == OpenBSD) ]]; then
export CXXFLAGS="-stdlib=lib$STDLIB $CXXFLAGS"
fi

# Parse command line options that are handled by this script.
#------------------------------------------------------------------------------
for OPTION in "$@"; do
case $OPTION in
# Custom build options (in the form of --build-<option>).
(--build-icu) BUILD_ICU="yes";;
(--build-zlib) BUILD_ZLIB="yes";;
(--build-png) BUILD_PNG="yes";;
(--build-qrencode) BUILD_QRENCODE="yes";;
(--build-zmq) BUILD_ZMQ="yes";;
(--build-boost) BUILD_BOOST="yes";;
(--build-dir=*) BUILD_DIR="${OPTION#*=}";;

# Standard build options.
(--prefix=*) PREFIX="${OPTION#*=}";;
(--disable-shared) DISABLE_SHARED="yes";;
(--disable-static) DISABLE_STATIC="yes";;
(--with-icu) WITH_ICU="yes";;
(--with-png) WITH_PNG="yes";;
(--with-qrencode) WITH_QRENCODE="yes";;

# Standard script options.
(--help) DISPLAY_HELP="yes";;
esac
done

# Normalize of static and shared options.
#------------------------------------------------------------------------------
if [[ $DISABLE_SHARED ]]; then
Expand Down Expand Up @@ -279,7 +305,7 @@ fi

display_configuration()
{
display_message "Libbitcoin installer configuration."
display_message "libbitcoin-client installer configuration."
display_message "--------------------------------------------------------------------"
display_message "OS : $OS"
display_message "PARALLEL : $PARALLEL"
Expand All @@ -290,61 +316,17 @@ display_configuration()
display_message "CXXFLAGS : $CXXFLAGS"
display_message "LDFLAGS : $LDFLAGS"
display_message "LDLIBS : $LDLIBS"
display_message "WITH_ICU : $WITH_ICU"
display_message "WITH_PNG : $WITH_PNG"
display_message "WITH_QRENCODE : $WITH_QRENCODE"
display_message "BUILD_ICU : $BUILD_ICU"
display_message "BUILD_ZLIB : $BUILD_ZLIB"
display_message "BUILD_PNG : $BUILD_PNG"
display_message "BUILD_QRENCODE : $BUILD_QRENCODE"
display_message "BUILD_ZMQ : $BUILD_ZMQ"
display_message "BUILD_BOOST : $BUILD_BOOST"
display_message "PREFIX : $PREFIX"
display_message "BUILD_DIR : $BUILD_DIR"
display_message "PREFIX : $PREFIX"
display_message "DISABLE_SHARED : $DISABLE_SHARED"
display_message "DISABLE_STATIC : $DISABLE_STATIC"
display_message "with_boost : ${with_boost}"
display_message "with_pkgconfigdir : ${with_pkgconfigdir}"
display_message "--------------------------------------------------------------------"
}
display_install_help()
{
display_message "Usage: ./install.sh [OPTION]..."
display_message "Manage the installation of libbitcoin-client."
display_message "Script options:"
display_message " --with-icu Compile with International Components for Unicode."
display_message " Since the addition of BIP-39 and later BIP-38 "
display_message " support, libbitcoin conditionally incorporates ICU "
display_message " to provide BIP-38 and BIP-39 passphrase "
display_message " normalization features. Currently "
display_message " libbitcoin-explorer is the only other library that "
display_message " accesses this feature, so if you do not intend to "
display_message " use passphrase normalization this dependency can "
display_message " be avoided."
display_message " --with-qrencode Compile with QR Code Support"
display_message " Since the addition of qrcode support, libbitcoin "
display_message " conditionally incorporates qrencode. Currently "
display_message " libbitcoin-explorer is the only other library that "
display_message " accesses this feature, so if you do not intend to "
display_message " use qrcode this dependency can be avoided."
display_message " --with-png Compile with QR Code PNG Output Support"
display_message " Since the addition of png support, libbitcoin "
display_message " conditionally incorporates libpng (which in turn "
display_message " requires zlib). Currently libbitcoin-explorer is "
display_message " the only other library that accesses this feature, "
display_message " so if you do not intend to use png this dependency "
display_message " can be avoided."
display_message " --build-boost Builds Boost libraries."
display_message " --build-zmq Build ZeroMQ libraries."
display_message " --build-dir=<path> Location of downloaded and intermediate files."
display_message " --prefix=<absolute-path> Library install location (defaults to /usr/local)."
display_message " --disable-shared Disables shared library builds."
display_message " --disable-static Disables static library builds."
display_message " --help Display usage, overriding script execution."
display_message ""
display_message "All unrecognized options provided shall be passed as configuration options for "
display_message "all dependencies."
}


# Define build options.
#==============================================================================
Expand Down Expand Up @@ -395,7 +377,6 @@ BITCOIN_CLIENT_OPTIONS=(

# Define build functions.
#==============================================================================

# Because PKG_CONFIG_PATH doesn't get updated by Homebrew or MacPorts.
initialize_icu_packages()
{
Expand Down Expand Up @@ -746,7 +727,7 @@ build_all()
# Build the primary library and all dependencies.
#==============================================================================
if [[ $DISPLAY_HELP ]]; then
display_install_help
display_help
else
display_configuration
create_directory "$BUILD_DIR"
Expand Down

0 comments on commit ef9e9e9

Please sign in to comment.