Skip to content

Commit d42bfbc

Browse files
evoskuilevoskuil
authored
Merge pull request #294 from pmienk/version3
Update copyright date range, regenerate artifacts.
2 parents c1f6efd + aad877b commit d42bfbc

Some content is hidden

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

46 files changed

+216
-135
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 42 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
@@ -28,6 +28,7 @@ jobs:
2828
zmq: "--build-zmq"
2929
cc: "clang"
3030
flags: "-Os -fPIE"
31+
options: "--enable-isystem"
3132
packager: "apt"
3233
packages: ""
3334

@@ -42,6 +43,7 @@ jobs:
4243
zmq: "--build-zmq"
4344
cc: "clang"
4445
flags: "-Os -fPIE"
46+
options: "--enable-isystem"
4547
packager: "apt"
4648
packages: ""
4749

@@ -56,6 +58,7 @@ jobs:
5658
zmq: "--build-zmq"
5759
cc: "gcc"
5860
flags: "-Os -fPIE"
61+
options: "--enable-isystem"
5962
packager: "apt"
6063
packages: ""
6164

@@ -70,6 +73,7 @@ jobs:
7073
zmq: "--build-zmq"
7174
cc: "gcc"
7275
flags: "-Og -g --coverage -fPIE"
76+
options: "--enable-isystem"
7377
packager: "apt"
7478
packages: "lcov"
7579

@@ -84,6 +88,7 @@ jobs:
8488
zmq: "--build-zmq"
8589
cc: "clang"
8690
flags: "-Os -fPIE"
91+
options: "--enable-isystem"
8792
packager: "brew"
8893
packages: ""
8994

@@ -98,6 +103,7 @@ jobs:
98103
zmq: "--build-zmq"
99104
cc: "clang"
100105
flags: "-Os -fvisibility=hidden -fPIE"
106+
options: "--enable-isystem"
101107
packager: "brew"
102108
packages: ""
103109

@@ -149,11 +155,16 @@ jobs:
149155
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
150156
fi
151157
158+
- name: Display CPU details
159+
if: ${{ (runner.os == 'Linux') }}
160+
shell: bash
161+
run: |
162+
lscpu
163+
152164
- name: Execute install.sh
153165
run: >
154166
./install.sh
155-
--enable-isystem
156-
--build-dir=$LIBBITCOIN_SRC_PATH
167+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
157168
--prefix=$LIBBITCOIN_SRC_PATH/prefix
158169
${{ env.LINKAGE }}
159170
${{ env.ASSERT_NDEBUG }}
@@ -207,11 +218,11 @@ jobs:
207218
run: |
208219
cat ${{ github.workspace }}/build/build-*/bootstrap.log
209220
221+
210222
- name: Failure display otool output
211223
if: ${{ failure() && (matrix.os == 'macos-latest') }}
212224
run: |
213225
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
214-
215226
- name: Failure display DYLD_PRINT_LIBRARIES
216227
if: ${{ failure() && (matrix.os == 'macos-latest') }}
217228
run: |
@@ -241,6 +252,7 @@ jobs:
241252
zmq: "--build-zmq"
242253
cc: "clang"
243254
flags: "-Os -fPIE"
255+
options: ""
244256
packager: "apt"
245257
packages: ""
246258

@@ -255,6 +267,7 @@ jobs:
255267
zmq: "--build-zmq"
256268
cc: "clang"
257269
flags: "-Os -fPIE"
270+
options: ""
258271
packager: "apt"
259272
packages: ""
260273

@@ -269,6 +282,7 @@ jobs:
269282
zmq: "--build-zmq"
270283
cc: "gcc"
271284
flags: "-Os -fPIE"
285+
options: ""
272286
packager: "apt"
273287
packages: ""
274288

@@ -283,6 +297,7 @@ jobs:
283297
zmq: "--build-zmq"
284298
cc: "gcc"
285299
flags: "-Og -fPIE"
300+
options: ""
286301
packager: "apt"
287302
packages: ""
288303

@@ -297,6 +312,7 @@ jobs:
297312
zmq: "--build-zmq"
298313
cc: "clang"
299314
flags: "-Os -fPIE"
315+
options: ""
300316
packager: "brew"
301317
packages: ""
302318

@@ -311,6 +327,7 @@ jobs:
311327
zmq: "--build-zmq"
312328
cc: "clang"
313329
flags: "-Os -fvisibility=hidden -fPIE"
330+
options: ""
314331
packager: "brew"
315332
packages: ""
316333

