Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions builds/cmake/install-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# Script options:

# --build-secp256k1 Build libsecp256k1 libraries
# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries
# --build-src-dir=<path> Location for sources.
# Default: $(pwd)
# --build-obj-dir=<path> Location for intermediate objects.
Expand Down Expand Up @@ -80,12 +80,12 @@
# Default: OFF
# -Denable-aes=<ON/OFF> Check for ARM AES and PMULL Extensions.
# Default: OFF
# -Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library.
# Default: OFF
# -Dwith-secp256k1=<ON/OFF> Use native secp256k1 interface, otherwise external library.
# Default: ON
# -Dwith-valgrind=<ON/OFF> Use valgrind memcheck client requests.
# Default: OFF
# -Dwith-cuda=<ON/OFF> Use cuda (gpu) batch signature verification (inert on macOS).
# Default: ON
# -Dwith-verbose=<ON/OFF> Compile verbose logging.
# Default: OFF
#
# All unrecognized options provided shall be passed as configuration
# options for all dependencies.
Expand Down Expand Up @@ -139,7 +139,7 @@ main()

for OPTION in "$@"; do
case ${OPTION} in
(--build-secp256k1) BUILD_secp256k1="yes";;
(--build-libsecp256k1) BUILD_libsecp256k1="yes";;
(--hardware-aes) HARDWARE_AES="yes";;
(--hardware-sha2) HARDWARE_SHA2="yes";;
(--hardware-sha3) HARDWARE_SHA3="yes";;
Expand Down Expand Up @@ -178,7 +178,7 @@ main()

CONFIGURE_OPTIONS_ORIGINAL=("$@")
CONFIGURE_OPTIONS=("$@")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir=*/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir-relative/}")
Expand Down Expand Up @@ -639,7 +639,7 @@ main()
if [[ ${BUILD_LIMIT} == "external" ]] ||
[[ ${BUILD_LIMIT} == "dependencies" ]] ||
[[ ${BUILD_LIMIT} == "none" ]]; then
if [[ ${BUILD_secp256k1} == "yes" ]]; then
if [[ ${BUILD_libsecp256k1} == "yes" ]]; then
source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}"
local SAVE_CPPFLAGS="${CPPFLAGS}"
export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}"
Expand Down Expand Up @@ -965,7 +965,7 @@ test_cmake()

display_build_variables()
{
msg "BUILD_secp256k1 : ${BUILD_secp256k1}"
msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}"
msg "BUILD_LIMIT : ${BUILD_LIMIT}"
msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}"
msg "BUILD_OBJ_DIR : ${BUILD_OBJ_DIR}"
Expand Down Expand Up @@ -1030,7 +1030,7 @@ help()
msg ""
msg "Script options:"

msg "--build-secp256k1 Build libsecp256k1 libraries"
msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries"
msg "--build-src-dir=<path> Location for sources."
msg " Default: $(pwd)"
msg "--build-obj-dir=<path> Location for intermediate objects."
Expand Down Expand Up @@ -1101,12 +1101,12 @@ help()
msg " Default: OFF"
msg "-Denable-aes=<ON/OFF> Check for ARM AES and PMULL Extensions."
msg " Default: OFF"
msg "-Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library."
msg " Default: OFF"
msg "-Dwith-secp256k1=<ON/OFF> Use native secp256k1 interface, otherwise external library."
msg " Default: ON"
msg "-Dwith-valgrind=<ON/OFF> Use valgrind memcheck client requests."
msg " Default: OFF"
msg "-Dwith-cuda=<ON/OFF> Use cuda (gpu) batch signature verification (inert on macOS)."
msg " Default: ON"
msg "-Dwith-verbose=<ON/OFF> Compile verbose logging."
msg " Default: OFF"
msg ""
msg "All unrecognized options provided shall be passed as configuration"
msg "options for all dependencies."
Expand Down
28 changes: 14 additions & 14 deletions builds/cmake/install-presets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# Script options:

# --build-secp256k1 Build libsecp256k1 libraries
# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries
# --build-preset=<preset> Specifies preset configuration to build.
# --build-src-dir=<path> Location for sources.
# Default: $(pwd)
Expand Down Expand Up @@ -70,12 +70,12 @@
# Default: OFF
# -Denable-aes=<ON/OFF> Check for ARM AES and PMULL Extensions.
# Default: OFF
# -Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library.
# Default: OFF
# -Dwith-secp256k1=<ON/OFF> Use native secp256k1 interface, otherwise external library.
# Default: ON
# -Dwith-valgrind=<ON/OFF> Use valgrind memcheck client requests.
# Default: OFF
# -Dwith-cuda=<ON/OFF> Use cuda (gpu) batch signature verification (inert on macOS).
# Default: ON
# -Dwith-verbose=<ON/OFF> Compile verbose logging.
# Default: OFF
#
# All unrecognized options provided shall be passed as configuration
# options for all dependencies.
Expand Down Expand Up @@ -129,7 +129,7 @@ main()

