Skip to content

Commit

Permalink
Merge pull request #294 from pmienk/version3
Browse files Browse the repository at this point in the history
Update copyright date range, regenerate artifacts.
  • Loading branch information
evoskuil authored Aug 17, 2023
2 parents c1f6efd + aad877b commit d42bfbc
Show file tree
Hide file tree
Showing 46 changed files with 216 additions and 135 deletions.
50 changes: 42 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down Expand Up @@ -28,6 +28,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: "--enable-isystem"
packager: "apt"
packages: ""

Expand All @@ -42,6 +43,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: "--enable-isystem"
packager: "apt"
packages: ""

Expand All @@ -56,6 +58,7 @@ jobs:
zmq: "--build-zmq"
cc: "gcc"
flags: "-Os -fPIE"
options: "--enable-isystem"
packager: "apt"
packages: ""

Expand All @@ -70,6 +73,7 @@ jobs:
zmq: "--build-zmq"
cc: "gcc"
flags: "-Og -g --coverage -fPIE"
options: "--enable-isystem"
packager: "apt"
packages: "lcov"

Expand All @@ -84,6 +88,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: "--enable-isystem"
packager: "brew"
packages: ""

Expand All @@ -98,6 +103,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
options: "--enable-isystem"
packager: "brew"
packages: ""

Expand Down Expand Up @@ -149,11 +155,16 @@ jobs:
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
fi
- name: Display CPU details
if: ${{ (runner.os == 'Linux') }}
shell: bash
run: |
lscpu
- name: Execute install.sh
run: >
./install.sh
--enable-isystem
--build-dir=$LIBBITCOIN_SRC_PATH
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
--prefix=$LIBBITCOIN_SRC_PATH/prefix
${{ env.LINKAGE }}
${{ env.ASSERT_NDEBUG }}
Expand Down Expand Up @@ -207,11 +218,11 @@ jobs:
run: |
cat ${{ github.workspace }}/build/build-*/bootstrap.log
- name: Failure display otool output
if: ${{ failure() && (matrix.os == 'macos-latest') }}
run: |
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
- name: Failure display DYLD_PRINT_LIBRARIES
if: ${{ failure() && (matrix.os == 'macos-latest') }}
run: |
Expand Down Expand Up @@ -241,6 +252,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: ""
packager: "apt"
packages: ""

Expand All @@ -255,6 +267,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: ""
packager: "apt"
packages: ""

Expand All @@ -269,6 +282,7 @@ jobs:
zmq: "--build-zmq"
cc: "gcc"
flags: "-Os -fPIE"
options: ""
packager: "apt"
packages: ""

Expand All @@ -283,6 +297,7 @@ jobs:
zmq: "--build-zmq"
cc: "gcc"
flags: "-Og -fPIE"
options: ""
packager: "apt"
packages: ""

Expand All @@ -297,6 +312,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: ""
packager: "brew"
packages: ""

Expand All @@ -311,6 +327,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fvisibility=hidden -fPIE"
options: ""
packager: "brew"
packages: ""

Expand Down Expand Up @@ -365,10 +382,16 @@ jobs:
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
fi
- name: Display CPU details
if: ${{ (runner.os == 'Linux') }}
shell: bash
run: |
lscpu
- name: Execute install-cmake.sh
run: >
./install-cmake.sh
--build-dir=$LIBBITCOIN_SRC_PATH
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
--prefix=$LIBBITCOIN_SRC_PATH/prefix
${{ env.LINKAGE }}
${{ env.ASSERT_NDEBUG }}
Expand Down Expand Up @@ -422,11 +445,11 @@ jobs:
run: |
cat ${{ github.workspace }}/build/build-*/bootstrap.log
- name: Failure display otool output
if: ${{ failure() && (matrix.os == 'macos-latest') }}
run: |
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
- name: Failure display DYLD_PRINT_LIBRARIES
if: ${{ failure() && (matrix.os == 'macos-latest') }}
run: |
Expand Down Expand Up @@ -467,6 +490,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: ""
packager: "apt"
packages: ""

Expand All @@ -482,6 +506,7 @@ jobs:
zmq: "--build-zmq"
cc: "clang"
flags: "-Os -fPIE"
options: ""
packager: "apt"
packages: ""

Expand All @@ -497,6 +522,7 @@ jobs:
zmq: "--build-zmq"
cc: "gcc"
flags: "-Os -fPIE"
options: ""
packager: "apt"
packages: ""

Expand Down Expand Up @@ -551,10 +577,16 @@ jobs:
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
fi
- name: Display CPU details
if: ${{ (runner.os == 'Linux') }}
shell: bash
run: |
lscpu
- name: Execute install-cmakepresets.sh
run: >
./install-cmakepresets.sh
--build-dir=$LIBBITCOIN_SRC_PATH
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
--prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
--preset=${{ matrix.preset }}
${{ env.LINKAGE }}
Expand Down Expand Up @@ -609,11 +641,11 @@ jobs:
run: |
cat ${{ github.workspace }}/build/build-*/bootstrap.log
- name: Failure display otool output
if: ${{ failure() && (matrix.os == 'macos-latest') }}
run: |
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
- name: Failure display DYLD_PRINT_LIBRARIES
if: ${{ failure() && (matrix.os == 'macos-latest') }}
run: |
Expand Down Expand Up @@ -670,6 +702,8 @@ jobs:
steps:
- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v1.1
with:
msbuild-architecture: x64

