Replace JSON Toolkit, Noa, and AlterSchema with the new Core library (#873)

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

.github/workflows/ci.yml

@@ -108,22 +108,10 @@ jobs:
       - run: cmake --build ./build --config Release --parallel 4
       - run: >
           cmake --install ./build --prefix ./build/dist --config Release --verbose
-          --component sourcemeta_noa
+          --component sourcemeta_core
       - run: >
           cmake --install ./build --prefix ./build/dist --config Release --verbose
-          --component sourcemeta_noa_dev
-      - run: >
-          cmake --install ./build --prefix ./build/dist --config Release --verbose
-          --component sourcemeta_jsontoolkit
-      - run: >
-          cmake --install ./build --prefix ./build/dist --config Release --verbose
-          --component sourcemeta_jsontoolkit_dev
-      - run: >
-          cmake --install ./build --prefix ./build/dist --config Release --verbose
-          --component sourcemeta_alterschema
-      - run: >
-          cmake --install ./build --prefix ./build/dist --config Release --verbose
-          --component sourcemeta_alterschema_dev
+          --component sourcemeta_core_dev
       - run: >
           cmake --install ./build --prefix ./build/dist --config Release --verbose
           --component sourcemeta_jsonbinpack

CMakeLists.txt

@@ -17,7 +17,7 @@ option(JSONBINPACK_DOCS "Build the JSON BinPack documentation" OFF)
 option(JSONBINPACK_ADDRESS_SANITIZER "Build JSON BinPack with an address sanitizer" OFF)
 option(JSONBINPACK_UNDEFINED_SANITIZER "Build JSON BinPack with an undefined behavior sanitizer" OFF)
 
-find_package(Noa REQUIRED)
+find_package(Core REQUIRED)
 
 if(JSONBINPACK_INSTALL)
   include(GNUInstallDirs)
@@ -37,8 +37,7 @@ if(JSONBINPACK_INSTALL)
 endif()
 
 # Dependencies
-find_package(JSONToolkit REQUIRED)
-find_package(AlterSchema REQUIRED)
+find_package(Core REQUIRED)
 
 # Numeric
 if(JSONBINPACK_NUMERIC)
@@ -56,21 +55,21 @@ if(JSONBINPACK_COMPILER)
 endif()
 
 if(JSONBINPACK_ADDRESS_SANITIZER)
-  noa_sanitizer(TYPE address)
+  sourcemeta_sanitizer(TYPE address)
 elseif(JSONBINPACK_UNDEFINED_SANITIZER)
-  noa_sanitizer(TYPE undefined)
+  sourcemeta_sanitizer(TYPE undefined)
 endif()
 
 if(JSONBINPACK_DOCS)
-  noa_target_doxygen(CONFIG "${PROJECT_SOURCE_DIR}/doxygen/Doxyfile.in"
+  sourcemeta_target_doxygen(CONFIG "${PROJECT_SOURCE_DIR}/doxygen/Doxyfile.in"
     OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/www")
 endif()
 
 if(PROJECT_IS_TOP_LEVEL)
-  noa_target_clang_format(SOURCES
+  sourcemeta_target_clang_format(SOURCES
     src/*.h src/*.cc
     test/*.h test/*.cc)
-  noa_target_clang_tidy(SOURCES
+  sourcemeta_target_clang_tidy(SOURCES
     src/*.h src/*.cc)
 endif()
 

DEPENDENCIES

@@ -1,5 +1,3 @@
 vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
-noa https://github.com/sourcemeta/noa dee6c859895baf918fe3ecca22e4e7a262c5d500
-jsontoolkit https://github.com/sourcemeta/jsontoolkit d3436cfa5546f5f5c01ffa2f2314aabd966a84ed
-alterschema https://github.com/sourcemeta/alterschema dfbc1f51d81ec231346c7e73f06c60cbaa7b0db6
+core https://github.com/sourcemeta/core 514001ace2da9444cfe2382a4134ed4cd773ce73
 bootstrap https://github.com/twbs/bootstrap 1a6fdfae6be09b09eaced8f0e442ca6f7680a61e

Makefile

@@ -24,17 +24,9 @@ compile: .always
 	$(CMAKE) --build ./build --config $(PRESET) --target clang_format
 	$(CMAKE) --build ./build --config $(PRESET) --parallel 4
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
-		--component sourcemeta_noa
+		--component sourcemeta_core
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
-		--component sourcemeta_noa_dev
-	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
-		--component sourcemeta_jsontoolkit
-	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
-		--component sourcemeta_jsontoolkit_dev
-	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
-		--component sourcemeta_alterschema
-	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
-		--component sourcemeta_alterschema_dev
+		--component sourcemeta_core_dev
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \
 		--component sourcemeta_jsonbinpack
 	$(CMAKE) --install ./build --prefix ./build/dist --config $(PRESET) --verbose \

cmake/FindAlterSchema.cmake

@@ -0,0 +1,15 @@
+if(NOT Core_FOUND)
+  if(JSONBINPACK_INSTALL)
+    set(SOURCEMETA_CORE_INSTALL ON CACHE BOOL "enable installation")
+  else()
+    set(SOURCEMETA_CORE_INSTALL OFF CACHE BOOL "disable installation")
+  endif()
+
+  set(SOURCEMETA_CORE_JSONL OFF CACHE BOOL "disable JSONL support")
+  set(SOURCEMETA_CORE_YAML OFF CACHE BOOL "disable YAML support")
+  set(SOURCEMETA_CORE_CONTRIB_GOOGLETEST ${JSONBINPACK_TESTS} CACHE BOOL "GoogleTest")
+  set(SOURCEMETA_CORE_CONTRIB_GOOGLEBENCHMARK ${JSONBINPACK_BENCHMARK} CACHE BOOL "GoogleBenchmark")
+  add_subdirectory("${PROJECT_SOURCE_DIR}/vendor/core")
+  include(Sourcemeta)
+  set(Core_FOUND ON)
+endif()

cmake/FindCore.cmake

@@ -10,8 +10,7 @@ if(NOT JSONBINPACK_COMPONENTS)
 endif()
 
 include(CMakeFindDependencyMacro)
-find_dependency(JSONToolkit COMPONENTS uri json jsonpointer jsonschema)
-find_dependency(AlterSchema COMPONENTS engine linter)
+find_dependency(Core COMPONENTS uri json jsonpointer jsonschema alterschema)
 
 foreach(component ${JSONBINPACK_COMPONENTS})
   if(component STREQUAL "numeric")

cmake/FindJSONToolkit.cmake

@@ -58,7 +58,7 @@ PROJECT_LOGO           = @PROJECT_SOURCE_DIR@/doxygen/logo.png
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = @NOA_TARGET_DOXYGEN_OUTPUT@
+OUTPUT_DIRECTORY       = @SOURCEMETA_TARGET_DOXYGEN_OUTPUT@
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and