diff --git a/thirdparty/zstd/HPKBUILD b/thirdparty/zstd/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..71eef3bca7760de1590f787bc94a32f47a7ab4b2 --- /dev/null +++ b/thirdparty/zstd/HPKBUILD @@ -0,0 +1,54 @@ +# Contributor: Jeff Han +# Maintainer: Jeff Han +pkgname=zstd +pkgver=v1.5.4 +pkgrel=0 +pkgdesc="" +url="" +archs=("armeabi-v7a" "arm64-v8a") +license=("MIT") +depends=() +makedepends=() + +source="https://github.com/facebook/$pkgname/releases/download/$pkgver/$pkgname-1.5.4.tar.gz" + +autounpack=true +downloadpackage=true + +builddir=$pkgname-${pkgver:1} +packagename=$builddir.tar.gz + +prepare() { + mkdir -p $builddir/$ARCH-build + cd "$builddir" + + cd $OLDPWD # 1> /dev/null +} + +build() { + cd $builddir + # fix this OHOS_SDK 中的cmake版本过低,无法识别zstd项目中使用的cmake函数,因此替换为系统安装的cmake + # 此方法编译的zstd没有soname和软连接,被其他项目依赖时,将全路径依赖 + # 规避上面问题的方法添加OHOS系统识别到开发机的cmake目录,具体具体如下 + # cp $OHOS_SDK/native/build-tools/cmake/share/cmake-3.16/Modules/Platform/OHOS.cmake xxx(代表你开发机安装的cmake的路径)/cmake-3.26.3-linux-x86_64/share/cmake-3.26/Modules/Platform + cmake "$@" -DOHOS_ARCH=$ARCH -B$ARCH-build -S./build/cmake -DZSTD_BUILD_TESTS=ON -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/zstd/README_zh.md b/thirdparty/zstd/README_zh.md index 87a7a870cb97b4918401d396354a812af3a319fa..5aeeb5cd9fe1086f4c8559dc0c9b7c8686881d21 100644 --- a/thirdparty/zstd/README_zh.md +++ b/thirdparty/zstd/README_zh.md @@ -7,4 +7,5 @@ zstd 是一种快速的无损压缩算法,是针对 zlib 级别的实时压缩 - 当前适配的功能:完成了生成和解码 .zst 格式以及字典压缩、解压缩 - [License : BSD and GPLv2](https://github.com/facebook/zstd/tree/zstd-0.4.2) ## 集成方式 -+ [系统Rom包集成](docs/rom_integrate.md) \ No newline at end of file ++ [系统Rom包集成](docs/rom_integrate.md) ++ [应用hap包集成](docs/hap_integrate.md) \ No newline at end of file diff --git a/thirdparty/zstd/SHA512SUM b/thirdparty/zstd/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..d55130a14ebdbb9f2dfc1dd8d7325a2b391e85dc --- /dev/null +++ b/thirdparty/zstd/SHA512SUM @@ -0,0 +1 @@ +2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394 zstd-1.5.4.tar.gz \ No newline at end of file diff --git a/thirdparty/zstd/docs/hap_integrate.md b/thirdparty/zstd/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..69d8f7d82cc7b04526f716f7bb07b982ffaab3fb --- /dev/null +++ b/thirdparty/zstd/docs/hap_integrate.md @@ -0,0 +1,71 @@ +# zstd集成到应用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/zstd #三方库zstd的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── BUILD.gn #gn文件 + ├── bundle.json + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 将openssl拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/zstd tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh zstd + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + + ``` + zstd/arm64-v8a zstd/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 + ![zstd_install_dir](pic/zstd_install_dir.png) +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zstd/${OHOS_ARCH}/lib/libzstd.a) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zstd/${OHOS_ARCH}/include) + ``` + ![zstd_usage](pic/zstd_usage.png) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试,[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +进入到构建目录执行 ctest 运行测试用例(arm64-v8a-build为构建64位的目录,armeabi-v7a-build为构建32位的目录) + +![zstd_test](pic/zstd_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/zstd/docs/pic/zstd_install_dir.png b/thirdparty/zstd/docs/pic/zstd_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..4c88893faf448adea166a47de4133c8ea22aaa85 Binary files /dev/null and b/thirdparty/zstd/docs/pic/zstd_install_dir.png differ diff --git a/thirdparty/zstd/docs/pic/zstd_test.png b/thirdparty/zstd/docs/pic/zstd_test.png new file mode 100644 index 0000000000000000000000000000000000000000..7eb5ec7bd259d5321d2ecc320b0f17659769caf5 Binary files /dev/null and b/thirdparty/zstd/docs/pic/zstd_test.png differ diff --git a/thirdparty/zstd/docs/pic/zstd_usage.png b/thirdparty/zstd/docs/pic/zstd_usage.png new file mode 100644 index 0000000000000000000000000000000000000000..2650405012fda68e4683151c939b7a72c8839698 Binary files /dev/null and b/thirdparty/zstd/docs/pic/zstd_usage.png differ