Skip to content

Rewritten build/install scripts. #993

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmienk merged 3 commits into from
Apr 13, 2026
Merged

Rewritten build/install scripts. #993

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b9f4f1e
Regenerated with vNext build/install scripts.
pmienk Apr 10, 2026
d9d34fc
Minor updates.
pmienk Apr 13, 2026
3e2c79d
Revert to libbitcoin repository stack.
pmienk Apr 13, 2026
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
806 changes: 208 additions & 598 deletions .github/workflows/ci.yml
View file
Open in desktop

Large diffs are not rendered by default.

128 changes: 0 additions & 128 deletions build.cmd
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ endif()
#------------------------------------------------------------------------------
# Project options.
#------------------------------------------------------------------------------
option( with-test "Build test." ON )
option( with-tests "Build tests." ON )

#------------------------------------------------------------------------------
# Dependencies.
Expand Down Expand Up @@ -191,15 +191,15 @@ set_target_properties( libbitcoin-node
)

#------------------------------------------------------------------------------
# libbitcoin-node-tests tests
# libbitcoin-node-test tests
#------------------------------------------------------------------------------
if ( with-test )
add_executable( libbitcoin-node-tests )
if ( with-tests )
add_executable( libbitcoin-node-test )

enable_testing()

add_test( NAME libbitcoin-node-tests
COMMAND libbitcoin-node-tests
add_test( NAME libbitcoin-node-test
COMMAND libbitcoin-node-test
--run_test=*
--log_level=warning
--show_progress=no
Expand All @@ -208,12 +208,12 @@ if ( with-test )
--build_info=yes
)

target_compile_features( libbitcoin-node-tests
target_compile_features( libbitcoin-node-test
PUBLIC
cxx_std_20
)

target_compile_options( libbitcoin-node-tests
target_compile_options( libbitcoin-node-test
PRIVATE
-Wall
-Wextra
Expand All @@ -229,23 +229,23 @@ if ( with-test )
-fstack-protector-all
)

file( GLOB_RECURSE libbitcoin_node_tests_SOURCES CONFIGURE_DEPENDS
file( GLOB_RECURSE libbitcoin_node_test_SOURCES CONFIGURE_DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/../../test/*.c"
"${CMAKE_CURRENT_SOURCE_DIR}/../../test/*.cpp"
)

target_sources( libbitcoin-node-tests
target_sources( libbitcoin-node-test
PRIVATE
${libbitcoin_node_tests_SOURCES}
${libbitcoin_node_test_SOURCES}
)

target_link_libraries( libbitcoin-node-tests
target_link_libraries( libbitcoin-node-test
PRIVATE
Boost::unit_test_framework
bitcoin::node
)

set_target_properties( libbitcoin-node-tests
set_target_properties( libbitcoin-node-test
PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION ${PROJECT_VERSION_MAJOR}
Expand Down
24 changes: 11 additions & 13 deletions builds/cmake/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@
"type": "inList",
"string": "${hostSystemName}",
"list": [
"Darwin",
"Linux"
"Darwin",
"Linux"
]
},
"cacheVariables": {
"CMAKE_PREFIX_PATH": {
"type": "PATH",
"value": "${sourceParentDir}/../../../prefix/${presetName}"
},
"CMAKE_INSTALL_PREFIX_PATH": {
"type": "PATH",
"value": "${sourceParentDir}/../../../prefix/${presetName}"
},
"CMAKE_LIBRARY_PATH": {
"type": "PATH",
"value": "${sourceParentDir}/../../../prefix/${presetName}/lib:$env{CMAKE_LIBRARY_PATH}"
Expand All @@ -31,25 +35,19 @@
"description": "Factored debug settings.",
"hidden": true,
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug",
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -Og -g --coverage",
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Og -g --coverage",
"enable-ndebug": {
"type": "BOOL",
"value": "OFF"
}
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -Og -g --coverage"
}
},
{
"name": "gnu-release",
"description": "Factored release settings.",
"hidden": true,
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_C_FLAGS": "$env{CMAKE_C_FLAGS} -O3",
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -O3",
"enable-ndebug": {
"type": "BOOL",
"value": "ON"
}
"CMAKE_CXX_FLAGS": "$env{CMAKE_CXX_FLAGS} -O3"
}
},
{
Expand Down Expand Up @@ -124,7 +122,7 @@
"name": "nix-target-list",
"hidden": true,
"targets": [
"bitcoin-node",
"libbitcoin-node",
"libbitcoin-node-test"
]
},
Expand Down
Loading
Loading