Skip to content

Commit e355949

Browse files
evoskuilevoskuil
authored
Merge pull request #253 from pmienk/version3
Update copyright date range, regenerate artifacts.
2 parents 6f19b22 + 2ca6575 commit e355949

Some content is hidden

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

59 files changed

+229
-148
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-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
#
@@ -29,6 +29,7 @@ jobs:
2929
zmq: "--build-zmq"
3030
cc: "clang"
3131
flags: "-Os -fPIE"
32+
options: "--enable-isystem"
3233
packager: "apt"
3334
packages: ""
3435

@@ -44,6 +45,7 @@ jobs:
4445
zmq: "--build-zmq"
4546
cc: "clang"
4647
flags: "-Os -fPIE"
48+
options: "--enable-isystem"
4749
packager: "apt"
4850
packages: ""
4951

@@ -59,6 +61,7 @@ jobs:
5961
zmq: "--build-zmq"
6062
cc: "gcc"
6163
flags: "-Os -fPIE"
64+
options: "--enable-isystem"
6265
packager: "apt"
6366
packages: ""
6467

@@ -74,6 +77,7 @@ jobs:
7477
zmq: "--build-zmq"
7578
cc: "gcc"
7679
flags: "-Og -fPIE"
80+
options: "--enable-isystem"
7781
packager: "apt"
7882
packages: ""
7983

@@ -89,6 +93,7 @@ jobs:
8993
zmq: "--build-zmq"
9094
cc: "clang"
9195
flags: "-Os -fPIE"
96+
options: "--enable-isystem"
9297
packager: "brew"
9398
packages: ""
9499

@@ -104,6 +109,7 @@ jobs:
104109
zmq: "--build-zmq"
105110
cc: "clang"
106111
flags: "-Os -fvisibility=hidden -fPIE"
112+
options: "--enable-isystem"
107113
packager: "brew"
108114
packages: ""
109115

@@ -155,11 +161,16 @@ jobs:
155161
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
156162
fi
157163
164+
- name: Display CPU details
165+
if: ${{ (runner.os == 'Linux') }}
166+
shell: bash
167+
run: |
168+
lscpu
169+
158170
- name: Execute install.sh
159171
run: >
160172
./install.sh
161-
--enable-isystem
162-
--build-dir=$LIBBITCOIN_SRC_PATH
173+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
163174
--prefix=$LIBBITCOIN_SRC_PATH/prefix
164175
${{ env.LINKAGE }}
165176
${{ env.ASSERT_NDEBUG }}
@@ -214,11 +225,11 @@ jobs:
214225
run: |
215226
cat ${{ github.workspace }}/build/build-*/bootstrap.log
216227
228+
217229
- name: Failure display otool output
218230
if: ${{ failure() && (matrix.os == 'macos-latest') }}
219231
run: |
220232
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
221-
222233
- name: Failure display DYLD_PRINT_LIBRARIES
223234
if: ${{ failure() && (matrix.os == 'macos-latest') }}
224235
run: |
@@ -249,6 +260,7 @@ jobs:
249260
zmq: "--build-zmq"
250261
cc: "clang"
251262
flags: "-Os -fPIE"
263+
options: ""
252264
packager: "apt"
253265
packages: ""
254266

@@ -264,6 +276,7 @@ jobs:
264276
zmq: "--build-zmq"
265277
cc: "clang"
266278
flags: "-Os -fPIE"
279+
options: ""
267280
packager: "apt"
268281
packages: ""
269282

@@ -279,6 +292,7 @@ jobs:
279292
zmq: "--build-zmq"
280293
cc: "gcc"
281294
flags: "-Os -fPIE"
295+
options: ""
282296
packager: "apt"
283297
packages: ""
284298

@@ -294,6 +308,7 @@ jobs:
294308
zmq: "--build-zmq"
295309
cc: "gcc"
296310
flags: "-Og -fPIE"
311+
options: ""
297312
packager: "apt"
298313
packages: ""
299314

@@ -309,6 +324,7 @@ jobs:
309324
zmq: "--build-zmq"
310325
cc: "clang"
311326
flags: "-Os -fPIE"
327+
options: ""
312328
packager: "brew"
313329
packages: ""
314330

