diff --git a/thirdparty/libzip/HPKBUILD b/thirdparty/libzip/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..bc59b7240610d2c2ff4dfffbccfaa10ded5872e8 --- /dev/null +++ b/thirdparty/libzip/HPKBUILD @@ -0,0 +1,56 @@ +# Contributor: Jeff Han +# Maintainer: Jeff Han +pkgname=libzip +pkgver=v1.9.2 +pkgrel=0 +pkgdesc="" +url="" +archs=("armeabi-v7a" "arm64-v8a") +license="BSD" +depends=("xz" "zstd" "openssl" "bzip2") +makedepends=() + +source="https://github.com/nih-at/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +autounpack=true +patchflag=true +downloadpackage=true + +builddir=$pkgname-${pkgver:1} +packagename=$builddir.tar.gz + +prepare() { + if $patchflag + then + cd $builddir + patch -p1 < `pwd`/../libzip_oh_pkg.patch + # patch只需要打一次,关闭打patch + patchflag=false + cd $OLDPWD + fi + 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/libzip/README.OpenSource b/thirdparty/libzip/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..41619a51256c4d06bdbd09793a0f9d4c8d506543 --- /dev/null +++ b/thirdparty/libzip/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "libzip", + "License": "BSD license", + "License File": "LICENSE", + "Version Number": "v1.9.2", + "Owner": "qinjianqi@huawei.com", + "Upstream URL": "https://github.com/nih-at/libzip.git", + "Description": "This is libzip, a C library for reading, creating, and modifying zip and zip64 archives." + } +] diff --git a/thirdparty/libzip/README_zh.md b/thirdparty/libzip/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..b311effe6cd43d7adc2e5a498cdbf96c94c704b1 --- /dev/null +++ b/thirdparty/libzip/README_zh.md @@ -0,0 +1,13 @@ +# libzip三方库说明 +## 功能简介 +libzip是一个用于读取、创建和修改zip存档的C库。文件可以从数据缓冲区、文件或直接从其他zip档案复制的压缩数据中添加。 + +## 使用约束 +- IDE版本:DevEco Studio 3.1 Beta2 +- SDK版本:ohos_sdk_public 3.2.11.9 (API Version 9 Release) +- 三方库版本:1.9.2 +- 当前适配的功能:读取、创建和修改zip存档功能 +- [BSD License](https://github.com/nih-at/libzip/blob/main/LICENSE) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/libzip/SHA512SUM b/thirdparty/libzip/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..707780ad9f313c408ebd94a7f293bcc746e40e32 --- /dev/null +++ b/thirdparty/libzip/SHA512SUM @@ -0,0 +1,2 @@ +a82cc4adb0ad0823a5baf61eb88751cdf111f1e2f6c5df9ec6f6b882624d7cfe5f4694435877eeab44f18abcf0d057f1e8c60a97c5327cc90ae3608ed84ecc7e libzip-1.9.2.tar.gz +5ffc5657f2a7090d6eda03474e8f9e8af7024d53e3c290eedfaee1f29ec6b1490a537972b88e71d7c38099be03d86a1504a5669f231396158ba09fd9d509e3fd libzip_oh_pkg.patch diff --git a/thirdparty/libzip/docs/hap_integrate.md b/thirdparty/libzip/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..923f7ffe7f4d6389b8ffa5e714086bb37e006300 --- /dev/null +++ b/thirdparty/libzip/docs/hap_integrate.md @@ -0,0 +1,87 @@ +# libzip集成到应用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/libzip #三方库libzip的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── libzip_oh_pkg.patch #补丁 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 将libzip拷贝至tools/main目录下 + ``` + cd tpc_c_cplusplus + cp thirdparty/libzip tools/main -rf + cp thirdparty/bzip2 tools/main -rf + cp thirdparty/openssl tools/main -rf + cp thirdparty/xz tools/main -rf + cp thirdparty/zstd tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh libzip xz zstd openssl bzip2 + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + ``` + libzip/arm64-v8a libzip/armeabi-v7a + xz/arm64-v8a xz/armeabi-v7a + zstd/arm64-v8a zstd/armeabi-v7a + openssl/arm64-v8a openssl/armeabi-v7a + bzip2/arm64-v8a bzip2/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 拷贝动态库到`\\entry\libs\${OHOS_ARCH}\`目录: + 动态库需要在`\\entry\libs\${OHOS_ARCH}\`目录,才能集成到hap包中,所以需要将对应的so文件拷贝到对应CPU架构的目录 +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 +  ![libzip_install_dir](pic/libzip_install_dir.png) +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libzip.so.5.5) + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libcrypto.so.1.1) + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/liblzma.so.5.4.1) + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libzstd.so) + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/bzip2/${OHOS_ARCH}/lib/libbz2.a) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/libzip/${OHOS_ARCH}/include) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/${OHOS_ARCH}/include) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/xz/${OHOS_ARCH}/include) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/bzip2/${OHOS_ARCH}/include) + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zstd/${OHOS_ARCH}/include) + ``` + ![libzip_usage](pic/libzip_usage.png) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试,需要使用到perl工具,[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +进入到构建目录执行ctest运行测试用例(arm64-v8a-build为构建64位的目录,armeabi-v7a-build为构建32位的目录) + + ![libzip_test](pic/libzip_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/libzip/docs/pic/libzip_install_dir.png b/thirdparty/libzip/docs/pic/libzip_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..40f4d76e49acba9e4773fbc6d04d8032d788294f Binary files /dev/null and b/thirdparty/libzip/docs/pic/libzip_install_dir.png differ diff --git a/thirdparty/libzip/docs/pic/libzip_test.png b/thirdparty/libzip/docs/pic/libzip_test.png new file mode 100644 index 0000000000000000000000000000000000000000..b2f7a5631c0270c2b1173d656ee0bfa60fb95bdb Binary files /dev/null and b/thirdparty/libzip/docs/pic/libzip_test.png differ diff --git a/thirdparty/libzip/docs/pic/libzip_usage.png b/thirdparty/libzip/docs/pic/libzip_usage.png new file mode 100644 index 0000000000000000000000000000000000000000..b42dff2d806f0b8fe3ab3a5dbc2185573ba65049 Binary files /dev/null and b/thirdparty/libzip/docs/pic/libzip_usage.png differ diff --git a/thirdparty/libzip/libzip_oh_pkg.patch b/thirdparty/libzip/libzip_oh_pkg.patch new file mode 100644 index 0000000000000000000000000000000000000000..95a420a044fb2beb0dc120d488ac711d806bf738 --- /dev/null +++ b/thirdparty/libzip/libzip_oh_pkg.patch @@ -0,0 +1,12 @@ +diff -rupN libzip-1.9.2/CMakeLists.txt libzip/CMakeLists.txt +--- libzip-1.9.2/CMakeLists.txt 2022-06-28 14:17:12.000000000 +0000 ++++ libzip/CMakeLists.txt 2023-03-20 01:25:30.923371971 +0000 +@@ -238,7 +238,7 @@ if(WIN32) + endif(WIN32) + + # rpath handling: use rpath in installed binaries +-if(NOT CMAKE_SYSTEM_NAME MATCHES Linux) ++if((NOT CMAKE_SYSTEM_NAME MATCHES Linux) AND (NOT CMAKE_SYSTEM_NAME MATCHES OHOS)) + set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) + endif()