Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,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' }}
Expand Down Expand Up @@ -139,6 +143,7 @@ jobs:
- name: Execute install.sh
run: >
./install.sh
--enable-isystem
--build-dir=${{ github.workspace }}/build
--prefix=${{ github.workspace }}/prefixenv
${{ env.LINKAGE }}
Expand All @@ -155,7 +160,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 }}
Expand Down Expand Up @@ -305,7 +310,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' }}
Expand Down Expand Up @@ -356,7 +365,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 }}
Expand Down Expand Up @@ -444,7 +453,7 @@ jobs:
uses: microsoft/setup-msbuild@v1.1

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Initialize SDK
shell: powershell
Expand Down
19 changes: 1 addition & 18 deletions builds/msvc/vs2022/libbitcoin-database.import.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,18 +21,7 @@
<Link>
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-database)' != ''">libbitcoin-database.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
$(ProjectDir)..\..\..\..\..\libbitcoin-database\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-database)\;
$(ProjectDir)..\..\..\..\..\libbitcoin-database\obj\libbitcoin-database\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-database)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
$(ProjectDir)..\..\..\..\..\libbitcoin-database\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-database)\;
$(ProjectDir)..\..\..\..\..\libbitcoin-database\obj\libbitcoin-database\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-database)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
</Link>
<Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
<Link>
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
$(ProjectDir)..\..\..\..\..\libbitcoin-database\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-database)\;
$(ProjectDir)..\..\..\..\..\libbitcoin-database\obj\libbitcoin-database\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-database)\;%(AdditionalLibraryDirectories)
Expand All @@ -42,11 +31,5 @@
$(ProjectDir)..\..\..\..\..\libbitcoin-database\obj\libbitcoin-database\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-database)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
</Link>
<Link Condition="$(PlatformToolset) == 'v120'">
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM).-->
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>
19 changes: 1 addition & 18 deletions builds/msvc/vs2022/libbitcoin-system.import.props
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,7 @@
<Link>
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-system)' != ''">libbitcoin-system.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Link Condition="($(PlatformToolset) == 'v120') Or ($(PlatformToolset) == 'CTP_Nov2013')">
<!-- $(PlatformToolset) is hard wired to CTP_Nov2013 to allow for linkage by PlatformToolset=v120 (and CTP_Nov2013) callers. -->
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
$(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-system)\;
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Debug\CTP_Nov2013\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">
$(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-system)\;
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Release\CTP_Nov2013\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
</Link>
<Link Condition="($(PlatformToolset) != 'v120') And ($(PlatformToolset) != 'CTP_Nov2013')">
<Link>
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Debug')) != -1">
$(ProjectDir)..\..\..\..\..\libbitcoin-system\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
Expand All @@ -47,11 +36,5 @@
$(ProjectDir)..\..\..\..\..\libbitcoin-system\obj\libbitcoin-system\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libbitcoin-system)\;%(AdditionalLibraryDirectories)
</AdditionalLibraryDirectories>
</Link>
<Link Condition="$(PlatformToolset) == 'v120'">
<!-- Need to link $(VC_CTP_Nov2013_LibraryPath_x86), $(VC_CTP_Nov2013_LibraryPath_x64), or $(VC_CTP_Nov2013_LibraryPath_ARM). -->
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'ARM'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\arm;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'x64'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib\amd64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories Condition="$(PlatformName) == 'Win32'">$(ProgramFiles)\Microsoft Visual C++ Compiler Nov 2013 CTP\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
</Project>
6 changes: 3 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
30 changes: 21 additions & 9 deletions install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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-database"

# Git clone parameters.
#------------------------------------------------------------------------------
GIT_CLONE_PARAMS="--depth 1 --single-branch"

PRESUMED_CI_PROJECT_PATH=$(pwd)

# ICU archive.
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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#*=}";;
Expand Down Expand Up @@ -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
}

Expand Down
30 changes: 21 additions & 9 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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-database"

# Git clone parameters.
#------------------------------------------------------------------------------
GIT_CLONE_PARAMS="--depth 1 --single-branch"

PRESUMED_CI_PROJECT_PATH=$(pwd)

# ICU archive.
Expand Down Expand Up @@ -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
}

Expand Down Expand Up @@ -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#*=}";;
Expand Down Expand Up @@ -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
}

Expand Down