Skip to content

Commit 251d558

Browse files
evoskuilevoskuil
authored
Merge pull request #359 from pmienk/version3
Update copyright date range, regenerate artifacts.
2 parents 2143080 + eee1131 commit 251d558

File tree

73 files changed

+220
-139
lines changed

Some content is hidden

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

73 files changed

+220
-139
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-network developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-network developers (see COPYING).
33
#
44
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
55
#
@@ -27,6 +27,7 @@ jobs:
2727
icu: ""
2828
cc: "clang"
2929
flags: "-Os -fPIE"
30+
options: "--enable-isystem"
3031
packager: "apt"
3132
packages: ""
3233

@@ -40,6 +41,7 @@ jobs:
4041
icu: "--build-icu --with-icu"
4142
cc: "clang"
4243
flags: "-Os -fPIE"
44+
options: "--enable-isystem"
4345
packager: "apt"
4446
packages: ""
4547

@@ -53,6 +55,7 @@ jobs:
5355
icu: ""
5456
cc: "gcc"
5557
flags: "-Os -fPIE"
58+
options: "--enable-isystem"
5659
packager: "apt"
5760
packages: ""
5861

@@ -66,6 +69,7 @@ jobs:
6669
icu: "--build-icu --with-icu"
6770
cc: "gcc"
6871
flags: "-Og -g --coverage -fPIE"
72+
options: "--enable-isystem"
6973
packager: "apt"
7074
packages: "lcov"
7175

@@ -79,6 +83,7 @@ jobs:
7983
icu: "--build-icu --with-icu"
8084
cc: "clang"
8185
flags: "-Os -fPIE"
86+
options: "--enable-isystem"
8287
packager: "brew"
8388
packages: ""
8489

@@ -92,6 +97,7 @@ jobs:
9297
icu: "--build-icu --with-icu"
9398
cc: "clang"
9499
flags: "-Os -fvisibility=hidden -fPIE"
100+
options: "--enable-isystem"
95101
packager: "brew"
96102
packages: ""
97103

@@ -143,11 +149,16 @@ jobs:
143149
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
144150
fi
145151
152+
- name: Display CPU details
153+
if: ${{ (runner.os == 'Linux') }}
154+
shell: bash
155+
run: |
156+
lscpu
157+
146158
- name: Execute install.sh
147159
run: >
148160
./install.sh
149-
--enable-isystem
150-
--build-dir=$LIBBITCOIN_SRC_PATH
161+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
151162
--prefix=$LIBBITCOIN_SRC_PATH/prefix
152163
${{ env.LINKAGE }}
153164
${{ env.ASSERT_NDEBUG }}
@@ -200,11 +211,11 @@ jobs:
200211
run: |
201212
cat ${{ github.workspace }}/build/build-*/bootstrap.log
202213
214+
203215
- name: Failure display otool output
204216
if: ${{ failure() && (matrix.os == 'macos-latest') }}
205217
run: |
206218
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-network-test
207-
208219
- name: Failure display DYLD_PRINT_LIBRARIES
209220
if: ${{ failure() && (matrix.os == 'macos-latest') }}
210221
run: |
@@ -233,6 +244,7 @@ jobs:
233244
icu: ""
234245
cc: "clang"
235246
flags: "-Os -fPIE"
247+
options: ""
236248
packager: "apt"
237249
packages: ""
238250

@@ -246,6 +258,7 @@ jobs:
246258
icu: "--build-icu --with-icu"
247259
cc: "clang"
248260
flags: "-Os -fPIE"
261+
options: ""
249262
packager: "apt"
250263
packages: ""
251264

@@ -259,6 +272,7 @@ jobs:
259272
icu: ""
260273
cc: "gcc"
261274
flags: "-Os -fPIE"
275+
options: ""
262276
packager: "apt"
263277
packages: ""
264278

@@ -272,6 +286,7 @@ jobs:
272286
icu: "--build-icu --with-icu"
273287
cc: "gcc"
274288
flags: "-Og -fPIE"
289+
options: ""
275290
packager: "apt"
276291
packages: ""
277292

