diff --git a/thirdparty/cJSON/HPKBUILD b/thirdparty/cJSON/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..724eb7e5d03635c01d7d80c4d40761add663c9cc --- /dev/null +++ b/thirdparty/cJSON/HPKBUILD @@ -0,0 +1,47 @@ +# Contributor: Jeff Han +# Maintainer: Jeff Han +pkgname=cJSON +pkgver=v1.7.15 +pkgrel=0 +pkgdesc="" +url="" +archs=("armeabi-v7a" "arm64-v8a") +license=("MIT") +depends=() +makedepends=() + +source="https://github.com/DaveGamble/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +autounpack=true +downloadpackage=true + +builddir=$pkgname-${pkgver:1} +packagename=$builddir.tar.gz + +prepare() { + mkdir -p $builddir/$ARCH-build +} + +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 -C $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 + cd $OLDPWD +} + +check() { + echo "The test must be on an OpenHarmony device!" +} + +# 清理环境 +cleanbuild(){ + rm -rf ${PWD}/$builddir #${PWD}/$packagename +} diff --git a/thirdparty/cJSON/README.OpenSource b/thirdparty/cJSON/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..68455900343b6d6b3387d3b5f848c3de148be865 --- /dev/null +++ b/thirdparty/cJSON/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "cJSON", + "License": " MIT license", + "License File": "LICENSE.txt", + "Version Number": "v1.7.15", + "Owner": "llh_01129@163.com", + "Upstream URL": "https://github.com/DaveGamble/cJSON/archive/refs/tags/v1.7.15.tar.gz", + "Description": "Ultralightweight JSON parser in ANSI C." + } +] diff --git a/thirdparty/cJSON/README_zh.md b/thirdparty/cJSON/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..43ecc83bc3fd7a3ec48f20b2087439df42c59cc7 --- /dev/null +++ b/thirdparty/cJSON/README_zh.md @@ -0,0 +1,12 @@ +# cJSON三方库说明 +## 功能简介 +cJSON是使用C语言编写，用来创建、解析JSON文件的库。cJSON特点就是工程文件简单，只有一个.c和一个.h，但提供函数接口功能齐全，麻雀虽小五脏俱全，使得在嵌入式工程中使用起来得心应手。 +## 使用约束 +- IDE版本：DevEco Studio 3.1 Beta2 +- SDK版本：ohos_sdk_public 3.2.11.9 (API Version 9 Release) +- 三方库版本：v1.7.15 +- 当前适配的功能：创建、解析JSON文件 +- [ MIT license](https://github.com/DaveGamble/cJSON) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/cJSON/SHA512SUM b/thirdparty/cJSON/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..1805a2a00dde669a5240f56cd61b0bb225bf748b --- /dev/null +++ b/thirdparty/cJSON/SHA512SUM @@ -0,0 +1 @@ +0b32a758c597fcc90c8ed0af493c9bccd611b9d4f9a03e87de3f7337bb9a28990b810befd44bc321a0cb42cbcd0b026d45761f9bab7bd798f920b7b6975fb124 cJSON-1.7.15.tar.gz \ No newline at end of file diff --git a/thirdparty/cJSON/docs/hap_integrate.md b/thirdparty/cJSON/docs/hap_integrate.md new file mode 100755 index 0000000000000000000000000000000000000000..7b568fdf46924fcd913396e074d4685feaa6697d --- /dev/null +++ b/thirdparty/cJSON/docs/hap_integrate.md @@ -0,0 +1,71 @@ +# cJSON集成到应用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/cJSON #三方库cJSON的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址，版本，license等信息 + ├── README_zh.md + ``` + +- 将cJSON拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/cJSON tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh cJSON + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录，该目录下存在已编译完成的32位和64位三方库 + + ``` + cJSON/arm64-v8a cJSON/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 +- 拷贝动态库到`\\entry\libs\${OHOS_ARCH}\`目录： + 动态库需要在`\\entry\libs\${OHOS_ARCH}\`目录，才能集成到hap包中，所以需要将对应的so文件拷贝到对应CPU架构的目录 +- 在IDE的cpp目录下新增thirdparty目录，将编译生成的库拷贝到该目录下，如下图所示 + ![thirdparty_install_dir](pic/cJSON_install_dir.png) +- 在最外层（cpp目录下）CMakeLists.txt中添加如下语句 + ``` + + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libcjson.so.1.7.15) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/cJSON/${OHOS_ARCH}/include/cjson) + + ``` + ![jbigkit_usage](pic/cJSON_usage.png) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试，[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +进入到构建目录执行ctest运行测试用例（arm64-v8a-build为构建64位的目录，armeabi-v7a-build为构建32位的目录） + + ![jbigkit_test](pic/cJSON_test.png) + +## 参考资料 +- [润和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/cJSON/docs/pic/cJSON_install_dir.png b/thirdparty/cJSON/docs/pic/cJSON_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..100116eae8179d2f4a4b57b7405e577af8348c75 Binary files /dev/null and b/thirdparty/cJSON/docs/pic/cJSON_install_dir.png differ diff --git a/thirdparty/cJSON/docs/pic/cJSON_test.png b/thirdparty/cJSON/docs/pic/cJSON_test.png new file mode 100644 index 0000000000000000000000000000000000000000..c129a8a737141c0801980d7975195de2c70158c4 Binary files /dev/null and b/thirdparty/cJSON/docs/pic/cJSON_test.png differ diff --git a/thirdparty/cJSON/docs/pic/cJSON_usage.png b/thirdparty/cJSON/docs/pic/cJSON_usage.png new file mode 100644 index 0000000000000000000000000000000000000000..2aab9f9734d7d9226f9af0063ba8dd0159d63f01 Binary files /dev/null and b/thirdparty/cJSON/docs/pic/cJSON_usage.png differ