Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
ab5c0e4
Make release build use conan
tequdev Jun 6, 2025
8ba60aa
delete remove old files script
tequdev Jun 6, 2025
cc11898
remove unused cmake files
tequdev Jun 7, 2025
a65de74
use dockerfile
tequdev Jun 7, 2025
b27ad26
fix for static build
tequdev Jun 8, 2025
a5f70b7
Merge branch 'dev' into conan-release-builder
dangell7 Jul 4, 2025
98ee512
update to gcc-11 llvm14, use ninja
tequdev Jul 5, 2025
0ef3b04
fix boost version
tequdev Jul 5, 2025
c56732a
simplify release-builder.sh
tequdev Jul 8, 2025
585cd25
Merge branch 'dev' into conan-release-builder
tequdev Jul 8, 2025
d1decff
remove checkpatterns workflow
tequdev Jul 8, 2025
093442f
Merge branch 'dev' into conan-release-builder
tequdev Jul 9, 2025
fc2a00c
remove unnecessary flags
tequdev Jul 9, 2025
0badfd3
fix
tequdev Jul 9, 2025
01a3c4c
docs: add explanation for static WasmEdge build dependencies (#4)
sublimator Jul 14, 2025
ae1c906
add ccache `compiler_check` option
tequdev Jul 26, 2025
7eec903
add conan export snapply,soci
tequdev Aug 4, 2025
cd89f13
fix volume name, BUILD_CORES
tequdev Aug 4, 2025
3924deb
fix soci boost option
tequdev Aug 4, 2025
e192dee
fix(build): ensure static libstdc++ linking by patching conan deps
sublimator Aug 5, 2025
4685f5f
Merge commit 'e192deec3aa6f156a8da7542c55becc1ae80706e' into conan-re…
tequdev Aug 5, 2025
7145fda
add conan settings.compiler.libcxx
tequdev Aug 5, 2025
6bc693f
add binary libcheck
tequdev Aug 5, 2025
80ab8a7
fix CMAKE_EXE_LINKER_FLAGS use
tequdev Aug 5, 2025
5f3ac7a
fix conan install fail
tequdev Aug 5, 2025
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
12 changes: 1 addition & 11 deletions .github/workflows/build-in-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,9 @@ jobs:
clean: true
fetch-depth: 2 # Only get the last 2 commits, to avoid fetching all history

checkpatterns:
runs-on: [self-hosted, vanity]
needs: checkout
defaults:
run:
working-directory: ${{ needs.checkout.outputs.checkout_path }}
steps:
- name: Check for suspicious patterns
run: /bin/bash suspicious_patterns.sh

build:
runs-on: [self-hosted, vanity]
needs: [checkpatterns, checkout]
needs: [checkout]
defaults:
run:
working-directory: ${{ needs.checkout.outputs.checkout_path }}
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@ bin/project-cache.jam

build/docker

# Ignore release builder files
.env
release-build
cmake-*.tar.gz

# Ignore object files.
*.o
build
Expand Down
5 changes: 5 additions & 0 deletions Builds/CMake/RippledCore.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -1068,6 +1068,11 @@ target_link_libraries (rippled
Ripple::opts
Ripple::libs
Ripple::xrpl_core
# Workaround for a Conan 1.x bug that prevents static linking of libstdc++
# when a dependency (snappy) modifies system_libs. See the comment in
# external/snappy/conanfile.py for a full explanation.
# This is likely not strictly necessary, but listed explicitly as a good practice.
m
)
exclude_if_included (rippled)
# define a macro for tests that might need to
Expand Down
33 changes: 0 additions & 33 deletions Builds/CMake/RippledNIH.cmake

This file was deleted.

52 changes: 0 additions & 52 deletions Builds/CMake/conan/Boost.cmake

This file was deleted.

22 changes: 0 additions & 22 deletions Builds/CMake/conan/Protobuf.cmake

This file was deleted.

62 changes: 0 additions & 62 deletions Builds/CMake/conan/gRPC.cmake

This file was deleted.

56 changes: 4 additions & 52 deletions Builds/CMake/deps/Boost.cmake
Original file line number Diff line number Diff line change
@@ -1,51 +1,3 @@
#[===================================================================[
NIH dep: boost
#]===================================================================]
if((NOT DEFINED BOOST_ROOT) AND(DEFINED ENV{BOOST_ROOT}))
set(BOOST_ROOT $ENV{BOOST_ROOT})
endif()
if((NOT DEFINED BOOST_LIBRARYDIR) AND(DEFINED ENV{BOOST_LIBRARYDIR}))
set(BOOST_LIBRARYDIR $ENV{BOOST_LIBRARYDIR})
endif()
file(TO_CMAKE_PATH "${BOOST_ROOT}" BOOST_ROOT)
if(WIN32 OR CYGWIN)
# Workaround for MSVC having two boost versions - x86 and x64 on same PC in stage folders
if((NOT DEFINED BOOST_LIBRARYDIR) AND (DEFINED BOOST_ROOT))
if(IS_DIRECTORY ${BOOST_ROOT}/stage64/lib)
set(BOOST_LIBRARYDIR ${BOOST_ROOT}/stage64/lib)
elseif(IS_DIRECTORY ${BOOST_ROOT}/stage/lib)
set(BOOST_LIBRARYDIR ${BOOST_ROOT}/stage/lib)
elseif(IS_DIRECTORY ${BOOST_ROOT}/lib)
set(BOOST_LIBRARYDIR ${BOOST_ROOT}/lib)
else()
message(WARNING "Did not find expected boost library dir. "
"Defaulting to ${BOOST_ROOT}")
set(BOOST_LIBRARYDIR ${BOOST_ROOT})
endif()
endif()
endif()
message(STATUS "BOOST_ROOT: ${BOOST_ROOT}")
message(STATUS "BOOST_LIBRARYDIR: ${BOOST_LIBRARYDIR}")

# uncomment the following as needed to debug FindBoost issues:
#set(Boost_DEBUG ON)

#[=========================================================[
boost dynamic libraries don't trivially support @rpath
linking right now (cmake's default), so just force
static linking for macos, or if requested on linux by flag
#]=========================================================]
if(static)
set(Boost_USE_STATIC_LIBS ON)
endif()
set(Boost_USE_MULTITHREADED ON)
if(static AND NOT APPLE)
set(Boost_USE_STATIC_RUNTIME ON)
else()
set(Boost_USE_STATIC_RUNTIME OFF)
endif()
# TBD:
# Boost_USE_DEBUG_RUNTIME: When ON, uses Boost libraries linked against the
find_package(Boost 1.86 REQUIRED
COMPONENTS
chrono
Expand All @@ -57,12 +9,12 @@ find_package(Boost 1.86 REQUIRED
program_options
regex
system
iostreams
thread)
thread
)

add_library(ripple_boost INTERFACE)
add_library(Ripple::boost ALIAS ripple_boost)
if(is_xcode)
if(XCODE)
target_include_directories(ripple_boost BEFORE INTERFACE ${Boost_INCLUDE_DIRS})
target_compile_options(ripple_boost INTERFACE --system-header-prefix="boost/")
else()
Expand All @@ -77,10 +29,10 @@ target_link_libraries(ripple_boost
Boost::coroutine
Boost::date_time
Boost::filesystem
Boost::iostreams
Boost::program_options
Boost::regex
Boost::system
Boost::iostreams
Boost::thread)
if(Boost_COMPILER)
target_link_libraries(ripple_boost INTERFACE Boost::disable_autolinking)
Expand Down
28 changes: 0 additions & 28 deletions Builds/CMake/deps/Ed25519-donna.cmake

This file was deleted.

Loading
Loading