Skip to content

Commit 5820e55

Browse files
evoskuilevoskuil
authored
Merge pull request #288 from evoskuil/version3
Revise build configuration.
2 parents e358e42 + ec4473a commit 5820e55

104 files changed

Lines changed: 1387 additions & 856 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.appveyor.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
###############################################################################
2-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
66
###############################################################################
7-
version: 3.6.0.{build}-{branch}
7+
version: 3.7.0.{build}-{branch}
88

99
image: Visual Studio 2013
1010

‎.travis.yml‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
@@ -19,6 +19,7 @@ addons:
1919
matrix:
2020
include:
2121
- os: osx
22+
osx_image: xcode12.2
2223
compiler: clang
2324
env: LINK=dynamic
2425
- os: osx
@@ -59,34 +60,31 @@ before_install:
5960
- if [[ $TRAVIS_OS_NAME == osx ]]; then OSX=true; fi
6061
- if [[ $TRAVIS_OS_NAME == linux ]]; then LINUX=true; fi
6162

62-
# Update homebrew.
63-
- if [[ $OSX && $CLANG ]]; then brew update; fi
64-
6563
install:
6664

6765
# Export CC/CXX to control compiler/version.
68-
- if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi
69-
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi
70-
- if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi
7166
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
67+
- if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi
7268
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi
69+
- if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi
7370
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then export CC=gcc-4.8; export CXX=g++-4.8; fi
71+
- if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi
7472

7573
# Download and install packages.
7674

7775
script:
7876

7977
# Download and build libbitcoin-database and all dependencies.
80-
- if [[ $OSX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
81-
- if [[ $LINUX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
82-
- if [[ $LINUX && $GCC && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
8378
- if [[ $OSX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-static; fi
79+
- if [[ $OSX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi
8480
- if [[ $LINUX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-boost --disable-ndebug --disable-static --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
81+
- if [[ $LINUX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os' CXXFLAGS='-Os'; fi
8582
- if [[ $LINUX && $GCC && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-static --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Os -s' CXXFLAGS='-Os -s'; fi
83+
- if [[ $LINUX && $GCC && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --build-boost --disable-shared --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi
8684

8785
after_success:
8886

89-
# Download and unpack lcov > 1.10
87+
# Download and unpack lcov.
9088
- if [[ $LINUX && $GCC && $STATIC ]]; then wget https://github.com/linux-test-project/lcov/releases/download/v1.12/lcov-1.12.tar.gz; fi
9189
- if [[ $LINUX && $GCC && $STATIC ]]; then tar xzf lcov-1.12.tar.gz; fi
9290
- if [[ $LINUX && $GCC && $STATIC ]]; then cd lcov-1.12; PREFIX="$TRAVIS_BUILD_DIR/my-prefix" make install; cd ..; fi

‎Makefile.am‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
@@ -32,8 +32,8 @@ doc_DATA = \
3232
# src/libbitcoin-database.la => ${libdir}
3333
#------------------------------------------------------------------------------
3434
lib_LTLIBRARIES = src/libbitcoin-database.la
35-
src_libbitcoin_database_la_CPPFLAGS = -I${srcdir}/include ${bitcoin_BUILD_CPPFLAGS}
36-
src_libbitcoin_database_la_LIBADD = ${bitcoin_LIBS}
35+
src_libbitcoin_database_la_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
36+
src_libbitcoin_database_la_LIBADD = ${bitcoin_system_LIBS}
3737
src_libbitcoin_database_la_SOURCES = \
3838
src/data_base.cpp \
3939
src/settings.cpp \
@@ -65,8 +65,8 @@ if WITH_TESTS
6565
TESTS = libbitcoin-database-test_runner.sh
6666

6767
check_PROGRAMS = test/libbitcoin-database-test
68-
test_libbitcoin_database_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_BUILD_CPPFLAGS}
69-
test_libbitcoin_database_test_LDADD = src/libbitcoin-database.la ${boost_unit_test_framework_LIBS} ${bitcoin_LIBS}
68+
test_libbitcoin_database_test_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
69+
test_libbitcoin_database_test_LDADD = src/libbitcoin-database.la ${boost_unit_test_framework_LIBS} ${bitcoin_system_LIBS}
7070
test_libbitcoin_database_test_SOURCES = \
7171
test/block_database.cpp \
7272
test/data_base.cpp \
@@ -86,8 +86,8 @@ endif WITH_TESTS
8686
if WITH_TOOLS
8787

8888
noinst_PROGRAMS = tools/initchain/initchain
89-
tools_initchain_initchain_CPPFLAGS = -I${srcdir}/include ${bitcoin_BUILD_CPPFLAGS}
90-
tools_initchain_initchain_LDADD = src/libbitcoin-database.la ${bitcoin_LIBS}
89+
tools_initchain_initchain_CPPFLAGS = -I${srcdir}/include ${bitcoin_system_BUILD_CPPFLAGS}
90+
tools_initchain_initchain_LDADD = src/libbitcoin-database.la ${bitcoin_system_LIBS}
9191
tools_initchain_initchain_SOURCES = \
9292
tools/initchain/initchain.cpp
9393

‎autogen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22
###############################################################################
3-
# Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
3+
# Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
44
#
55
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
#

‎build.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REM ###########################################################################
2-
REM # Copyright (c) 2014-2015 libbitcoin-database developers (see COPYING).
2+
REM # Copyright (c) 2014-2020 libbitcoin-database developers (see COPYING).
33
REM #
44
REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
REM #
@@ -23,9 +23,9 @@ IF NOT EXIST "%nuget_pkg_path%" (
2323
)
2424
)
2525

26-
call :init libbitcoin libbitcoin version3
26+
call :init libbitcoin libbitcoin-system version3
2727
IF %ERRORLEVEL% NEQ 0 (
28-
call :failure "Initializing repository libbitcoin libbitcoin version3 failed."
28+
call :failure "Initializing repository libbitcoin libbitcoin-system version3 failed."
2929
exit /b 1
3030
)
3131
call :bld_repo libbitcoin-database

0 commit comments

Comments
 (0)