@@ -365,10 +382,16 @@ jobs:
365382
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
366383
fi
367384
385+
- name: Display CPU details
386+
if: ${{ (runner.os == 'Linux') }}
387+
shell: bash
388+
run: |
389+
lscpu
390+
368391
- name: Execute install-cmake.sh
369392
run: >
370393
./install-cmake.sh
371-
--build-dir=$LIBBITCOIN_SRC_PATH
394+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
372395
--prefix=$LIBBITCOIN_SRC_PATH/prefix
373396
${{ env.LINKAGE }}
374397
${{ env.ASSERT_NDEBUG }}
@@ -422,11 +445,11 @@ jobs:
422445
run: |
423446
cat ${{ github.workspace }}/build/build-*/bootstrap.log
424447
448+
425449
- name: Failure display otool output
426450
if: ${{ failure() && (matrix.os == 'macos-latest') }}
427451
run: |
428452
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
429-
430453
- name: Failure display DYLD_PRINT_LIBRARIES
431454
if: ${{ failure() && (matrix.os == 'macos-latest') }}
432455
run: |
@@ -467,6 +490,7 @@ jobs:
467490
zmq: "--build-zmq"
468491
cc: "clang"
469492
flags: "-Os -fPIE"
493+
options: ""
470494
packager: "apt"
471495
packages: ""
472496

@@ -482,6 +506,7 @@ jobs:
482506
zmq: "--build-zmq"
483507
cc: "clang"
484508
flags: "-Os -fPIE"
509+
options: ""
485510
packager: "apt"
486511
packages: ""
487512

@@ -497,6 +522,7 @@ jobs:
497522
zmq: "--build-zmq"
498523
cc: "gcc"
499524
flags: "-Os -fPIE"
525+
options: ""
500526
packager: "apt"
501527
packages: ""
502528

@@ -551,10 +577,16 @@ jobs:
551577
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
552578
fi
553579
580+
- name: Display CPU details
581+
if: ${{ (runner.os == 'Linux') }}
582+
shell: bash
583+
run: |
584+
lscpu
585+
554586
- name: Execute install-cmakepresets.sh
555587
run: >
556588
./install-cmakepresets.sh
557-
--build-dir=$LIBBITCOIN_SRC_PATH
589+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
558590
--prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
559591
--preset=${{ matrix.preset }}
560592
${{ env.LINKAGE }}
@@ -609,11 +641,11 @@ jobs:
609641
run: |
610642
cat ${{ github.workspace }}/build/build-*/bootstrap.log
611643
644+
612645
- name: Failure display otool output
613646
if: ${{ failure() && (matrix.os == 'macos-latest') }}
614647
run: |
615648
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-client-test
616-
617649
- name: Failure display DYLD_PRINT_LIBRARIES
618650
if: ${{ failure() && (matrix.os == 'macos-latest') }}
619651
run: |
@@ -670,6 +702,8 @@ jobs:
670702
steps:
671703
- name: Add msbuild to PATH
672704
uses: microsoft/[email protected]
705+
with:
706+
msbuild-architecture: x64
673707

674708
- name: Checkout repository
675709
uses: actions/checkout@v3

‎Makefile.am‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#

‎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-2020 libbitcoin-client developers (see COPYING).
3+
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
44
#
55
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
#

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
REM ###########################################################################
2-
REM # Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
2+
REM # Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
33
REM #
44
REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
REM #

‎builds/cmake/CMakeLists.txt‎

Lines changed: 57 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2020 libbitcoin-client developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
@@ -16,6 +16,8 @@ enable_testing()
1616
list( APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/modules" )
1717
include(CheckIncludeFiles)
1818
include(CheckSymbolExists)
19+
include(CheckCXXCompilerFlag)
20+
include(CheckCXXSourceCompiles)
1921

2022
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
2123

@@ -40,32 +42,77 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON )
4042
# Add compiler options
4143
#------------------------------------------------------------------------------
4244
# Warn on all stuff.
43-
add_compile_options( "-Wall" )
45+
check_cxx_compiler_flag( "-Wall" HAS_FLAG_WALL )
46+
if ( HAS_FLAG_WALL )
47+
add_compile_options( "-Wall" )
48+
else()
49+
message( FATAL_ERROR "Compiler does not support -Wall" )
50+
endif()
4451

4552
# Warn on extra stuff.
46-
add_compile_options( "-Wextra" )
53+
check_cxx_compiler_flag( "-Wextra" HAS_FLAG_WEXTRA )
54+
if ( HAS_FLAG_WEXTRA )
55+
add_compile_options( "-Wextra" )
56+
else()
57+
message( FATAL_ERROR "Compiler does not support -Wextra" )
58+
endif()
4759

