This repository has been archived by the owner on Jan 19, 2024. It is now read-only.
generated from eosnetworkfoundation/product
-
Notifications
You must be signed in to change notification settings - Fork 0
Massive Set of Changes #22
Merged
Merged
Changes from 29 commits
Commits
Show all changes
51 commits
Select commit
Hold shift + click to select a range
6c7dbd3
missed some references to boost::split
d457132
Merge branch 'larryk85/proj-changes' of github.com:antelopeio/antler-…
71f33fa
More changes
56583e4
changes
76b9e6f
more updates
c155b78
more changes and tests
242396a
back to parity
d37ec68
fuzz
6c7b293
fixes for gcc9
feec6a8
forgot cpps
4e3c89b
forgot one last reference
d0376d5
hopefully the last filesystem references
0b372f3
fix
f9f555e
fix
1252dbf
more changes
fc07dc2
more issues with ubuntu18
c6f9af7
rollback cmake
69f0c01
fix deps
96b20c9
update deps
c47a0db
update deps
263dffc
update deps
8a59e2f
update deps
9d6adbd
more more updates
cc2cf14
fix constraints
b42219e
fix populate
75dcffd
update gitignore
6dc9b1c
update logger
038d203
small fixes for cdt installation
1afe6e5
renable licensefile, small cleanup
ScottBailey 3874966
Remove unused option: ANTLER_PROJ_PEDANTIC_BUILD
ScottBailey 1e42809
Add [[nodiscard]]
ScottBailey 55f8937
Correct description for jobs.
ScottBailey 213c572
Remove commented out code.
ScottBailey 03260ee
warning removal
ScottBailey 866aa28
comment for disabled code
ScottBailey ca9f4b2
adding TODO comments.
ScottBailey c1f0127
Addressing review comment, whitespace
ScottBailey 22e0e0f
Reenable tests and check return result to satisfy nodiscard decorations.
ScottBailey ab2fd78
Removed unused test.
ScottBailey 019fcda
Adding TODO comment.
ScottBailey f17b961
Correct arguments and calls.
ScottBailey 6ce0391
Address review comment.
ScottBailey 09a7323
Address review comment.
ScottBailey 17da588
Correct defect in logging.
ScottBailey 1e8097e
Review comment.
ScottBailey 5b44f00
Address review comment. Remove incorrect comment.
ScottBailey 8c9b5c7
Small clarification in docs.
ScottBailey dd80a4b
allow tests to run in parallel
dimas1185 fa8ad98
Merge main
ScottBailey 1850593
missed some references to boost::split
04e3b89
small fixes for location
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,12 @@ | ||
[Bb]uild*/* | ||
CMakeLists.txt.user | ||
*.md.backup | ||
*.md.backup | ||
|
||
settings.json | ||
checks.json | ||
|
||
tests/Testing/* | ||
|
||
.vscode/* | ||
|
||
tools/tests/__pycache__/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,18 @@ | ||
[submodule "external/rapidyaml"] | ||
path = external/rapidyaml | ||
url = https://github.com/biojppm/rapidyaml | ||
[submodule "external/magic_enum"] | ||
path = external/magic_enum | ||
url = https://github.com/Neargye/magic_enum | ||
[submodule "external/Catch2"] | ||
path = external/Catch2 | ||
url = https://github.com/catchorg/Catch2 | ||
[submodule "external/nlohmann"] | ||
path = external/nlohmann | ||
url = https://github.com/nlohmann/json | ||
[submodule "external/yaml-cpp"] | ||
path = external/yaml-cpp | ||
url = https://github.com/jbeder/yaml-cpp | ||
[submodule "external/cturtle"] | ||
path = external/cturtle | ||
url = https://github.com/larryk85/cturtle | ||
[submodule "external/Mustache"] | ||
path = external/Mustache | ||
url = https://github.com/kainjow/Mustache | ||
[submodule "external/fmt"] | ||
path = external/fmt | ||
url = https://github.com/fmtlib/fmt |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,33 +1,40 @@ | ||
# @copyright See `LICENSE` in the root directory of this project. | ||
|
||
cmake_minimum_required(VERSION 3.11) # If ryml >= 0.5.0 is included via FetchContent or submodule, this minimum is 3.12. | ||
cmake_minimum_required(VERSION 3.10) | ||
|
||
project("ANTLER Project Tools " VERSION 1.0.0) | ||
|
||
include( ./common.cmake REQUIRED ) | ||
|
||
|
||
|
||
option(ANTLER_PROJ_PEDANTIC_BUILD "Pedantic builds" On) | ||
option(ANTLER_PROJ_BUILD_TESTS "Build and run the tests." On) | ||
option(ANTLER_PROJ_TIDY_CHECKS "Uses clang-tidy in building." On) | ||
|
||
add_subdirectory( external ) | ||
add_subdirectory( include ) | ||
add_subdirectory( src ) | ||
add_subdirectory( tools ) | ||
|
||
|
||
option(PEDANTIC_BUILD "Pedantic builds" On) | ||
option(BUILD_TESTS "Build and run the tests." On) | ||
|
||
if(BUILD_TESTS) | ||
if(ANTLER_PROJ_BUILD_TESTS) | ||
enable_testing() | ||
add_subdirectory( tests ) | ||
endif() | ||
|
||
# Clang-tidy support | ||
if (ANTLER_PROJ_TIDY_CHECKS) | ||
find_program(CLANG_TIDY_EXE NAMES "clang-tidy" REQUIRED) | ||
set(CLANG_TIDY_COMMAND "${CLANG_TIDY_EXE}" "-checks=*,modernize-*") | ||
endif() | ||
|
||
# Copy licenses to BUILD dir | ||
# | ||
# NOTE: This is used due to legacy requirements instead of: | ||
# `install(FILE <license files> COMPONENT Documentation DESTINATION share/aproj/licenses)` | ||
configure_file(LICENSE ${CMAKE_BINARY_DIR}/licenses/LICENSE COPYONLY) | ||
configure_file(LICENSE licenses/LICENSE COPYONLY) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I may change this back in cdt/#112 if submoduling won't work with this There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, you might need to change it to something different. The replacement line and original should be functionally the same. |
||
file(GLOB license_files licenses/*) | ||
foreach(full_path IN ITEMS ${license_files}) | ||
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" file_name ${full_path}) | ||
configure_file("${file_name}" "${CMAKE_BINARY_DIR}/${file_name}" COPYONLY) | ||
string(REPLACE "${CMAKE_SOURCE_DIR}/" "" file_name ${full_path}) | ||
configure_file("${full_path}" "${file_name}" COPYONLY) | ||
endforeach() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule magic_enum
deleted from
654240
Submodule rapidyaml
deleted from
7c0036
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this used anywhere?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
removed in 3874966