diff --git a/thirdparty/json-schema-validator/HPKBUILD b/thirdparty/json-schema-validator/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..b07a3e0cf08fd290693f5af7ff0a4e7a0141de52 --- /dev/null +++ b/thirdparty/json-schema-validator/HPKBUILD @@ -0,0 +1,59 @@ +# Contributor: wupingyuan +# Maintainer: wupingyuan +pkgname=json-schema-validator +pkgver=2.2.0 +pkgrel=0 +pkgdesc="This is a C++ library for validating JSON documents based on a JSON Schema which itself should validate with draft-7 of JSON Schema Validation." +url="https://github.com/pboettch/json-schema-validator" +archs=("armeabi-v7a" "arm64-v8a") +license=("MIT") +depends=("json") +makedepends=() +install= +source="https://github.com/pboettch/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +autounpack=true +downloadpackage=true +builddir=$pkgname-$pkgver +packagename=$builddir.tar.gz +patchflag=true + +prepare() { + mkdir -p $builddir/$ARCH-build + cd $builddir + if $patchflag + then + # 由于库编译报错:constant expression evaluates to -32 which cannot be narrowed to type 'char' [-Wc++11-narrowing] + patch -p1 < `pwd`/../json-schema-validator_oh_pkg.patch + patchflag=false + fi + cd $OLDPWD +} + +build() { + cd $builddir + ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=$ARCH -B$ARCH-build -S./ -L > `pwd`/$ARCH-build/build.log 2>&1 + make -j4 $ARCH-build >> `pwd`/$ARCH-build/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +package() { + cd $builddir + make -C $ARCH-build install >> `pwd`/$ARCH-build/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +check() { + echo "The test must be on an OpenHarmony device!" + # 在OpenHarmony开发板中执行用例 + # ctest +} + +# 清理环境 +cleanbuild(){ + rm -rf ${PWD}/$builddir #${PWD}/$packagename +} diff --git a/thirdparty/json-schema-validator/README.OpenSource b/thirdparty/json-schema-validator/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..ed75c6df1c6bf3165944221cb098c4fa293d3a52 --- /dev/null +++ b/thirdparty/json-schema-validator/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "json-schema-validator", + "License": "MIT", + "License File": "LICENSE", + "Version Number": "v3.11.2", + "Owner": "wupingyuan@huawei.com", + "Upstream URL": "https://github.com/nlohmann/json/archive/refs/tags/v3.11.2.tar.gz", + "Description": "This is a C++ library for validating JSON documents based on a JSON Schema which itself should validate with draft-7 of JSON Schema Validation." + } +] diff --git a/thirdparty/json-schema-validator/README_zh.md b/thirdparty/json-schema-validator/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..3b940654868ed78f5886bca1f68d6eac240883c2 --- /dev/null +++ b/thirdparty/json-schema-validator/README_zh.md @@ -0,0 +1,12 @@ +# json-schema-validator三方库说明 +## 功能简介 +json-schema-validator用于验证基于JSON Schema的JSON文档。 +## 使用约束 +- IDE版本:DevEco Studio 3.1 Beta2 +- SDK版本:ohos_sdk_public 3.2.11.9 (API Version 9 Release) +- 三方库版本:2.2.0 +- 当前适配的功能:验证JSON Schema的JSON文档 +- [MIT](https://github.com/pboettch/json-schema-validator) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/json-schema-validator/SHA512SUM b/thirdparty/json-schema-validator/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..ca30292619942c67b757649af141d3f6500d5a23 --- /dev/null +++ b/thirdparty/json-schema-validator/SHA512SUM @@ -0,0 +1,2 @@ +8d7fe6775774040099aa8d8b10fa18c4ccebe4437ecf9670710a0f64443d3588ca3e1bf1bc32a800518b748aa3acd89ecc61d1568b6dd8bf54273b33c5ab5d5a json-schema-validator-2.2.0.tar.gz +a7fde948fb6ecbcf0d6fe4b6c0179b1fd0ccbbd062f02e5ec86919c60f364f91196199502dc2f65ff195ffa3a04004de30c552e13290be2a449ec8fc4a765517 json-schema-validator_oh_pkg.patch diff --git a/thirdparty/json-schema-validator/docs/hap_integrate.md b/thirdparty/json-schema-validator/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..2414b847288feee025b2ec806ee753f0866b9152 --- /dev/null +++ b/thirdparty/json-schema-validator/docs/hap_integrate.md @@ -0,0 +1,69 @@ +# json-schema-validator集成到应用hap +本库是在RK3568开发板上基于OpenHarmony3.2 Release版本的镜像验证的,如果是从未使用过RK3568,可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 +## 开发环境 +- ubuntu20.04 +- [OpenHarmony3.2Release镜像](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2-Release%2Fdayu200_standard_arm32.tar.gz) +- [ohos_sdk_public 3.2.11.9 (API Version 9 Release)](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2-Release%2Fohos-sdk-windows_linux-public.tar.gz) +- [DevEco Studio 3.1 Beta2](https://gitee.com/link?target=https%3A%2F%2Fcontentcenter-vali-drcn.dbankcdn.cn%2Fpvt_2%2FDeveloperAlliance_package_901_9%2Ff3%2Fv3%2FuJyuq3syQ2ak4hE1QZmAug%2Fdevecostudio-windows-3.1.0.400.zip%3FHW-CC-KV%3DV1%26HW-CC-Date%3D20230408T013335Z%26HW-CC-Expire%3D315360000%26HW-CC-Sign%3D96262721EDC9B34E6F62E66884AB7AE2A94C2A7B8C28D6F7FC891F46EB211A70) +- [准备三方库构建环境](../../../tools/README.md#编译环境准备) +- [准备三方库测试环境](../../../tools/README.md#ci环境准备) +## 编译三方库 +- 下载本仓库 + ``` + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` +- 三方库目录结构 + ``` + tpc_c_cplusplus/thirdparty/json-schema-validator #三方库json-schema-validator的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── json-schema-validator_oh_pkg.patch #补丁 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 将json-schema-validator拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/json-schema-validator tools/main -rf + cp thirdparty/json tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh json json-schema-validator + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + ``` + json-schema-validator/arm64-v8a json-schema-validator/armeabi-v7a + json/arm64-v8a json/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 + 备注:这里要拷贝json库生成的include的文件到thirdparty/json-schema-validator/include目录下。 + ![thirdparty_install_dir](pic/json-schema-validator_install_dir.jpg) +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/json-schema-validator/${OHOS_ARCH}/lib/libnlohmann_json_schema_validator.a) + #将三方库的头文件加入工程中(由于改库没有静态库或动态库,直接引入源文件使用) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/json-schema-validator/${OHOS_ARCH}/include) + ``` + ![json-schema-validator_usage](pic/json-schema-validator_usage.jpg) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试,[准备三方库测试环境](../../../tools/README.md#ci环境准备) + + ![json-schema-validator_test](pic/json-schema-validator_test.jpg) + +## 参考资料 +- [润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld) +- [OpenHarmony三方库地址](https://gitee.com/openharmony-tpc) +- [OpenHarmony知识体系](https://gitee.com/openharmony-sig/knowledge) +- [通过DevEco Studio开发一个NAPI工程](https://gitee.com/openharmony-sig/knowledge_demo_temp/blob/master/docs/napi_study/docs/hello_napi.md) diff --git a/thirdparty/json-schema-validator/docs/pic/json-schema-validator_install_dir.jpg b/thirdparty/json-schema-validator/docs/pic/json-schema-validator_install_dir.jpg new file mode 100644 index 0000000000000000000000000000000000000000..71c39a6c86a4c4bbd977032f87cfd0ea06fef787 Binary files /dev/null and b/thirdparty/json-schema-validator/docs/pic/json-schema-validator_install_dir.jpg differ diff --git a/thirdparty/json-schema-validator/docs/pic/json-schema-validator_test.jpg b/thirdparty/json-schema-validator/docs/pic/json-schema-validator_test.jpg new file mode 100644 index 0000000000000000000000000000000000000000..386a0debb80b34586207d1f6841eae9a1266325f Binary files /dev/null and b/thirdparty/json-schema-validator/docs/pic/json-schema-validator_test.jpg differ diff --git a/thirdparty/json-schema-validator/docs/pic/json-schema-validator_usage.jpg b/thirdparty/json-schema-validator/docs/pic/json-schema-validator_usage.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5c2d76c0a2da5ae97d6abb543ce897da5266ed27 Binary files /dev/null and b/thirdparty/json-schema-validator/docs/pic/json-schema-validator_usage.jpg differ diff --git a/thirdparty/json-schema-validator/json-schema-validator_oh_pkg.patch b/thirdparty/json-schema-validator/json-schema-validator_oh_pkg.patch new file mode 100644 index 0000000000000000000000000000000000000000..f7a51ce708706ebe67b819d93a079ffcdac4ec57 --- /dev/null +++ b/thirdparty/json-schema-validator/json-schema-validator_oh_pkg.patch @@ -0,0 +1,12 @@ +diff -Naur json-schema-validator-2.2.0/CMakeLists.txt json-schema-validator-2.2.0-patch/CMakeLists.txt +--- json-schema-validator-2.2.0/CMakeLists.txt 2022-11-27 01:06:09.000000000 +0800 ++++ json-schema-validator-2.2.0-patch/CMakeLists.txt 2023-04-24 12:57:33.663268956 +0800 +@@ -21,6 +21,8 @@ + hunter_add_package(nlohmann_json) + endif() + ++list(APPEND CMAKE_CXX_FLAGS "-fsigned-char") ++string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + # the library + add_library(nlohmann_json_schema_validator + src/smtp-address-validator.cpp