@@ -324,6 +340,7 @@ jobs:
324340
zmq: "--build-zmq"
325341
cc: "clang"
326342
flags: "-Os -fvisibility=hidden -fPIE"
343+
options: ""
327344
packager: "brew"
328345
packages: ""
329346

@@ -378,10 +395,16 @@ jobs:
378395
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/lib" >> $GITHUB_ENV
379396
fi
380397
398+
- name: Display CPU details
399+
if: ${{ (runner.os == 'Linux') }}
400+
shell: bash
401+
run: |
402+
lscpu
403+
381404
- name: Execute install-cmake.sh
382405
run: >
383406
./install-cmake.sh
384-
--build-dir=$LIBBITCOIN_SRC_PATH
407+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
385408
--prefix=$LIBBITCOIN_SRC_PATH/prefix
386409
${{ env.LINKAGE }}
387410
${{ env.ASSERT_NDEBUG }}
@@ -436,11 +459,11 @@ jobs:
436459
run: |
437460
cat ${{ github.workspace }}/build/build-*/bootstrap.log
438461
462+
439463
- name: Failure display otool output
440464
if: ${{ failure() && (matrix.os == 'macos-latest') }}
441465
run: |
442466
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
443-
444467
- name: Failure display DYLD_PRINT_LIBRARIES
445468
if: ${{ failure() && (matrix.os == 'macos-latest') }}
446469
run: |
@@ -482,6 +505,7 @@ jobs:
482505
zmq: "--build-zmq"
483506
cc: "clang"
484507
flags: "-Os -fPIE"
508+
options: ""
485509
packager: "apt"
486510
packages: ""
487511

@@ -498,6 +522,7 @@ jobs:
498522
zmq: "--build-zmq"
499523
cc: "clang"
500524
flags: "-Os -fPIE"
525+
options: ""
501526
packager: "apt"
502527
packages: ""
503528

@@ -514,6 +539,7 @@ jobs:
514539
zmq: "--build-zmq"
515540
cc: "gcc"
516541
flags: "-Os -fPIE"
542+
options: ""
517543
packager: "apt"
518544
packages: ""
519545

@@ -568,10 +594,16 @@ jobs:
568594
echo "LDFLAGS=-Wl,-rpath,$WORKSPACE_SUBPATH/prefix/${{ matrix.preset }}/lib" >> $GITHUB_ENV
569595
fi
570596
597+
- name: Display CPU details
598+
if: ${{ (runner.os == 'Linux') }}
599+
shell: bash
600+
run: |
601+
lscpu
602+
571603
- name: Execute install-cmakepresets.sh
572604
run: >
573605
./install-cmakepresets.sh
574-
--build-dir=$LIBBITCOIN_SRC_PATH
606+
--build-dir=$LIBBITCOIN_SRC_PATH ${{ matrix.options }}
575607
--prefix=$LIBBITCOIN_SRC_PATH/prefix/${{ matrix.preset }}
576608
--preset=${{ matrix.preset }}
577609
${{ env.LINKAGE }}
@@ -627,11 +659,11 @@ jobs:
627659
run: |
628660
cat ${{ github.workspace }}/build/build-*/bootstrap.log
629661
662+
630663
- name: Failure display otool output
631664
if: ${{ failure() && (matrix.os == 'macos-latest') }}
632665
run: |
633666
otool -L ${{ github.workspace }}/test/.libs/libbitcoin-protocol-test
634-
635667
- name: Failure display DYLD_PRINT_LIBRARIES
636668
if: ${{ failure() && (matrix.os == 'macos-latest') }}
637669
run: |
@@ -688,6 +720,8 @@ jobs:
688720
steps:
689721
- name: Add msbuild to PATH
690722
uses: microsoft/[email protected]
723+
with:
724+
msbuild-architecture: x64
691725

692726
- name: Checkout repository
693727
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-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
#

‎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-protocol developers (see COPYING).
3+
# Copyright (c) 2014-2023 libbitcoin-protocol 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-protocol developers (see COPYING).
2+
REM # Copyright (c) 2014-2023 libbitcoin-protocol 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-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
#
@@ -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/cmake/modules/FindMbedtls.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 developers (see COPYING).
2+
# Copyright (c) 2014-2023 libbitcoin developers (see COPYING).
33
#
44
###############################################################################
55
# FindMbedtls

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

0 commit comments

Comments
 (0)