for OPTION in "$@"; do
case ${OPTION} in
(--build-secp256k1) BUILD_secp256k1="yes";;
(--build-libsecp256k1) BUILD_libsecp256k1="yes";;
(--hardware-aes) HARDWARE_AES="yes";;
(--hardware-sha2) HARDWARE_SHA2="yes";;
(--hardware-sha3) HARDWARE_SHA3="yes";;
Expand Down Expand Up @@ -164,7 +164,7 @@ main()

CONFIGURE_OPTIONS_ORIGINAL=("$@")
CONFIGURE_OPTIONS=("$@")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-preset=*/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-limit=*/}")
Expand Down Expand Up @@ -643,7 +643,7 @@ main()
if [[ ${BUILD_LIMIT} == "external" ]] ||
[[ ${BUILD_LIMIT} == "dependencies" ]] ||
[[ ${BUILD_LIMIT} == "none" ]]; then
if [[ ${BUILD_secp256k1} == "yes" ]]; then
if [[ ${BUILD_libsecp256k1} == "yes" ]]; then
source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}"
local SAVE_CPPFLAGS="${CPPFLAGS}"
export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}"
Expand Down Expand Up @@ -1029,7 +1029,7 @@ test_cmake()

display_build_variables()
{
msg "BUILD_secp256k1 : ${BUILD_secp256k1}"
msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}"
msg "BUILD_PRESET : ${BUILD_PRESET}"
msg "BUILD_LIMIT : ${BUILD_LIMIT}"
msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}"
Expand Down Expand Up @@ -1095,7 +1095,7 @@ help()
msg ""
msg "Script options:"

msg "--build-secp256k1 Build libsecp256k1 libraries"
msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries"
msg "--build-preset=<preset> Specifies preset configuration to build."
msg "--build-src-dir=<path> Location for sources."
msg " Default: $(pwd)"
Expand Down Expand Up @@ -1156,12 +1156,12 @@ help()
msg " Default: OFF"
msg "-Denable-aes=<ON/OFF> Check for ARM AES and PMULL Extensions."
msg " Default: OFF"
msg "-Dwith-secp256k1=<ON/OFF> Use bitcoin-core/secp256k1 library."
msg " Default: OFF"
msg "-Dwith-secp256k1=<ON/OFF> Use native secp256k1 interface, otherwise external library."
msg " Default: ON"
msg "-Dwith-valgrind=<ON/OFF> Use valgrind memcheck client requests."
msg " Default: OFF"
msg "-Dwith-cuda=<ON/OFF> Use cuda (gpu) batch signature verification (inert on macOS)."
msg " Default: ON"
msg "-Dwith-verbose=<ON/OFF> Compile verbose logging."
msg " Default: OFF"
msg ""
msg "All unrecognized options provided shall be passed as configuration"
msg "options for all dependencies."
Expand Down
28 changes: 14 additions & 14 deletions builds/gnu/install-gnu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#
# Script options:

# --build-secp256k1 Build libsecp256k1 libraries
# --build-libsecp256k1 Build bitcoin core libsecp256k1 libraries
# --build-src-dir=<path> Location for sources.
# Default: $(pwd)
# --build-obj-dir=<path> Location for intermediate objects.
Expand Down Expand Up @@ -81,12 +81,12 @@
# Default: --disable-sha3
# --<enable/disable>-aes Check for ARM AES and PMULL Extensions.
# Default: --disable-aes
# --<with/without>-secp256k1 Use bitcoin-core/secp256k1 library.
# Default: --without-secp256k1
# --<with/without>-secp256k1 Use native secp256k1 interface, otherwise external library.
# Default: --with-secp256k1
# --<with/without>-valgrind Use valgrind memcheck client requests.
# Default: --without-valgrind
# --<with/without>-cuda Use cuda (gpu) batch signature verification (inert on macOS).
# Default: --with-cuda
# --<with/without>-verbose Compile verbose logging.
# Default: --without-verbose
#
# All unrecognized options provided shall be passed as configuration
# options for all dependencies.
Expand Down Expand Up @@ -140,7 +140,7 @@ main()