@@ -285,6 +300,7 @@ jobs:
285300
icu: "--build-icu --with-icu"
286301
cc: "clang"
287302
flags: "-Os -fPIE"
303+
options: ""
288304
packager: "brew"
289305
packages: ""
290306

@@ -298,6 +314,7 @@ jobs:
298314
icu: "--build-icu --with-icu"
299315
cc: "clang"
300316
flags: "-Os -fvisibility=hidden -fPIE"
317+
options: ""
301318
packager: "brew"
302319
packages: ""
303320

@@ -352,10 +369,16 @@ jobs:
352369
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
353370
fi
354371
372+
- name: Display CPU details
373+
if: ${{ (runner.os == 'Linux') }}
374+
shell: bash
375+
run: |
376+
lscpu
377+
355378
- name: Execute install-cmake.sh
356379
run: >
357380
./install-cmake.sh
358-
--build-dir=$LIBBITCOIN_SRC_PATH
381+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
359382
--prefix=$LIBBITCOIN_SRC_PATH/prefix
360383
${{ env.LINKAGE }}
361384
${{ env.ASSERT_NDEBUG }}
@@ -408,11 +431,11 @@ jobs:
408431
run: |
409432
cat ${{ github.workspace }}/build/build-*/bootstrap.log
410433
434+
411435
- name: Failure display otool output
412436
if: ${{ failure() && (matrix.os == 'macos-latest') }}
413437
run: |
414438
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-network-test
415-
416439
- name: Failure display DYLD_PRINT_LIBRARIES
417440
if: ${{ failure() && (matrix.os == 'macos-latest') }}
418441
run: |
@@ -452,6 +475,7 @@ jobs:
452475
icu: ""
453476
cc: "clang"
454477
flags: "-Os -fPIE"
478+
options: ""
455479
packager: "apt"
456480
packages: ""
457481

@@ -466,6 +490,7 @@ jobs:
466490
icu: "--build-icu --with-icu"
467491
cc: "clang"
468492
flags: "-Os -fPIE"
493+
options: ""
469494
packager: "apt"
470495
packages: ""
471496

@@ -480,6 +505,7 @@ jobs:
480505
icu: ""
481506
cc: "gcc"
482507
flags: "-Os -fPIE"
508+
options: ""
483509
packager: "apt"
484510
packages: ""
485511

@@ -534,10 +560,16 @@ jobs:
534560
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
535561
fi
536562
563+
- name: Display CPU details
564+
if: ${{ (runner.os == 'Linux') }}
565+
shell: bash
566+
run: |
567+
lscpu
568+
537569
- name: Execute install-cmakepresets.sh
538570
run: >
539571
./install-cmakepresets.sh
540-
--build-dir=$LIBBITCOIN_SRC_PATH
572+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
541573
--prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
542574
--preset=${{ matrix.preset }}
543575
${{ env.LINKAGE }}
@@ -591,11 +623,11 @@ jobs:
591623
run: |
592624
cat ${{ github.workspace }}/build/build-*/bootstrap.log
593625
626+
594627
- name: Failure display otool output
595628
if: ${{ failure() && (matrix.os == 'macos-latest') }}
596629
run: |
597630
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-network-test
598-
599631
- name: Failure display DYLD_PRINT_LIBRARIES
600632
if: ${{ failure() && (matrix.os == 'macos-latest') }}
601633
run: |
@@ -652,6 +684,8 @@ jobs:
652684
steps:
653685
- name: Add msbuild to PATH
654686
uses: microsoft/[email protected]
687+
with:
688+
msbuild-architecture: x64
655689

656690
- name: Checkout repository
657691
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-network developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-network 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-network developers (see COPYING).
3+
# Copyright (c) 2014-2023 libbitcoin-network 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-network developers (see COPYING).
2+
REM # Copyright (c) 2014-2023 libbitcoin-network 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-network developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin-network 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-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-network developers (see COPYING).
3+
| Copyright (c) 2014-2023 libbitcoin-network developers (see COPYING).
44
|
55
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
|

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.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-network developers (see COPYING).
3+
| Copyright (c) 2014-2023 libbitcoin-network developers (see COPYING).
44
|
55
| GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
66
|

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj.filters‎

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

0 commit comments

Comments
 (0)