Skip to content

Commit 177795f

Browse files
jviottijviotti
authored
Upgrade Core and Blaze (#918)
Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>
1 parent 40293a1 commit 177795f

281 files changed

Lines changed: 5049 additions & 2122 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.

‎DEPENDENCIES‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
vendorpull https://github.com/sourcemeta/vendorpull 1dcbac42809cf87cb5b045106b863e17ad84ba02
2-
core https://github.com/sourcemeta/core e586f557af367c74d08d2818bc4bd0d07c8b20bc
3-
blaze https://github.com/sourcemeta/blaze bc1f434acafd38803f58a941a756a6f788e556e2
2+
core https://github.com/sourcemeta/core 9a8c6370c53b4b3b24f4ba0caa2d897a5094ff4e
3+
blaze https://github.com/sourcemeta/blaze 4c311d45803eaeeb17cbd49af4fffdb5f224d180
44
bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

‎cmake/FindBlaze.cmake‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ if(NOT Blaze_FOUND)
77

88
set(BLAZE_TEST OFF CACHE BOOL "disable")
99
set(BLAZE_CONFIGURATION OFF CACHE BOOL "disable")
10+
set(BLAZE_CODEGEN OFF CACHE BOOL "disable")
11+
set(BLAZE_DOCUMENTATION OFF CACHE BOOL "disable")
12+
set(BLAZE_EDITOR OFF CACHE BOOL "disable")
1013
set(BLAZE_CONTRIB OFF CACHE BOOL "disable")
1114
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/blaze")
1215
include(Sourcemeta)

‎cmake/FindCore.cmake‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,18 @@ if(NOT Core_FOUND)
55
set(SOURCEMETA_CORE_INSTALL OFF CACHE BOOL "disable installation")
66
endif()
77

8-
set(SOURCEMETA_CORE_UUID OFF CACHE BOOL "disable")
8+
set(SOURCEMETA_CORE_LANG_PROCESS OFF CACHE BOOL "disable")
9+
set(SOURCEMETA_CORE_LANG_PARALLEL OFF CACHE BOOL "disable")
10+
set(SOURCEMETA_CORE_LANG_ERROR OFF CACHE BOOL "disable")
11+
set(SOURCEMETA_CORE_LANG_STACKTRACE OFF CACHE BOOL "disable")
912
set(SOURCEMETA_CORE_GZIP OFF CACHE BOOL "disable")
10-
set(SOURCEMETA_CORE_MD5 OFF CACHE BOOL "disable")
1113
set(SOURCEMETA_CORE_JSONL OFF CACHE BOOL "disable JSONL support")
14+
set(SOURCEMETA_CORE_JSONRPC OFF CACHE BOOL "disable")
15+
set(SOURCEMETA_CORE_MCP OFF CACHE BOOL "disable")
16+
set(SOURCEMETA_CORE_HTTP OFF CACHE BOOL "disable")
17+
set(SOURCEMETA_CORE_SEMVER OFF CACHE BOOL "disable")
18+
set(SOURCEMETA_CORE_MARKDOWN OFF CACHE BOOL "disable")
1219
set(SOURCEMETA_CORE_YAML ON CACHE BOOL "needed by Blaze")
13-
set(SOURCEMETA_CORE_EXTENSION_OPTIONS OFF CACHE BOOL "disable")
14-
set(SOURCEMETA_CORE_EXTENSION_BUILD OFF CACHE BOOL "disable")
1520
set(SOURCEMETA_CORE_CONTRIB_GOOGLETEST ${JSONBINPACK_TESTS} CACHE BOOL "GoogleTest")
1621
set(SOURCEMETA_CORE_CONTRIB_GOOGLEBENCHMARK OFF CACHE BOOL "GoogleBenchmark")
1722
add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/core")

‎config.cmake.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ if(NOT JSONBINPACK_COMPONENTS)
99
endif()
1010

1111
include(CMakeFindDependencyMacro)
12-
find_dependency(Core COMPONENTS numeric regex uri json jsonpointer io)
12+
find_dependency(Core COMPONENTS json uri jsonpointer numeric regex io)
1313
find_dependency(Blaze COMPONENTS foundation bundle alterschema)
1414

1515
foreach(component ${JSONBINPACK_COMPONENTS})

‎src/compiler/mapper/enum_8_bit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Enum8Bit final : public sourcemeta::blaze::SchemaTransformRule {
1212
const sourcemeta::blaze::SchemaFrame &,
1313
const sourcemeta::blaze::SchemaFrame::Location &location,
1414
const sourcemeta::blaze::SchemaWalker &,
15-
const sourcemeta::blaze::SchemaResolver &) const
15+
const sourcemeta::blaze::SchemaResolver &, const bool) const
1616
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1717
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
1818
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::

‎src/compiler/mapper/enum_8_bit_top_level.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Enum8BitTopLevel final : public sourcemeta::blaze::SchemaTransformRule {
1212
const sourcemeta::blaze::SchemaFrame &,
1313
const sourcemeta::blaze::SchemaFrame::Location &location,
1414
const sourcemeta::blaze::SchemaWalker &,
15-
const sourcemeta::blaze::SchemaResolver &) const
15+
const sourcemeta::blaze::SchemaResolver &, const bool) const
1616
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1717
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
1818
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::

‎src/compiler/mapper/enum_arbitrary.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class EnumArbitrary final : public sourcemeta::blaze::SchemaTransformRule {
1313
const sourcemeta::blaze::SchemaFrame &,
1414
const sourcemeta::blaze::SchemaFrame::Location &location,
1515
const sourcemeta::blaze::SchemaWalker &,
16-
const sourcemeta::blaze::SchemaResolver &) const
16+
const sourcemeta::blaze::SchemaResolver &, const bool) const
1717
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1818
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
1919
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::

‎src/compiler/mapper/enum_singleton.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class EnumSingleton final : public sourcemeta::blaze::SchemaTransformRule {
1212
const sourcemeta::blaze::SchemaFrame &,
1313
const sourcemeta::blaze::SchemaFrame::Location &location,
1414
const sourcemeta::blaze::SchemaWalker &,
15-
const sourcemeta::blaze::SchemaResolver &) const
15+
const sourcemeta::blaze::SchemaResolver &, const bool) const
1616
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1717
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
1818
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::

‎src/compiler/mapper/integer_bounded_8_bit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class IntegerBounded8Bit final : public sourcemeta::blaze::SchemaTransformRule {
1212
const sourcemeta::blaze::SchemaFrame &,
1313
const sourcemeta::blaze::SchemaFrame::Location &location,
1414
const sourcemeta::blaze::SchemaWalker &,
15-
const sourcemeta::blaze::SchemaResolver &) const
15+
const sourcemeta::blaze::SchemaResolver &, const bool) const
1616
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1717
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
1818
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::

‎src/compiler/mapper/integer_bounded_greater_than_8_bit.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class IntegerBoundedGreaterThan8Bit final
1414
const sourcemeta::blaze::SchemaFrame &,
1515
const sourcemeta::blaze::SchemaFrame::Location &location,
1616
const sourcemeta::blaze::SchemaWalker &,
17-
const sourcemeta::blaze::SchemaResolver &) const
17+
const sourcemeta::blaze::SchemaResolver &, const bool) const
1818
-> sourcemeta::blaze::SchemaTransformRule::Result override {
1919
return location.dialect == "https://json-schema.org/draft/2020-12/schema" &&
2020
vocabularies.contains(sourcemeta::blaze::Vocabularies::Known::

0 commit comments

Comments
 (0)