4860
# Be really annoying.
49-
add_compile_options( "-Wpedantic" )
61+
check_cxx_compiler_flag( "-Wpedantic" HAS_FLAG_WPEDANTIC )
62+
if ( HAS_FLAG_WPEDANTIC )
63+
add_compile_options( "-Wpedantic" )
64+
else()
65+
message( FATAL_ERROR "Compiler does not support -Wpedantic" )
66+
endif()
5067

5168
# Disallow warning on style order of declarations.
52-
add_compile_options( "-Wno-reorder" )
69+
check_cxx_compiler_flag( "-Wno-reorder" HAS_FLAG_WNO-REORDER )
70+
if ( HAS_FLAG_WNO-REORDER )
71+
add_compile_options( "-Wno-reorder" )
72+
else()
73+
message( FATAL_ERROR "Compiler does not support -Wno-reorder" )
74+
endif()
5375

5476
# Suppress warning for incomplete field initialization.
55-
add_compile_options( "-Wno-missing-field-initializers" )
77+
check_cxx_compiler_flag( "-Wno-missing-field-initializers" HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS )
78+
if ( HAS_FLAG_WNO-MISSING-FIELD-INITIALIZERS )
79+
add_compile_options( "-Wno-missing-field-initializers" )
80+
else()
81+
message( FATAL_ERROR "Compiler does not support -Wno-missing-field-initializers" )
82+
endif()
5683

5784
# Conform to style.
58-
add_compile_options( "-Wno-missing-braces" )
85+
check_cxx_compiler_flag( "-Wno-missing-braces" HAS_FLAG_WNO-MISSING-BRACES )
86+
if ( HAS_FLAG_WNO-MISSING-BRACES )
87+
add_compile_options( "-Wno-missing-braces" )
88+
else()
89+
message( FATAL_ERROR "Compiler does not support -Wno-missing-braces" )
90+
endif()
5991

6092
# Ignore comments within comments or commenting of backslash extended lines.
61-
add_compile_options( "-Wno-comment" )
93+
check_cxx_compiler_flag( "-Wno-comment" HAS_FLAG_WNO-COMMENT )
94+
if ( HAS_FLAG_WNO-COMMENT )
95+
add_compile_options( "-Wno-comment" )
96+
else()
97+
message( FATAL_ERROR "Compiler does not support -Wno-comment" )
98+
endif()
6299

63100
# Suppress warning for copy of implicitly generated copy constructor.
64-
add_compile_options( "-Wno-deprecated-copy" )
101+
check_cxx_compiler_flag( "-Wno-deprecated-copy" HAS_FLAG_WNO-DEPRECATED-COPY )
102+
if ( HAS_FLAG_WNO-DEPRECATED-COPY )
103+
add_compile_options( "-Wno-deprecated-copy" )
104+
else()
105+
message( FATAL_ERROR "Compiler does not support -Wno-deprecated-copy" )
106+
endif()
65107

66108
# Conflict in stdlib under clang.
67109
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
68-
add_compile_options( "-Wno-mismatched-tags" )
110+
check_cxx_compiler_flag( "-Wno-mismatched-tags" HAS_FLAG_WNO-MISMATCHED-TAGS )
111+
if ( HAS_FLAG_WNO-MISMATCHED-TAGS )
112+
add_compile_options( "-Wno-mismatched-tags" )
113+
else()
114+
message( FATAL_ERROR "Compiler does not support -Wno-mismatched-tags" )
115+
endif()
69116
endif()
70117

71118
# Implement -Dpkgconfigdir and output ${pkgconfigdir}.

‎builds/cmake/modules/FindBitcoin-Protocol.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2020 libbitcoin-server developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-server developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#

‎builds/cmake/modules/FindBitcoin-System.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#

‎builds/cmake/modules/FindBitcoin.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
###############################################################################
2-
# Copyright (c) 2014-2020 libbitcoin-protocol developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-protocol developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#

‎builds/msvc/debug.natvis‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
| Copyright (c) 2014-2021 libbitcoin-client developers (see COPYING).
3+
| Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
44
|
55
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
|

‎builds/msvc/vs2022/libbitcoin-client-examples/libbitcoin-client-examples.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!--
3-
| Copyright (c) 2014-2021 libbitcoin-client developers (see COPYING).
3+
| Copyright (c) 2014-2023 libbitcoin-client developers (see COPYING).
44
|
55
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
|

0 commit comments

Comments
 (0)