diff --git a/thirdparty/avro_release_1_11_3/HPKBUILD b/thirdparty/avro_release_1_11_3/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..2d4f653489ffe28eb1e880481602492814e4d5b9 --- /dev/null +++ b/thirdparty/avro_release_1_11_3/HPKBUILD @@ -0,0 +1,71 @@ +# Contributor: 小肉头君 +# Maintainer: 小肉头君 + +pkgname=avro_release_1_11_3 +pkgver=release-1.11.3 +pkgrel=0 +pkgdesc="Apache Avro is a data serialization system." +url="https://github.com/apache/avro" +archs=("armeabi-v7a" "arm64-v8a") +license=("Apache-2.0 license") +depends=("jansson") +makedepends=() +source="https://github.com/apache/${pkgname:0:4}/archive/refs/tags/$pkgver.tar.gz" + +autounpack=true +downloadpackage=true +patchflag=true + +builddir=${pkgname:0:4}-$pkgver +packagename=$builddir.tar.gz + +prepare() { + if $patchflag + then + cd $builddir + # 运行ctest时,会再去触发cmake去复制一份文件,这样会导致在设备上测试不通过 + # 并且测试套件已经在所在目录,所以打patch去掉cmake操作 + patch -p1 < `pwd`/../avro_oh_pkg.patch + # patch只需要打一次,关闭打patch + patchflag=false + cd $OLDPWD + fi + mkdir -p $builddir/$ARCH-build +} + +build() { + cd $builddir + # 编译avro c的版本 + PKG_CONFIG_PATH="${pkgconfigpath}" ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DOHOS_ARCH=$ARCH -B$ARCH-build -Slang/c -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() { + cd $builddir + cp -rf lang/c/tests/schema_tests $ARCH-build/tests + cp lang/c/tests/avro-1237-bad-union-discriminant.avro $ARCH-build/tests + cp lang/c/tests/avro-1237-good.avro $ARCH-build/tests + cp lang/c/tests/avro-1238-good.avro $ARCH-build/tests + cp lang/c/tests/avro-1238-truncated.avro $ARCH-build/tests + cp lang/c/tests/avro-1279-codec.avro $ARCH-build/tests + cp lang/c/tests/avro-1279-no-codec.avro $ARCH-build/tests + cd $OLDPWD + echo "The test must be on an OpenHarmony device!" + # real test + # ctest +} + +# 清理环境 +cleanbuild(){ + rm -rf ${PWD}/$builddir #${PWD}/$packagename +} \ No newline at end of file diff --git a/thirdparty/avro_release_1_11_3/OAT.xml b/thirdparty/avro_release_1_11_3/OAT.xml new file mode 100644 index 0000000000000000000000000000000000000000..96937ea08644b79312d0ced7c0b3eb1e845108ee --- /dev/null +++ b/thirdparty/avro_release_1_11_3/OAT.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/thirdparty/avro_release_1_11_3/README.OpenSource b/thirdparty/avro_release_1_11_3/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..1dbda3d298e542c374ccf89044b55174ba85646b --- /dev/null +++ b/thirdparty/avro_release_1_11_3/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "avro", + "License": "Apache-2.0 license", + "License File": "LICENSES", + "Version Number": "1.11.3", + "Owner": "chenbaodi@huawei.com", + "Upstream URL": "https://github.com/apache/avro/archive/refs/tags/release-1.11.3.tar.gz", + "Description": "Apache Avro is a data serialization system." + } +] \ No newline at end of file diff --git a/thirdparty/avro_release_1_11_3/README_zh.md b/thirdparty/avro_release_1_11_3/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..1b50994e22ea950505f45747f1aca692822efd8f --- /dev/null +++ b/thirdparty/avro_release_1_11_3/README_zh.md @@ -0,0 +1,11 @@ +# avro三方库说明 +## 功能简介 +avro是指数据序列化的系统,有丰富的数据结构类型、快速可压缩的二进制数据形式。 +## 使用约束 +- IDE版本:DevEco Studio 3.1 Release +- SDK版本:ohos_sdk_public 4.0.8.1 (API Version 10 Release) +- 三方库版本:release-1.11.3 +- 当前适配的功能:提供数据的序列化框架 + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) \ No newline at end of file diff --git a/thirdparty/avro_release_1_11_3/SHA512SUM b/thirdparty/avro_release_1_11_3/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..097ba7f82f61c95cbce04278aeb8103ae7d6eb37 --- /dev/null +++ b/thirdparty/avro_release_1_11_3/SHA512SUM @@ -0,0 +1 @@ +728609f562460e1115366663ede2c5d4acbdd6950c1ee3e434ffc65d28b72e3a43c3ebce93d0a8459f0c4f6c492ebb9444e2127a0385f38eb7cdf74b28f0c3ed avro-release-1.11.3.tar.gz diff --git a/thirdparty/avro_release_1_11_3/avro_oh_pkg.patch b/thirdparty/avro_release_1_11_3/avro_oh_pkg.patch new file mode 100644 index 0000000000000000000000000000000000000000..a59a36f9f9c901c91dc555bd926ca581812e4784 --- /dev/null +++ b/thirdparty/avro_release_1_11_3/avro_oh_pkg.patch @@ -0,0 +1,21 @@ +diff -Naur avro-release-1.11.1_old/lang/c/examples/CMakeLists.txt avro-release-1.11.1/lang/c/examples/CMakeLists.txt +--- avro-release-1.11.1_old/lang/c/examples/CMakeLists.txt 2023-06-08 10:46:03.120338183 +0800 ++++ avro-release-1.11.1/lang/c/examples/CMakeLists.txt 2023-06-08 10:52:34.003978909 +0800 +@@ -27,6 +27,5 @@ + endif (WIN32) + + add_test(quickstop +- ${CMAKE_COMMAND} -E chdir ${AvroC_SOURCE_DIR}/examples + ${exec_name} + ) +diff -Naur avro-release-1.11.1_old/lang/c/tests/CMakeLists.txt avro-release-1.11.1/lang/c/tests/CMakeLists.txt +--- avro-release-1.11.1_old/lang/c/tests/CMakeLists.txt 2023-06-08 10:46:03.124338242 +0800 ++++ avro-release-1.11.1/lang/c/tests/CMakeLists.txt 2023-06-08 10:52:23.643924713 +0800 +@@ -35,7 +35,6 @@ + endif (WIN32) + + add_test(${name} +- ${CMAKE_COMMAND} -E chdir ${AvroC_SOURCE_DIR}/tests + ${exec_name} + ) + endmacro(add_avro_test) \ No newline at end of file diff --git a/thirdparty/avro_release_1_11_3/docs/hap_integrate.md b/thirdparty/avro_release_1_11_3/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..d23c4e7446a3f3f3968d2ecd9d212b1ae1092817 --- /dev/null +++ b/thirdparty/avro_release_1_11_3/docs/hap_integrate.md @@ -0,0 +1,91 @@ +# avro_release_1_11_3集成到应用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 4.0.8.1 (API Version 10 Release)](http://download.ci.openharmony.cn/version/Master_Version/OpenHarmony_4.0.8.1/20230608_091016/version-Master_Version-OpenHarmony_4.0.8.1-20230608_091016-ohos-sdk-full.tar.gz) +- [DevEco Studio 3.1 Release](https://contentcenter-vali-drcn.dbankcdn.cn/pvt_2/DeveloperAlliance_package_901_9/81/v3/tgRUB84wR72nTfE8Ir_xMw/devecostudio-windows-3.1.0.501.zip?HW-CC-KV=V1&HW-CC-Date=20230621T074329Z&HW-CC-Expire=315360000&HW-CC-Sign=22F6787DF6093ECB4D4E08F9379B114280E1F65DA710599E48EA38CB24F3DBF2) +- [准备三方库构建环境](../../../lycium/README.md#1编译环境准备) +- [准备三方库测试环境](../../../lycium/README.md#3ci环境准备) + +## 编译三方库 + +- 下载本仓库 + + ```shell + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` + +- 三方库目录结构 + + ```shell + tpc_c_cplusplus/thirdparty/avro_release_1_11_3 #三方库avro_release_1_11_3的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 在lycium目录下编译三方库 + + 编译环境的搭建参考[准备三方库构建环境](../../../lycium/README.md#1编译环境准备) + + ```shell + cd lycium + ./build.sh avro_release_1_11_3 + ``` + +- 三方库头文件及生成的库 + + 在lycium目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + + ```shell + avro_release_1_11_3/arm64-v8a avro_release_1_11_3/armeabi-v7a + ``` +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示: + +  ![thirdparty_install_dir](pic/avrocpp_install_dir.png) + +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + + ```shell + #将三方库加入工程中 + #使用c语言库 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/avro/${OHOS_ARCH}/lib/libavro.so) + + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/avro/${OHOS_ARCH}/include) + + #将动态库打包到libs + file(GLOB allLibs "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/avro/${OHOS_ARCH}/lib/*.so*") + add_custom_command(TARGET entry POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy + ${allLibs} + ${CMAKE_CURRENT_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/) + ``` + 修改IDE的entry/build-profile.json5 文件,增加编译架构过滤:"abiFilters": ["armeabi-v7a", "arm64-v8a"], 如下图所示: + + ![avro_build](pic/avro_build.png) + +## 测试三方库 + +三方库的测试使用原库自带的测试用例来做测试,[准备三方库测试环境](../../../lycium/README.md#3ci环境准备) + +进入到构建目录,执行如下命令ctest(arm64-v8a-build为构建64位的目录,armeabi-v7a-build为构建32位的目录) + +![avro_test](pic/avro_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/avro_release_1_11_3/docs/pic/avro_build.png b/thirdparty/avro_release_1_11_3/docs/pic/avro_build.png new file mode 100644 index 0000000000000000000000000000000000000000..3a44fbf78c725c6d94bc99434b2eca64cf72b8a9 Binary files /dev/null and b/thirdparty/avro_release_1_11_3/docs/pic/avro_build.png differ diff --git a/thirdparty/avro_release_1_11_3/docs/pic/avro_test.png b/thirdparty/avro_release_1_11_3/docs/pic/avro_test.png new file mode 100644 index 0000000000000000000000000000000000000000..36c3c0017e7e238732748eb0d84f69598bc5d601 Binary files /dev/null and b/thirdparty/avro_release_1_11_3/docs/pic/avro_test.png differ diff --git a/thirdparty/avro_release_1_11_3/docs/pic/avrocpp_install_dir.png b/thirdparty/avro_release_1_11_3/docs/pic/avrocpp_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..59112257e1c7a4ed211eb64a6e5b68dc741731bf Binary files /dev/null and b/thirdparty/avro_release_1_11_3/docs/pic/avrocpp_install_dir.png differ