Skip to content

Commit 710dbf4

Browse files
jviottijviotti
authored
Upgrade Noa and JSON Toolkit to the latest versions (#868)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 2aa105b commit 710dbf4

561 files changed

Lines changed: 128212 additions & 3263 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,12 @@ jobs:
108108
109109
- run: cmake --build ./build --config Release --target clang_format_test
110110
- run: cmake --build ./build --config Release --parallel 4
111+
- run: >
112+
cmake --install ./build --prefix ./build/dist --config Release --verbose
113+
--component sourcemeta_noa
114+
- run: >
115+
cmake --install ./build --prefix ./build/dist --config Release --verbose
116+
--component sourcemeta_noa_dev
111117
- run: >
112118
cmake --install ./build --prefix ./build/dist --config Release --verbose
113119
--component sourcemeta_jsontoolkit

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ format based on JSON Schema with \
66
both schema-driven and schema-less support."
77
HOMEPAGE_URL "https://jsonbinpack.sourcemeta.com")
88
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
9-
include(vendor/noa/cmake/noa.cmake)
109

1110
# Options
1211
option(JSONBINPACK_NUMERIC "Build the JSON BinPack numeric library" ON)
@@ -19,6 +18,8 @@ option(JSONBINPACK_DOCS "Build the JSON BinPack documentation" OFF)
1918
option(JSONBINPACK_ADDRESS_SANITIZER "Build JSON BinPack with an address sanitizer" OFF)
2019
option(JSONBINPACK_UNDEFINED_SANITIZER "Build JSON BinPack with an undefined behavior sanitizer" OFF)
2120

21+
find_package(Noa REQUIRED)
22+
2223
if(JSONBINPACK_INSTALL)
2324
include(GNUInstallDirs)
2425
include(CMakePackageConfigHelpers)
@@ -80,7 +81,6 @@ endif()
8081

8182
# Testing
8283
if(JSONBINPACK_TESTS)
83-
find_package(GoogleTest REQUIRED)
8484
enable_testing()
8585

8686
if(JSONBINPACK_NUMERIC)

‎DEPENDENCIES‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
2-
jsontoolkit https://github.com/sourcemeta/jsontoolkit 93a921d0f1e99bfdfe14bfd4d2acf5981294080b
3-
alterschema https://github.com/sourcemeta/alterschema 0fcd3b3b921bd47dc0867477619383f6519939fa
4-
googletest https://github.com/google/googletest 987e225614755fec7253aa95bf959c09e0d380d7
2+
noa https://github.com/sourcemeta/noa a8d36453236abc365f08a76a486f92c84f976fd9
3+
jsontoolkit https://github.com/sourcemeta/jsontoolkit 60a3862ad0d9642c97685f94aeaed96ab3509690
4+
alterschema https://github.com/sourcemeta/alterschema 3579095980f5d53033a457725dd95eca27de96f4
55
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e
6-
noa https://github.com/sourcemeta/noa 924f5cc8549af7f12227869dcbab4259029ac650

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ configure: .always
2424
compile: .always
2525
$(CMAKE) --build ./build --config $(PRESET) --target clang_format
2626
$(CMAKE) --build ./build --config $(PRESET) --parallel 4
27+
$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
28+
--component sourcemeta_noa
29+
$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
30+
--component sourcemeta_noa_dev
2731
$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
2832
--component sourcemeta_jsontoolkit
2933
$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \

‎cmake/FindNoa.cmake‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
if(NOT Noa_FOUND)
2+
if(JSONBINPACK_INSTALL)
3+
set(NOA_INSTALL ON CACHE BOOL "enable Noa installation")
4+
else()
5+
set(NOA_INSTALL OFF CACHE BOOL "disable Noa installation")
6+
endif()
7+
8+
set(NOA_GOOGLETEST ${JSONBINPACK_TESTS} CACHE BOOL "GoogleTest")
9+
set(NOA_GOOGLEBENCHMARK OFF CACHE BOOL "GoogleBenchmark")
10+
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/noa")
11+
set(Noa_FOUND ON)
12+
endif()

‎test/compiler/CMakeLists.txt‎

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,23 @@
1-
add_executable(sourcemeta_jsonbinpack_compiler_unit
2-
canonicalizer_test.cc compiler_test.cc
1+
noa_googletest(NAMESPACE sourcemeta PROJECT jsonbinpack NAME compiler
2+
FOLDER "JSON BinPack/Compiler"
3+
SOURCES
4+
canonicalizer_test.cc compiler_test.cc
35

4-
2020_12_canonicalizer_any_test.cc
5-
2020_12_canonicalizer_array_test.cc
6-
2020_12_canonicalizer_boolean_test.cc
7-
2020_12_canonicalizer_null_test.cc
8-
2020_12_canonicalizer_number_test.cc
9-
2020_12_canonicalizer_object_test.cc
10-
2020_12_canonicalizer_string_test.cc
6+
2020_12_canonicalizer_any_test.cc
7+
2020_12_canonicalizer_array_test.cc
8+
2020_12_canonicalizer_boolean_test.cc
9+
2020_12_canonicalizer_null_test.cc
10+
2020_12_canonicalizer_number_test.cc
11+
2020_12_canonicalizer_object_test.cc
12+
2020_12_canonicalizer_string_test.cc
1113

12-
2020_12_compiler_any_test.cc
13-
2020_12_compiler_integer_test.cc
14-
2020_12_compiler_number_test.cc)
14+
2020_12_compiler_any_test.cc
15+
2020_12_compiler_integer_test.cc
16+
2020_12_compiler_number_test.cc)
1517