for OPTION in "$@"; do
case ${OPTION} in
(--build-secp256k1) BUILD_secp256k1="yes";;
(--build-libsecp256k1) BUILD_libsecp256k1="yes";;
(--hardware-aes) HARDWARE_AES="yes";;
(--hardware-sha2) HARDWARE_SHA2="yes";;
(--hardware-sha3) HARDWARE_SHA3="yes";;
Expand Down Expand Up @@ -176,7 +176,7 @@ main()

CONFIGURE_OPTIONS_ORIGINAL=("$@")
CONFIGURE_OPTIONS=("$@")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-secp256k1/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-libsecp256k1/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-src-dir=*/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir=*/}")
CONFIGURE_OPTIONS=("${CONFIGURE_OPTIONS[@]/#--build-obj-dir-relative/}")
Expand Down Expand Up @@ -686,7 +686,7 @@ main()
if [[ ${BUILD_LIMIT} == "external" ]] ||
[[ ${BUILD_LIMIT} == "dependencies" ]] ||
[[ ${BUILD_LIMIT} == "none" ]]; then
if [[ ${BUILD_secp256k1} == "yes" ]]; then
if [[ ${BUILD_libsecp256k1} == "yes" ]]; then
source_github "${secp256k1_OWNER}" "secp256k1" "${secp256k1_TAG}"
local SAVE_CPPFLAGS="${CPPFLAGS}"
export CPPFLAGS="${CPPFLAGS} ${secp256k1_FLAGS[@]}"
Expand Down Expand Up @@ -1037,7 +1037,7 @@ test_gnu()

