From 3aa074714a24469eb63063cb9769ccf260901164 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Fri, 5 May 2023 19:32:18 -0700 Subject: [PATCH 1/3] Regenerate artifacts. --- .github/workflows/ci.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d1db0263..c5284528 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: icu: "" cc: "clang-14" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -40,6 +41,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang-14" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -53,6 +55,7 @@ jobs: icu: "" cc: "gcc-11" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "apt" packages: "" @@ -66,6 +69,7 @@ jobs: icu: "--build-icu --with-icu" cc: "gcc-11" flags: "-Og -g --coverage -fPIE" + options: "--enable-isystem" packager: "apt" packages: "lcov" @@ -79,6 +83,7 @@ jobs: icu: "--with-icu" cc: "clang-14" flags: "-Os -fPIE" + options: "--enable-isystem" packager: "brew" packages: "icu4c" @@ -92,6 +97,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang-14" flags: "-Os -fvisibility=hidden -fPIE" + options: "--enable-isystem" packager: "brew" packages: "" @@ -152,8 +158,7 @@ jobs: - 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 }} @@ -239,6 +244,7 @@ jobs: icu: "" cc: "clang-14" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -252,6 +258,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang-14" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -265,6 +272,7 @@ jobs: icu: "" cc: "gcc-11" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -278,6 +286,7 @@ jobs: icu: "--build-icu --with-icu" cc: "gcc-11" flags: "-Og -fPIE" + options: "" packager: "apt" packages: "" @@ -291,6 +300,7 @@ jobs: icu: "--with-icu" cc: "clang-14" flags: "-Os -fPIE" + options: "" packager: "brew" packages: "icu4c" @@ -304,6 +314,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang-14" flags: "-Os -fvisibility=hidden -fPIE" + options: "" packager: "brew" packages: "" @@ -367,7 +378,7 @@ jobs: - 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 }} @@ -464,6 +475,7 @@ jobs: icu: "" cc: "clang-14" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -478,6 +490,7 @@ jobs: icu: "--build-icu --with-icu" cc: "clang-14" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -492,6 +505,7 @@ jobs: icu: "" cc: "gcc-11" flags: "-Os -fPIE" + options: "" packager: "apt" packages: "" @@ -555,7 +569,7 @@ jobs: - 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 }} From b9bf6dcb5ad8591060de7b4233d16d611b2380d1 Mon Sep 17 00:00:00 2001 From: Phillip Mienk Date: Wed, 16 Aug 2023 17:55:09 -0700 Subject: [PATCH 2/3] Update copyright year range. --- .appveyor.yml | 88 --------------- .github/workflows/ci.yml | 2 +- .travis.yml | 102 ------------------ Makefile.am | 2 +- autogen.sh | 2 +- bindings.bat | 2 +- bindings.sh | 2 +- build.cmd | 2 +- builds/cmake/CMakeLists.txt | 2 +- builds/cmake/modules/FindSecp256K1.cmake | 2 +- builds/msvc/debug.natvis | 2 +- .../libbitcoin-consensus-test.vcxproj | 2 +- .../libbitcoin-consensus-test.vcxproj.filters | 2 +- .../libbitcoin-consensus-test/packages.config | 2 +- .../libbitcoin-consensus.vcxproj | 2 +- .../libbitcoin-consensus.vcxproj.filters | 2 +- .../libbitcoin-consensus/packages.config | 2 +- .../libbitcoin-consensus-test.vcxproj | 2 +- .../libbitcoin-consensus-test.vcxproj.filters | 2 +- .../libbitcoin-consensus-test/packages.config | 2 +- .../libbitcoin-consensus.vcxproj | 2 +- .../libbitcoin-consensus.vcxproj.filters | 2 +- .../libbitcoin-consensus/packages.config | 2 +- .../libbitcoin-consensus-test.vcxproj | 2 +- .../libbitcoin-consensus-test.vcxproj.filters | 2 +- .../libbitcoin-consensus-test/packages.config | 2 +- .../libbitcoin-consensus.vcxproj | 2 +- .../libbitcoin-consensus.vcxproj.filters | 2 +- .../libbitcoin-consensus/packages.config | 2 +- configure.ac | 2 +- include/bitcoin/consensus.hpp | 2 +- include/bitcoin/consensus/define.hpp | 2 +- include/bitcoin/consensus/export.hpp | 2 +- include/bitcoin/consensus/version.hpp | 2 +- install-cmake.sh | 2 +- install-cmakepresets.sh | 2 +- install.sh | 2 +- libbitcoin-consensus-test_runner.sh | 2 +- libbitcoin-consensus.pc.in | 2 +- src/consensus/consensus.cpp | 2 +- src/consensus/consensus.hpp | 2 +- ...nsensus__script_error_to_verify_result.cpp | 2 +- test/consensus__script_verify.cpp | 2 +- ...onsensus__verify_flags_to_script_flags.cpp | 2 +- test/main.cpp | 2 +- test/script.hpp | 2 +- test/test.cpp | 2 +- test/test.hpp | 2 +- 48 files changed, 46 insertions(+), 236 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .travis.yml diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index d570b6ba..00000000 --- a/.appveyor.yml +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). -# -# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY -# -############################################################################### -version: 4.0.0.{build}-{branch} - -image: Visual Studio 2013 - -clone_folder: c:\git\libbitcoin-consensus -skip_tags: true - -environment: - matrix: - - configuration: StaticDebug - platform: x64 - BOOST_UNIT_TEST_OPTIONS: "--run_test=* --show_progress=no --detect_memory_leak=0 --report_level=no --build_info=yes" - - configuration: StaticRelease - platform: x64 - BOOST_UNIT_TEST_OPTIONS: "--run_test=* --show_progress=no --detect_memory_leak=0 --report_level=no --build_info=yes" - - configuration: StaticDebug - platform: Win32 - BOOST_UNIT_TEST_OPTIONS: "--run_test=* --show_progress=no --detect_memory_leak=0 --report_level=no --build_info=yes" - - configuration: StaticRelease - platform: Win32 - BOOST_UNIT_TEST_OPTIONS: "--run_test=* --show_progress=no --detect_memory_leak=0 --report_level=no --build_info=yes" - -matrix: - fast_finish: true - -init: - - git config --global core.autocrlf true - -before_build: - - ps: >- - $BASE_KEY = "HKLM:SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall"; - $WOW_KEY = "HKLM:SOFTWARE\wow6432node\Microsoft\Windows\CurrentVersion\Uninstall"; - $CTP_URL = "https://download.microsoft.com/download/3/C/2/3C271B79-6354-4B66-9014-C6CEBC14C5C4/vc_CompilerCTP.Nov2013.exe"; - $CTP_FILENAME = "vc_CompilerCTP.Nov2013.exe"; - $INSTALL_LOG_PATH = "c:\users\appveyor\install-log.txt"; - function GetUninstallString($product_name) { - $x64_items = @(Get-ChildItem $BASE_KEY); - ($x64_items + @(Get-ChildItem $WOW_KEY) ` - | ForEach-Object { Get-ItemProperty Microsoft.PowerShell.Core\Registry::$_ } ` - | Where-Object { $_.DisplayName -and $_.DisplayName.Contains($product_name) } ` - | Select UninstallString).UninstallString - } - Write-Host "Uninstalling Microsoft Visual C++ 2013 Redistributable (x64) - 12.0.21005..." -ForegroundColor Yellow; - "$(GetUninstallString "Microsoft Visual C++ 2013 Redistributable (x64) - 12.0.21005") /quiet" | out-file "$env:TEMP\uninstall.cmd" -Encoding ASCII; - & $env:temp\uninstall.cmd; - Write-Host "Uninstalling Microsoft Visual C++ 2013 Redistributable (x64) - 12.0.30501..." -ForegroundColor Yellow; - "$(GetUninstallString "Microsoft Visual C++ 2013 Redistributable (x64) - 12.0.30501") /quiet" | out-file "$env:TEMP\uninstall.cmd" -Encoding ASCII; - & $env:temp\uninstall.cmd; - Write-Host "Uninstalling Microsoft Visual C++ 2013 Redistributable (x86) - 12.0.30501..." -Foreground Yellow; - "$(GetUninstallString "Microsoft Visual C++ 2013 Redistributable (x86) - 12.0.30501") /quiet" | out-file "$env:TEMP\uninstall.cmd" -Encoding ASCII; - & $env:temp\uninstall.cmd; - Write-Host "Downloading Visual C++ Compiler November 2013 CTP..." -ForegroundColor Yellow; - $CTP_INSTALLER_PATH = "$($env:TEMP)\$CTP_FILENAME"; - (New-Object Net.WebClient).DownloadFile($CTP_URL, $CTP_INSTALLER_PATH); - Write-Host "Installing CTP Compiler..." -ForegroundColor Yellow; - cmd /c start /wait $CTP_INSTALLER_PATH /install /quiet /norestart /log $INSTALL_LOG_PATH; - Write-Host "CTP Compiler Installation Complete." -ForegroundColor Green; - -build_script: - - c:\git\libbitcoin-consensus\build.cmd c:\git %PLATFORM% %CONFIGURATION% vs2013 - - cd /d %APPVEYOR_BUILD_FOLDER% - -test_script: - - ps: >- - Write-Host "Locating test executables..." -ForegroundColor Yellow; - $BC_TEST_EXES = @(Get-ChildItem -Path "$env:APPVEYOR_BUILD_FOLDER\bin" -recurse | Where-Object { $_.Name -eq "libbitcoin-consensus-test.exe" }); - If ($BC_TEST_EXES.Count -ne 1) { - Write-Host "Failure, invalid count of test executables." -ForegroundColor Red; - exit 1; - } - Write-Host "Found single test executable: " $BC_TEST_EXES.FullName -ForegroundColor Green; - $BC_TEST_SINGLETON = $BC_TEST_EXES.FullName; - Write-Host "Executing $BC_TEST_SINGLETON $env:BOOST_UNIT_TEST_OPTIONS" -ForegroundColor Yellow; - try { - Invoke-Expression "$BC_TEST_SINGLETON $env:BOOST_UNIT_TEST_OPTIONS" - } - catch { - $ERR = $_; - Write-Host "Test execution failure: " $ERR -ForegroundColor Red; - exit $ERR; - } - Write-Host "Test execution complete." -ForegroundColor Green; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c5284528..f1d429f1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b82b6b64..00000000 --- a/.travis.yml +++ /dev/null @@ -1,102 +0,0 @@ -############################################################################### -# Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). -# -# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY -# -############################################################################### -sudo: - - false - -language: - - cpp - -addons: - apt: - sources: - - boost-latest - - ubuntu-toolchain-r-test - -matrix: - include: - - os: osx - osx_image: xcode12.2 - compiler: clang - env: LINK=dynamic - - os: osx - compiler: clang - env: LINK=static - - os: linux - compiler: clang - env: LINK=dynamic - - os: linux - compiler: clang - env: LINK=static - addons: - apt: - sources: - - sourceline: 'ppa:h-rayflood/llvm' - packages: - - clang-5.0 - - os: linux - compiler: gcc - env: LINK=dynamic - addons: - apt: - packages: - - g++-4.8 - - os: linux - compiler: gcc - env: LINK=static - fast_finish: - - true - -before_install: - - # Set aliases for readability. - - if [[ $CC == gcc ]]; then GCC=true; fi - - if [[ $CC == clang ]]; then CLANG=true; fi - - if [[ $LINK == static ]]; then STATIC=true; fi - - if [[ $LINK == dynamic ]]; then DYNAMIC=true; fi - - if [[ $TRAVIS_OS_NAME == osx ]]; then OSX=true; fi - - if [[ $TRAVIS_OS_NAME == linux ]]; then LINUX=true; fi - -install: - - # Export CC/CXX to control compiler/version. - - if [[ $OSX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi - - if [[ $OSX && $CLANG && $STATIC ]]; then export CC=clang; export CXX=clang++; fi - - if [[ $LINUX && $CLANG && $DYNAMIC ]]; then export CC=clang; export CXX=clang++; fi - - if [[ $LINUX && $CLANG && $STATIC ]]; then export CC=clang-5.0; export CXX=clang++-5.0; fi - - if [[ $LINUX && $GCC && $DYNAMIC ]]; then export CC=gcc-4.8; export CXX=g++-4.8; fi - - if [[ $LINUX && $GCC && $STATIC ]]; then export CC=gcc; export CXX=g++; fi - - # Download and install packages. - -script: - - # Download and build libbitcoin-consensus and all dependencies. - - if [[ $OSX && $CLANG && $DYNAMIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-static; fi - - if [[ $OSX && $CLANG && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --prefix=$TRAVIS_BUILD_DIR/my-prefix; fi - - 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 - - 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 - - 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 - - if [[ $LINUX && $GCC && $STATIC ]]; then CC=$CC CXX=$CXX ./install.sh --enable-isystem --disable-shared --build-boost --build-dir=my-build --prefix=$TRAVIS_BUILD_DIR/my-prefix CFLAGS='-Og -g --coverage' CXXFLAGS='-Og -g --coverage'; fi - -after_success: - - # Download and unpack lcov. - - if [[ $LINUX && $GCC && $STATIC ]]; then wget https://github.com/linux-test-project/lcov/releases/download/v1.12/lcov-1.12.tar.gz; fi - - if [[ $LINUX && $GCC && $STATIC ]]; then tar xzf lcov-1.12.tar.gz; fi - - if [[ $LINUX && $GCC && $STATIC ]]; then cd lcov-1.12; PREFIX="$TRAVIS_BUILD_DIR/my-prefix" make install; cd ..; fi - - # Install coveralls. - - if [[ $LINUX && $GCC && $STATIC ]]; then gem install coveralls-lcov; fi - - # Capture coverage info, filter out system and test code, and debug before upload. - - if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --directory . --capture --output-file coverage.info; fi - - if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --remove coverage.info "/usr/*" "$TRAVIS_BUILD_DIR/my-prefix/*" "my-build/*" "test/*" "clone/*" --output-file coverage.info; fi - - if [[ $LINUX && $GCC && $STATIC ]]; then $TRAVIS_BUILD_DIR/my-prefix/usr/bin/lcov --list coverage.info; fi - - # Upload coverage info to coveralls service (--repo-token ). - - if [[ $LINUX && $GCC && $STATIC ]]; then coveralls-lcov coverage.info; fi - diff --git a/Makefile.am b/Makefile.am index d3366f91..21dac3c2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/autogen.sh b/autogen.sh index 5e75d344..18d8c90c 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/bindings.bat b/bindings.bat index 9bc2d9e7..55c6de1e 100644 --- a/bindings.bat +++ b/bindings.bat @@ -1,6 +1,6 @@ @echo off REM ########################################################################### -REM # Copyright (c) 2014-2019 libbitcoin-consensus developers (see COPYING). +REM # Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). REM # REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY REM # diff --git a/bindings.sh b/bindings.sh index 50e90878..64c077d4 100755 --- a/bindings.sh +++ b/bindings.sh @@ -1,6 +1,6 @@ #!/bin/sh ############################################################################### -# Copyright (c) 2014-2019 libbitcoin-consensus developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/build.cmd b/build.cmd index cbb89a23..3be6e50a 100644 --- a/build.cmd +++ b/build.cmd @@ -1,5 +1,5 @@ REM ########################################################################### -REM # Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). +REM # Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). REM # REM # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY REM # diff --git a/builds/cmake/CMakeLists.txt b/builds/cmake/CMakeLists.txt index 23ce3163..244e4da0 100644 --- a/builds/cmake/CMakeLists.txt +++ b/builds/cmake/CMakeLists.txt @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/cmake/modules/FindSecp256K1.cmake b/builds/cmake/modules/FindSecp256K1.cmake index 78d31285..c710360a 100644 --- a/builds/cmake/modules/FindSecp256K1.cmake +++ b/builds/cmake/modules/FindSecp256K1.cmake @@ -1,5 +1,5 @@ ############################################################################### -# Copyright (c) 2014-2020 libbitcoin-consensus developers (see COPYING). +# Copyright (c) 2014-2023 libbitcoin-consensus developers (see COPYING). # # GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY # diff --git a/builds/msvc/debug.natvis b/builds/msvc/debug.natvis index be483a7c..048a0f31 100644 --- a/builds/msvc/debug.natvis +++ b/builds/msvc/debug.natvis @@ -1,6 +1,6 @@