diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3772cc8e..b17b321b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -94,13 +94,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" - llvm: "llvm@16" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang" flags: "-Os -fPIE" options: "--enable-isystem" packager: "brew" - packages: "llvm@16 icu4c" + packages: "icu4c" - os: macos-latest cxx: "clang++" @@ -111,13 +111,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" - llvm: "llvm@16" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" options: "--enable-isystem" packager: "brew" - packages: "llvm@16 icu4c" + packages: "icu4c" runs-on: ${{ matrix.os }} @@ -147,7 +147,7 @@ jobs: if: ${{ matrix.packager == 'brew' }} run: | brew install autoconf automake libtool ${{ matrix.packages }} - if [[ -n ${{ matrix.llvm }} ]]; then + if [[ -n "${{ matrix.llvm }}" ]]; then echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV fi @@ -365,13 +365,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" - llvm: "llvm@16" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang" flags: "-Os -fPIE" options: "" packager: "brew" - packages: "llvm@16 icu4c" + packages: "icu4c" - os: macos-latest cxx: "clang++" @@ -382,13 +382,13 @@ jobs: detectcpuflags: "ignore" boost: "--build-boost" icu: "" - llvm: "llvm@16" + llvm: "" secp256k1: "--build-secp256k1" cc: "clang" flags: "-Os -fvisibility=hidden -fPIE" options: "" packager: "brew" - packages: "llvm@16 icu4c" + packages: "icu4c" runs-on: ${{ matrix.os }} @@ -418,7 +418,7 @@ jobs: if: ${{ matrix.packager == 'brew' }} run: | brew install autoconf automake libtool ${{ matrix.packages }} - if [[ -n ${{ matrix.llvm }} ]]; then + if [[ -n "${{ matrix.llvm }}" ]]; then echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV fi @@ -654,7 +654,7 @@ jobs: if: ${{ matrix.packager == 'brew' }} run: | brew install autoconf automake libtool ${{ matrix.packages }} - if [[ -n ${{ matrix.llvm }} ]]; then + if [[ -n "${{ matrix.llvm }}" ]]; then echo "PATH=/opt/homebrew/opt/${{ matrix.llvm }}/bin:$PATH" >> $GITHUB_ENV fi diff --git a/builds/msvc/vs2022/bs/bs.vcxproj b/builds/msvc/vs2022/bs/bs.vcxproj index 82511f1a..251e58fe 100644 --- a/builds/msvc/vs2022/bs/bs.vcxproj +++ b/builds/msvc/vs2022/bs/bs.vcxproj @@ -139,6 +139,7 @@ + @@ -151,6 +152,7 @@ + diff --git a/builds/msvc/vs2022/bs/packages.config b/builds/msvc/vs2022/bs/packages.config index ea8b57d2..7ba56fb1 100644 --- a/builds/msvc/vs2022/bs/packages.config +++ b/builds/msvc/vs2022/bs/packages.config @@ -11,6 +11,7 @@ + diff --git a/builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj b/builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj index 3e79713a..caf475c2 100644 --- a/builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-server-test/libbitcoin-server-test.vcxproj @@ -132,6 +132,7 @@ + @@ -145,6 +146,7 @@ + diff --git a/builds/msvc/vs2022/libbitcoin-server-test/packages.config b/builds/msvc/vs2022/libbitcoin-server-test/packages.config index 8b771666..db9b0ea8 100644 --- a/builds/msvc/vs2022/libbitcoin-server-test/packages.config +++ b/builds/msvc/vs2022/libbitcoin-server-test/packages.config @@ -11,6 +11,7 @@ + diff --git a/builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj b/builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj index fb0d35be..ddf16683 100644 --- a/builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj +++ b/builds/msvc/vs2022/libbitcoin-server/libbitcoin-server.vcxproj @@ -60,7 +60,7 @@ ReleaseLIB x64 - + DebugDLL ARM @@ -180,6 +180,7 @@ + @@ -192,6 +193,7 @@ + diff --git a/builds/msvc/vs2022/libbitcoin-server/packages.config b/builds/msvc/vs2022/libbitcoin-server/packages.config index ea8b57d2..7ba56fb1 100644 --- a/builds/msvc/vs2022/libbitcoin-server/packages.config +++ b/builds/msvc/vs2022/libbitcoin-server/packages.config @@ -11,6 +11,7 @@ + diff --git a/builds/msvc/vs2022/libbitcoin-system.import.props b/builds/msvc/vs2022/libbitcoin-system.import.props index 662fa27e..58f802c1 100644 --- a/builds/msvc/vs2022/libbitcoin-system.import.props +++ b/builds/msvc/vs2022/libbitcoin-system.import.props @@ -17,29 +17,29 @@ - false - true - true - false - false + + + + false - AdvancedVectorExtensions2 - AdvancedVectorExtensions512 + + + + - - - - - - + + + + + @@ -55,11 +55,11 @@ BC_STATIC;%(PreprocessorDefinitions) _CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions) - WITH_AVX512;%(PreprocessorDefinitions) - WITH_AVX2;%(PreprocessorDefinitions) - WITH_SSE41;%(PreprocessorDefinitions) - WITH_SHANI;%(PreprocessorDefinitions) - WITH_NEON;%(PreprocessorDefinitions) + + WITH_SHA;%(PreprocessorDefinitions) + + + diff --git a/builds/msvc/vs2022/libbitcoin-system.import.xml b/builds/msvc/vs2022/libbitcoin-system.import.xml index e8bed3f7..1501f8df 100644 --- a/builds/msvc/vs2022/libbitcoin-system.import.xml +++ b/builds/msvc/vs2022/libbitcoin-system.import.xml @@ -16,34 +16,29 @@ - - - - - + + + + - + - + \ No newline at end of file diff --git a/install-cmake.sh b/install-cmake.sh index 416e2b0b..5a571a1a 100755 --- a/install-cmake.sh +++ b/install-cmake.sh @@ -25,7 +25,7 @@ # --disable-shared Disables shared library builds. # --disable-static Disables static library builds. # --verbose Display verbose output (defaults to quiet on called tooling). -# --help Display usage, overriding script execution. +# --help, -h Display usage, overriding script execution. # # Verified on Ubuntu 14.04, requires gcc-4.8 or newer. # Verified on OSX 10.10, using MacPorts and Homebrew repositories, requires @@ -41,7 +41,7 @@ #============================================================================== # Branches for github dependencies. #------------------------------------------------------------------------------ -SECP256K1_BRANCH="v0.5.1" +SECP256K1_BRANCH="v0.7.0" BITCOIN_SYSTEM_BRANCH="master" BITCOIN_NETWORK_BRANCH="master" BITCOIN_DATABASE_BRANCH="master" @@ -251,7 +251,7 @@ display_help() display_message " --prefix= Library install location (defaults to /usr/local)." display_message " --disable-shared Disables shared library builds." display_message " --disable-static Disables static library builds." - display_message " --help Display usage, overriding script execution." + display_message " --help, -h Display usage, overriding script execution." display_message "" display_message "All unrecognized options provided shall be passed as configuration options for " display_message "all dependencies." @@ -264,7 +264,7 @@ parse_command_line_options() for OPTION in "$@"; do case $OPTION in # Standard script options. - (--help) DISPLAY_HELP="yes";; + (--help|-h) DISPLAY_HELP="yes";; (--verbose) DISPLAY_VERBOSE="yes";; # Standard build options. @@ -1058,6 +1058,7 @@ BOOST_OPTIONS=( "--with-program_options" \ "--with-regex" \ "--with-thread" \ +"--with-url" \ "--with-test") # Define secp256k1 options. diff --git a/install-cmakepresets.sh b/install-cmakepresets.sh index 70ed80bf..505c015d 100755 --- a/install-cmakepresets.sh +++ b/install-cmakepresets.sh @@ -26,7 +26,7 @@ # --disable-shared Disables shared library builds. # --disable-static Disables static library builds. # --verbose Display verbose output (defaults to quiet on called tooling). -# --help Display usage, overriding script execution. +# --help, -h Display usage, overriding script execution. # # Verified on Ubuntu 14.04, requires gcc-4.8 or newer. # Verified on OSX 10.10, using MacPorts and Homebrew repositories, requires @@ -42,7 +42,7 @@ #============================================================================== # Branches for github dependencies. #------------------------------------------------------------------------------ -SECP256K1_BRANCH="v0.5.1" +SECP256K1_BRANCH="v0.7.0" BITCOIN_SYSTEM_BRANCH="master" BITCOIN_NETWORK_BRANCH="master" BITCOIN_DATABASE_BRANCH="master" @@ -258,7 +258,7 @@ display_help() display_message " --prefix= Library install location (defaults to /usr/local)." display_message " --disable-shared Disables shared library builds." display_message " --disable-static Disables static library builds." - display_message " --help Display usage, overriding script execution." + display_message " --help, -h Display usage, overriding script execution." display_message "" display_message "All unrecognized options provided shall be passed as configuration options for " display_message "all dependencies." @@ -271,7 +271,7 @@ parse_command_line_options() for OPTION in "$@"; do case $OPTION in # Standard script options. - (--help) DISPLAY_HELP="yes";; + (--help|-h) DISPLAY_HELP="yes";; (--verbose) DISPLAY_VERBOSE="yes";; # Standard build options. @@ -1112,6 +1112,7 @@ BOOST_OPTIONS=( "--with-program_options" \ "--with-regex" \ "--with-thread" \ +"--with-url" \ "--with-test") # Define secp256k1 options. diff --git a/install.sh b/install.sh index b63b40c3..ad216828 100755 --- a/install.sh +++ b/install.sh @@ -25,7 +25,7 @@ # --disable-shared Disables shared library builds. # --disable-static Disables static library builds. # --verbose Display verbose output (defaults to quiet on called tooling). -# --help Display usage, overriding script execution. +# --help, -h Display usage, overriding script execution. # # Verified on Ubuntu 14.04, requires gcc-4.8 or newer. # Verified on OSX 10.10, using MacPorts and Homebrew repositories, requires @@ -41,7 +41,7 @@ #============================================================================== # Branches for github dependencies. #------------------------------------------------------------------------------ -SECP256K1_BRANCH="v0.5.1" +SECP256K1_BRANCH="v0.7.0" BITCOIN_SYSTEM_BRANCH="master" BITCOIN_NETWORK_BRANCH="master" BITCOIN_DATABASE_BRANCH="master" @@ -251,7 +251,7 @@ display_help() display_message " --prefix= Library install location (defaults to /usr/local)." display_message " --disable-shared Disables shared library builds." display_message " --disable-static Disables static library builds." - display_message " --help Display usage, overriding script execution." + display_message " --help, -h Display usage, overriding script execution." display_message "" display_message "All unrecognized options provided shall be passed as configuration options for " display_message "all dependencies." @@ -264,7 +264,7 @@ parse_command_line_options() for OPTION in "$@"; do case $OPTION in # Standard script options. - (--help) DISPLAY_HELP="yes";; + (--help|-h) DISPLAY_HELP="yes";; (--verbose) DISPLAY_VERBOSE="yes";; # Standard build options. @@ -932,6 +932,7 @@ BOOST_OPTIONS=( "--with-program_options" \ "--with-regex" \ "--with-thread" \ +"--with-url" \ "--with-test") # Define secp256k1 options.