diff --git a/.gitattributes b/.gitattributes index 472cfb380c..bdfc989327 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,10 +1,6 @@ # Set default behaviour, in case users don't have core.autocrlf set. #* text=auto -# These annoying files -rippled.1 binary -LICENSE binary - # Visual Studio *.sln text eol=crlf *.vcproj text eol=crlf diff --git a/.gitignore b/.gitignore index d8c6b8a5f8..55844462e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,69 +1,46 @@ # .gitignore -bin/boostbook_catalog.xml -bin/config.log -bin/project-cache.jam - -# Ignore vim swap files. -*.swp - -# Ignore SCons support files. -.sconsign.dblite - -# Ignore python compiled files. -*.pyc - -# Ignore Macintosh Desktop Services Store files. +# Macintosh Desktop Services Store files. .DS_Store -# Ignore backup/temps +# Build, intermediate, and temporary artifacts. *~ - -# Ignore object files. *.o -.nih_c -tags -TAGS -GTAGS -GRTAGS -GPATH -bin/rippled -Debug/*.* -Release/*.* +*.pdb +*.swp +/.clangd +Debug/ +Release/ +/.build/ +/build/ +/db/ +/out.txt +/Testing/ +/tmp/ +CMakeSettings.json +CMakeUserPresets.json -# Ignore coverage files. +# Coverage files. *.gcno *.gcda *.gcov -# Levelization checking +# Profiling data. +gmon.out + +# Levelization data. .github/scripts/levelization/results/* !.github/scripts/levelization/results/loops.txt !.github/scripts/levelization/results/ordering.txt -# Ignore tmp directory. -tmp +# Customized configs. +/rippled.cfg +/validators.txt -# Ignore database directory. -db/ -db/*.db -db/*.db-* +# Locally patched Conan recipes +external/conan-center-index/ -# Ignore debug logs -debug_log.txt - -# Ignore customized configs -rippled.cfg -validators.txt - -# Doxygen generated documentation output -HtmlDocumentation -docs/html_doc - -# Xcode user-specific project settings -# Xcode -.DS_Store -/build/ +# XCode IDE. *.pbxuser !default.pbxuser *.mode1v3 @@ -76,41 +53,16 @@ xcuserdata profile *.moved-aside DerivedData -.idea/ *.hmap -# Intel Parallel Studio 2013 XE -My Amplifier XE Results - RippleD +# JetBrains IDE. +/.idea/ -# Compiler intermediate output -/out.txt +# Microsoft Visual Studio IDE. +/.vs/ +/.vscode/ -# Build Log -rippled-build.log - -# Profiling data -gmon.out - -Builds/VisualStudio2015/*.db -Builds/VisualStudio2015/*.user -Builds/VisualStudio2015/*.opendb -Builds/VisualStudio2015/*.sdf - -# MSVC -*.pdb -.vs/ -CMakeSettings.json -compile_commands.json -.clangd -packages -pkg_out -pkg -CMakeUserPresets.json -bld.rippled/ -.vscode - -# Suggested in-tree build directory -/.build*/ - -# Locally patched Conan recipes -external/conan-center-index/ +# AI tools. +/.augment +/.claude +/CLAUDE.md diff --git a/cmake/XrplDocs.cmake b/cmake/XrplDocs.cmake index dda277bffa..a99bbe076b 100644 --- a/cmake/XrplDocs.cmake +++ b/cmake/XrplDocs.cmake @@ -2,9 +2,7 @@ docs target (optional) #]===================================================================] -option(with_docs "Include the docs target?" FALSE) - -if(NOT (with_docs OR only_docs)) +if(NOT only_docs) return() endif() diff --git a/conan.lock b/conan.lock index 53fd85f366..3215456b63 100644 --- a/conan.lock +++ b/conan.lock @@ -7,7 +7,7 @@ "sqlite3/3.49.1#8631739a4c9b93bd3d6b753bac548a63%1756234266.869", "soci/4.0.3#a9f8d773cd33e356b5879a4b0564f287%1756234262.318", "snappy/1.1.10#968fef506ff261592ec30c574d4a7809%1756234314.246", - "secp256k1/0.7.0#d01848b436efd0efaeec1bff7d9df847%1764270192.06", + "secp256k1/0.7.0#9c4ab67bdc3860c16ea5b36aed8f74ea%1765202256.763", "rocksdb/10.5.1#4a197eca381a3e5ae8adf8cffa5aacd0%1762797952.535", "re2/20230301#ca3b241baec15bd31ea9187150e0b333%1764175362.029", "protobuf/6.32.1#f481fd276fc23a33b85a3ed1e898b693%1764863245.83", diff --git a/docs/.gitignore b/docs/.gitignore deleted file mode 100644 index b3ee85720f..0000000000 --- a/docs/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -html -temp -out.txt diff --git a/docs/README.md b/docs/README.md index c95a871729..35fcbba2d1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -54,8 +54,8 @@ There is a `docs` target in the CMake configuration. ``` mkdir build cd build -cmake .. -cmake --build . --target docs +cmake -Donly_docs=ON .. +cmake --build . --target docs --parallel ``` The output will be in `build/docs/html`. diff --git a/include/xrpl/protocol/detail/secp256k1.h b/include/xrpl/protocol/detail/secp256k1.h index c0c3cd761b..c93734a539 100644 --- a/include/xrpl/protocol/detail/secp256k1.h +++ b/include/xrpl/protocol/detail/secp256k1.h @@ -1,7 +1,6 @@ #ifndef XRPL_PROTOCOL_SECP256K1_H_INCLUDED #define XRPL_PROTOCOL_SECP256K1_H_INCLUDED -#define SECP256K1_STATIC #include namespace ripple {