display_build_variables()
{
msg "BUILD_secp256k1 : ${BUILD_secp256k1}"
msg "BUILD_libsecp256k1 : ${BUILD_libsecp256k1}"
msg "BUILD_LIMIT : ${BUILD_LIMIT}"
msg "BUILD_SRC_DIR : ${BUILD_SRC_DIR}"
msg "BUILD_OBJ_DIR : ${BUILD_OBJ_DIR}"
Expand Down Expand Up @@ -1103,7 +1103,7 @@ help()
msg ""
msg "Script options:"

msg "--build-secp256k1 Build libsecp256k1 libraries"
msg "--build-libsecp256k1 Build bitcoin core libsecp256k1 libraries"
msg "--build-src-dir=<path> Location for sources."
msg " Default: $(pwd)"
msg "--build-obj-dir=<path> Location for intermediate objects."
Expand Down Expand Up @@ -1175,12 +1175,12 @@ help()
msg " Default: --disable-sha3"
msg "--<enable/disable>-aes Check for ARM AES and PMULL Extensions."
msg " Default: --disable-aes"
msg "--<with/without>-secp256k1 Use bitcoin-core/secp256k1 library."
msg " Default: --without-secp256k1"
msg "--<with/without>-secp256k1 Use native secp256k1 interface, otherwise external library."
msg " Default: --with-secp256k1"
msg "--<with/without>-valgrind Use valgrind memcheck client requests."
msg " Default: --without-valgrind"
msg "--<with/without>-cuda Use cuda (gpu) batch signature verification (inert on macOS)."
msg " Default: --with-cuda"
msg "--<with/without>-verbose Compile verbose logging."
msg " Default: --without-verbose"
msg ""
msg "All unrecognized options provided shall be passed as configuration"
msg "options for all dependencies."
Expand Down
14 changes: 0 additions & 14 deletions builds/msvc/build-msvc.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ REM --enable-sse41 Add SSE4.1 hardware instructions via compilation
REM --enable-sha2 Check for ARM SHA1/SHA256 Extensions.
REM --enable-sha3 Check for ARM SHA3 Extensions for SHA512.
REM --enable-aes Check for ARM AES and PMULL Extensions.
REM --[with/without]-cuda Use cuda (gpu) batch signature verification (inert on macOS).
REM --build-config config Build configuration.
REM --build-platform platform Build platform.
REM --build-version version Build MSVC version.
Expand Down Expand Up @@ -330,18 +329,6 @@ if "!libbitcoin_node_TAG!" == "" (
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-aes=true"
)
) else if "%~1" == "--with-cuda" (
if "!libbitcoin-system_PARAMS!" == "" (
set "libbitcoin-system_PARAMS=/p:Option-cuda=true"
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-cuda=true"
)
) else if "%~1" == "--without-cuda" (
if "!libbitcoin-system_PARAMS!" == "" (
set "libbitcoin-system_PARAMS=/p:Option-cuda=false"
) else (
set "libbitcoin-system_PARAMS=!libbitcoin-system_PARAMS! /p:Option-cuda=false"
)
) else if "%~1" == "--build-config" (
set "BUILD_CONFIG=%~2"
shift
Expand Down Expand Up @@ -606,7 +593,6 @@ if "!libbitcoin_node_TAG!" == "" (
call :msg "--enable-sha2 Check for ARM SHA1/SHA256 Extensions."
call :msg "--enable-sha3 Check for ARM SHA3 Extensions for SHA512."
call :msg "--enable-aes Check for ARM AES and PMULL Extensions."
call :msg "--[with/without]-cuda Use cuda (gpu) batch signature verification (inert on macOS)."
call :msg "--build-config config Build configuration."
call :msg "--build-platform platform Build platform."
call :msg "--build-version version Build MSVC version."
Expand Down
13 changes: 13 additions & 0 deletions builds/msvc/vs2026/libbitcoin-network.import.props
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,26 @@
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libbitcoin-network.import.xml" />
</ItemGroup>

<!-- Options -->

<PropertyGroup>
<Option-verbose Condition="'$(Option-verbose)' == ''">false</Option-verbose>
</PropertyGroup>

<!-- Messages -->

<Target Name="NetworkOptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-verbose : $(Option-verbose)" Importance="high"/>
</Target>

<!-- Linkage -->

<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\build\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-verbose)' == 'true'">WITH_LOGV;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies Condition="'$(Linkage-libbitcoin-network)' != ''">libbitcoin-network.lib;%(AdditionalDependencies)</AdditionalDependencies>
Expand Down
12 changes: 12 additions & 0 deletions builds/msvc/vs2026/libbitcoin-network.import.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,16 @@
<EnumValue Name="ltcg" DisplayName="Static using link time compile generation (LTCG)" />
</EnumProperty>
</Rule>
<Rule Name="libbitcoin-network-options-uiextension" PageTemplate="tool" DisplayName="Bitcoin Network Options" SwitchPrefix="/" Order="1">
<Rule.Categories>
<Category Name="verbose" DisplayName="verbose" />
</Rule.Categories>
<Rule.DataSource>
<DataSource Persistence="ProjectFile" ItemType="" />
</Rule.DataSource>
<EnumProperty Name="Option-verbose" DisplayName="Compile Verbose Logging" Description="Compile verbose logging." Category="verbose">
<EnumValue Name="false" DisplayName="No" />
<EnumValue Name="true" DisplayName="Yes" />
</EnumProperty>
</Rule>
</ProjectSchemaDefinitions>
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,18 @@
</PropertyGroup>

<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-secp256k1 Condition="'$(Option-secp256k1)' == 'true'">dynamic</Linkage-secp256k1>
<Linkage-libbitcoin-system>dynamic</Linkage-libbitcoin-system>
<Linkage-libbitcoin-database>dynamic</Linkage-libbitcoin-database>
<Linkage-libbitcoin-network>dynamic</Linkage-libbitcoin-network>
<Linkage-libbitcoin-node>dynamic</Linkage-libbitcoin-node>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
<Linkage-secp256k1 Condition="'$(Option-secp256k1)' == 'true'">ltcg</Linkage-secp256k1>
<Linkage-libbitcoin-system>ltcg</Linkage-libbitcoin-system>
<Linkage-libbitcoin-database>ltcg</Linkage-libbitcoin-database>
<Linkage-libbitcoin-network>ltcg</Linkage-libbitcoin-network>
<Linkage-libbitcoin-node>ltcg</Linkage-libbitcoin-node>
</PropertyGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-secp256k1 Condition="'$(Option-secp256k1)' == 'true'">static</Linkage-secp256k1>
<Linkage-libbitcoin-system>static</Linkage-libbitcoin-system>
<Linkage-libbitcoin-database>static</Linkage-libbitcoin-database>
<Linkage-libbitcoin-network>static</Linkage-libbitcoin-network>
Expand All @@ -56,7 +53,6 @@
<!-- Messages -->

<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-secp256k1 : $(Linkage-secp256k1)" Importance="high"/>
<Message Text="Linkage-_system : $(Linkage-libbitcoin-system)" Importance="high"/>
<Message Text="Linkage-_database : $(Linkage-libbitcoin-database)" Importance="high"/>
<Message Text="Linkage-_network : $(Linkage-libbitcoin-network)" Importance="high"/>
Expand Down
Loading
Loading