diff --git a/thirdparty/xz/HPKBUILD b/thirdparty/xz/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..c24e7430541e7c5c6b0040c85999f0bc56711230 --- /dev/null +++ b/thirdparty/xz/HPKBUILD @@ -0,0 +1,50 @@ +# Contributor: Jeff Han +# Maintainer: Jeff Han +pkgname=xz +pkgver=5.4.1 +pkgrel=0 +pkgdesc="" +url="" +archs=("armeabi-v7a" "arm64-v8a") +license=("public domain" "LGPLv2.1" "GPLv2" "GPLv3") +depends=() +makedepends=() + +source="https://tukaani.org/$pkgname/$pkgname-$pkgver.tar.gz" + +autounpack=true +downloadpackage=true + +builddir=$pkgname-${pkgver} +packagename=$builddir.tar.gz + +prepare() { + mkdir -p $builddir/$ARCH-build + cd "$builddir" + + cd $OLDPWD # 1> /dev/null +} + +build() { + cd $builddir + ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -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/xz/README_zh.md b/thirdparty/xz/README_zh.md index 63b9c2e81177b92054f9486d5f21645a28d4ab05..99509dd9edff205522b40c21f07234f0d8dae817 100644 --- a/thirdparty/xz/README_zh.md +++ b/thirdparty/xz/README_zh.md @@ -14,3 +14,4 @@ XZ 是免费的通用数据压缩软件，具有较高的压缩比。 ## 集成方式 - [系统Rom包集成](docs/rom_integrate.md) +- [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/xz/SHA512SUM b/thirdparty/xz/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..5230a147f834db98dc5f2a07df402d4c34f1c0b8 --- /dev/null +++ b/thirdparty/xz/SHA512SUM @@ -0,0 +1 @@ +5cff8383a68fb88ecbb3770ec48af0ad5582e08de9dccd339e0b685aaa53447e59d6425caa3f63b54a674e5d78c20520876db547d156e6658ad4841660cba85b xz-5.4.1.tar.gz \ No newline at end of file diff --git a/thirdparty/xz/docs/hap_integrate.md b/thirdparty/xz/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..b5e12691247a2b709d4992b2cefb047c9f12c63e --- /dev/null +++ b/thirdparty/xz/docs/hap_integrate.md @@ -0,0 +1,73 @@ +# xz集成到应用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/xz #三方库xz的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── BUILD.gn #gn文件 + ├── bundle.json + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址，版本，license等信息 + ├── README_zh.md + ``` + +- 将openssl拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/xz tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh xz + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录，该目录下存在已编译完成的32位和64位三方库 + + ``` + xz/arm64-v8a xz/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 拷贝动态库到`\\entry\libs\${OHOS_ARCH}\`目录： + 动态库需要在`\\entry\libs\${OHOS_ARCH}\`目录，才能集成到hap包中，所以需要将对应的so文件拷贝到对应CPU架构的目录 +- 在IDE的cpp目录下新增thirdparty目录，将编译生成的库拷贝到该目录下，如下图所示 + ![xz_install_dir](pic/xz_install_dir.png) +- 在最外层（cpp目录下）CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/liblzma.so.5.4.1) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/xz/${OHOS_ARCH}/include) ``` + ``` + ![xz_usage](pic/xz_usage.png) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试，[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +进入到构建目录执行 ctest 运行测试用例（arm64-v8a-build为构建64位的目录，armeabi-v7a-build为构建32位的目录） + +![xz_test](pic/xz_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/xz/docs/pic/xz_install_dir.png b/thirdparty/xz/docs/pic/xz_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..a6836746a62471a77e55fc221b42f22a82811dcf Binary files /dev/null and b/thirdparty/xz/docs/pic/xz_install_dir.png differ diff --git a/thirdparty/xz/docs/pic/xz_test.png b/thirdparty/xz/docs/pic/xz_test.png new file mode 100644 index 0000000000000000000000000000000000000000..2dc217188833a3c1bfffc31f5bcd3c6c2907369b Binary files /dev/null and b/thirdparty/xz/docs/pic/xz_test.png differ diff --git a/thirdparty/xz/docs/pic/xz_usage.png b/thirdparty/xz/docs/pic/xz_usage.png new file mode 100644 index 0000000000000000000000000000000000000000..4585b5c46191237c67e23dfa28b812b5dca318af Binary files /dev/null and b/thirdparty/xz/docs/pic/xz_usage.png differ