16-
noa_add_default_options(PRIVATE sourcemeta_jsonbinpack_compiler_unit)
17-
target_link_libraries(sourcemeta_jsonbinpack_compiler_unit
18-
PRIVATE GTest::gtest GTest::gtest_main)
1918
target_link_libraries(sourcemeta_jsonbinpack_compiler_unit
2019
PRIVATE sourcemeta::jsonbinpack::compiler)
2120
target_link_libraries(sourcemeta_jsonbinpack_compiler_unit
2221
PRIVATE sourcemeta::jsontoolkit::json)
2322
target_link_libraries(sourcemeta_jsonbinpack_compiler_unit
2423
PRIVATE sourcemeta::jsontoolkit::jsonschema)
25-
gtest_discover_tests(sourcemeta_jsonbinpack_compiler_unit)
26-
set_target_properties(sourcemeta_jsonbinpack_compiler_unit
27-
PROPERTIES FOLDER "JSON BinPack/Compiler")

‎test/numeric/CMakeLists.txt‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
1-
add_executable(sourcemeta_jsonbinpack_numeric_unit
2-
zigzag_test.cc
3-
closest_smallest_exponent_test.cc
4-
divide_ceil_test.cc
5-
divide_floor_test.cc
6-
uint_max_test.cc)
1+
noa_googletest(NAMESPACE sourcemeta PROJECT jsonbinpack NAME numeric
2+
FOLDER "JSON BinPack/Numeric"
3+
SOURCES
4+
zigzag_test.cc
5+
closest_smallest_exponent_test.cc
6+
divide_ceil_test.cc
7+
divide_floor_test.cc
8+
uint_max_test.cc)
79

8-
noa_add_default_options(PRIVATE sourcemeta_jsonbinpack_numeric_unit)
9-
10-
target_link_libraries(sourcemeta_jsonbinpack_numeric_unit
11-
PRIVATE GTest::gtest GTest::gtest_main)
1210
target_link_libraries(sourcemeta_jsonbinpack_numeric_unit
1311
PRIVATE sourcemeta::jsonbinpack::numeric)
14-
15-
gtest_discover_tests(sourcemeta_jsonbinpack_numeric_unit)
16-
set_target_properties(sourcemeta_jsonbinpack_numeric_unit
17-
PROPERTIES FOLDER "JSON BinPack/Numeric")

‎test/runtime/CMakeLists.txt‎

Lines changed: 32 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,37 @@
1-
add_executable(sourcemeta_jsonbinpack_runtime_unit
2-
decode_any_test.cc
3-
decode_array_test.cc
4-
decode_integer_test.cc
5-
decode_number_test.cc
6-
decode_object_test.cc
7-
decode_string_test.cc
8-
decode_test.cc
9-
decode_traits_test.cc
10-
decode_utils.h
11-
encode_any_test.cc
12-
encode_array_test.cc
13-
encode_cache_test.cc
14-
encode_integer_test.cc
15-
encode_number_test.cc
16-
encode_object_test.cc
17-
encode_real_test.cc
18-
encode_string_test.cc
19-
encode_test.cc
20-
encode_traits_test.cc
21-
encode_utils.h
22-
input_stream_varint_test.cc
23-
output_stream_varint_test.cc
24-
encoding_traits_test.cc
25-
v1_loader_test.cc
26-
v1_any_loader_test.cc
27-
v1_array_loader_test.cc
28-
v1_integer_loader_test.cc
29-
v1_number_loader_test.cc
30-
v1_string_loader_test.cc)
1+
noa_googletest(NAMESPACE sourcemeta PROJECT jsonbinpack NAME runtime
2+
FOLDER "JSON BinPack/Runtime"
3+
SOURCES
4+
decode_any_test.cc
5+
decode_array_test.cc
6+
decode_integer_test.cc
7+
decode_number_test.cc
8+
decode_object_test.cc
9+
decode_string_test.cc
10+
decode_test.cc
11+
decode_traits_test.cc
12+
decode_utils.h
13+
encode_any_test.cc
14+
encode_array_test.cc
15+
encode_cache_test.cc
16+
encode_integer_test.cc
17+
encode_number_test.cc
18+
encode_object_test.cc
19+
encode_real_test.cc
20+
encode_string_test.cc
21+
encode_test.cc
22+
encode_traits_test.cc
23+
encode_utils.h
24+
input_stream_varint_test.cc
25+
output_stream_varint_test.cc
26+
encoding_traits_test.cc
27+
v1_loader_test.cc
28+
v1_any_loader_test.cc
29+
v1_array_loader_test.cc
30+
v1_integer_loader_test.cc
31+
v1_number_loader_test.cc
32+
v1_string_loader_test.cc)
3133

32-
noa_add_default_options(PRIVATE sourcemeta_jsonbinpack_runtime_unit)
33-
34-
target_link_libraries(sourcemeta_jsonbinpack_runtime_unit
35-
PRIVATE GTest::gtest GTest::gtest_main)
3634
target_link_libraries(sourcemeta_jsonbinpack_runtime_unit
3735
PRIVATE sourcemeta::jsonbinpack::runtime)
3836
target_link_libraries(sourcemeta_jsonbinpack_runtime_unit
3937
PRIVATE sourcemeta::jsontoolkit::json)
40-
41-
gtest_discover_tests(sourcemeta_jsonbinpack_runtime_unit)
42-
set_target_properties(sourcemeta_jsonbinpack_runtime_unit
43-
PROPERTIES FOLDER "JSON BinPack/Runtime")

‎vendor/alterschema/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/alterschema/vendor/noa/CMakeLists.txt‎

Lines changed: 105 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)