- name: Checkout repository
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion autogen.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/sh
###############################################################################
# Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
REM ###########################################################################
REM # Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
REM # Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
REM #
REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
REM #
Expand Down
67 changes: 57 additions & 10 deletions builds/cmake/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand All @@ -16,6 +16,8 @@ enable_testing()
list( APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules" )
include(CheckIncludeFiles)
include(CheckSymbolExists)
include(CheckCXXCompilerFlag)
include(CheckCXXSourceCompiles)

set_property(GLOBAL PROPERTY USE_FOLDERS ON)

Expand All @@ -40,32 +42,77 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON )
# Add compiler options
#------------------------------------------------------------------------------
# Warn on all stuff.
add_compile_options( "-Wall" )
check_cxx_compiler_flag( "-Wall" HAS_FLAG_WALL )
if ( HAS_FLAG_WALL )
add_compile_options( "-Wall" )
else()
message( FATAL_ERROR "Compiler does not support -Wall" )
endif()

# Warn on extra stuff.
add_compile_options( "-Wextra" )
check_cxx_compiler_flag( "-Wextra" HAS_FLAG_WEXTRA )
if ( HAS_FLAG_WEXTRA )
add_compile_options( "-Wextra" )
else()
message( FATAL_ERROR "Compiler does not support -Wextra" )
endif()

# Be really annoying.
add_compile_options( "-Wpedantic" )
check_cxx_compiler_flag( "-Wpedantic" HAS_FLAG_WPEDANTIC )
if ( HAS_FLAG_WPEDANTIC )
add_compile_options( "-Wpedantic" )
else()
message( FATAL_ERROR "Compiler does not support -Wpedantic" )
endif()

# Disallow warning on style order of declarations.
add_compile_options( "-Wno-reorder" )
check_cxx_compiler_flag( "-Wno-reorder" HAS_FLAG_WNO-REORDER )
if ( HAS_FLAG_WNO-REORDER )
add_compile_options( "-Wno-reorder" )
else()
message( FATAL_ERROR "Compiler does not support -Wno-reorder" )
endif()

# Suppress warning for incomplete field initialization.
add_compile_options( "-Wno-missing-field-initializers" )
check_cxx_compiler_flag( "-Wno-missing-field-initializers" HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS )
if ( HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS )
add_compile_options( "-Wno-missing-field-initializers" )
else()
message( FATAL_ERROR "Compiler does not support -Wno-missing-field-initializers" )
endif()

# Conform to style.
add_compile_options( "-Wno-missing-braces" )
check_cxx_compiler_flag( "-Wno-missing-braces" HAS_FLAG_WNO-MISSING-BRACES )
if ( HAS_FLAG_WNO-MISSING-BRACES )
add_compile_options( "-Wno-missing-braces" )
else()
message( FATAL_ERROR "Compiler does not support -Wno-missing-braces" )
endif()

# Ignore comments within comments or commenting of backslash extended lines.
add_compile_options( "-Wno-comment" )
check_cxx_compiler_flag( "-Wno-comment" HAS_FLAG_WNO-COMMENT )
if ( HAS_FLAG_WNO-COMMENT )
add_compile_options( "-Wno-comment" )
else()
message( FATAL_ERROR "Compiler does not support -Wno-comment" )
endif()

# Suppress warning for copy of implicitly generated copy constructor.
add_compile_options( "-Wno-deprecated-copy" )
check_cxx_compiler_flag( "-Wno-deprecated-copy" HAS_FLAG_WNO-DEPRECATED-COPY )
if ( HAS_FLAG_WNO-DEPRECATED-COPY )
add_compile_options( "-Wno-deprecated-copy" )
else()
message( FATAL_ERROR "Compiler does not support -Wno-deprecated-copy" )
endif()

# Conflict in stdlib under clang.
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
add_compile_options( "-Wno-mismatched-tags" )
check_cxx_compiler_flag( "-Wno-mismatched-tags" HAS_FLAG_WNO-MISMATCHED-TAGS )
if ( HAS_FLAG_WNO-MISMATCHED-TAGS )
add_compile_options( "-Wno-mismatched-tags" )
else()
message( FATAL_ERROR "Compiler does not support -Wno-mismatched-tags" )
endif()
endif()

# Implement -Dpkgconfigdir and output ${pkgconfigdir}.
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/modules/FindBitcoin-Protocol.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
# Copyright (c) 2014-2023 libbitcoin-server developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/modules/FindBitcoin-System.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING).
# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/modules/FindBitcoin.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
###############################################################################
# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING).
# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING).
#
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
#
Expand Down
2 changes: 1 addition & 1 deletion builds/msvc/debug.natvis
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2021 libbitcoin-client developers (see COPYING).
| Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2021 libbitcoin-client developers (see COPYING).
| Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
| Copyright (c) 2014-2021 libbitcoin-client developers (see COPYING).
| Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
|
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
|
Expand Down
Loading

0 comments on commit d42bfbc

Please sign in to comment.