diff --git a/thirdparty/minizip-ng/HPKBUILD b/thirdparty/minizip-ng/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..e69266c9bbac792443c3bde314dc95c4a4475d2f --- /dev/null +++ b/thirdparty/minizip-ng/HPKBUILD @@ -0,0 +1,48 @@ +# Contributor: lpzhong <278527840@qq.com> +# Maintainer: lpzhong <278527840@qq.com> +pkgname=minizip-ng +pkgver=4.0.0 +pkgrel=0 +pkgdesc="minizip-ng is a zip manipulation library written in C that is supported on Windows, macOS, and Linux." +url="https://github.com/zlib-ng/minizip-ng" +archs=("armeabi-v7a" "arm64-v8a") +license=("zlib") +depends=("openssl" "xz" "bzip2" "zstd" "googletest") +makedepends=() +source="https://github.com/zlib-ng/${pkgname}/archive/refs/tags/${pkgver}.tar.gz" + +autounpack=true +downloadpackage=true +buildtools="cmake" +builddir=$pkgname-$pkgver +packagename=$builddir.tar.gz + +prepare() { + mkdir -p $builddir/$ARCH-build +} + +build() { + cd $builddir + PKG_CONFIG_PATH="${pkgconfigpath}" cmake "$@" -DMZ_BUILD_TESTS=ON -DMZ_BUILD_UNIT_TESTS=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!" + # real test cmd + # ctest +} + +# 清理环境 +cleanbuild(){ + rm -rf ${PWD}/$builddir #${PWD}/$packagename +} diff --git a/thirdparty/minizip-ng/SHA512SUM b/thirdparty/minizip-ng/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..5fe2303a6c635bfeebf997ccf186ad3b1bc3fcc8 --- /dev/null +++ b/thirdparty/minizip-ng/SHA512SUM @@ -0,0 +1 @@ +be3a9e9580847d595abbd200ec89a97e38086cab5b34d3a4db1507247ed04f9209290945989b200225ea412ee0e37fb9f1947404d1631d2dfeb5c6dc55ce3d05 minizip-ng-4.0.0.tar.gz diff --git a/thirdparty/minizip-ng/docs/hap_integrate.md b/thirdparty/minizip-ng/docs/hap_integrate.md index a7eb4af16c49536ae2b4452895f2539e32f3480b..bd19443c78873af24cb7c56535b27b515aff2df5 100755 --- a/thirdparty/minizip-ng/docs/hap_integrate.md +++ b/thirdparty/minizip-ng/docs/hap_integrate.md @@ -1,112 +1,106 @@ -# minizip-ng 如何集成到应用hap +# minizip 集成到应用hap -## 准备应用工程 +本库是在RK3568开发板上基于OpenHarmony3.2 Release版本的镜像验证的，如果是从未使用过RK3568，可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 -本库是基于OpenHarmony SDK API Version 9版本，在润和RK3568开发板上验证的。如果是从未使用过RK3568，可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 +## 开发环境 -### 准备应用开发环境 +- ubuntu20.04 +- [OpenHarmony3.2.1Release镜像](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2.1%2Fdayu200_standard_arm32.tar.gz) +- [ohos_sdk_public 3.2.12.5](https://gitee.com/link?target=https%3A%2F%2Frepo.huaweicloud.com%2Fopenharmony%2Fos%2F3.2.1%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环境准备) -- IDE版本：DevEco Studio 3.0 Release -- SDK版本：OpenHarmony SDK -- API版本：API Version 9 +## 编译三方库 -应用环境准备具体可参照文档[通过IDE开发一个Napi工程](https://gitee.com/openharmony-sig/knowledge_demo_temp/blob/master/docs/napi_study/docs/hello_napi.md) +- 下载本仓库 -### 增加构建脚本及配置文件 + ```shell + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` -- 下载本仓库代码
- 通过[C/C++三方库TCP仓](https://gitee.com/openharmony-sig/tpc_c_cplusplus)下载本三方库代码并将其解压。 -- 仓库代码目录结构说明 +- 三方库目录结构 ```shell - tpc_c_cplusplus/thirdparty/minizip-ng - ├── docs # 存放三方库相关文档的文件夹 - ├── BUILD.gn # 构建脚本，支持rom包集成 - ├── bundle.json # 三方库组件定义文件 - ├── CMakeLists.txt # 构建脚本，支持hap包集成 - ├── README.OpenSource # 说明三方库源码的下载地址，版本，license等信息 - ├── README_zh.md # 三方库说明文档 + tpc_c_cplusplus/thirdparty/minizip-ng # 三方库minizip-ng的目录结构如下 + ├── docs # 三方库相关文档的文件夹 + ├── BUILD.gn # 构建脚本，支持rom包集成 + ├── bundle.json # 三方库组件定义文件 + ├── CMakeLists.txt # 构建脚本，支持hap包集成 + ├── HPKBUILD # 构建脚本,可生成北向应用调用的so文件 + ├── SHA512SUM # 三方库校验文件 + ├── README.OpenSource # 说明三方库源码的下载地址，版本，license等信息 + ├── README_zh.md ``` -- 将minizip-ng目录及其下面所有文件拷贝到工程的entry\src\main\cpp\third_party目录下。 +- 将minizip-ng拷贝至tools/main目录下 -### 准备三方库源码 + ```shell + cd tpc_c_cplusplus + cp thirdparty/minizip-ng tools/main -rf + ``` -- 准备三方库源码 - 通过[minizip-ng的github网站](https://github.com/zlib-ng/minizip-ng)下载3.0.4版本的源码包，并将源码包解压后拷贝到entry\src\main\cpp\third_party\minizip-ng目录，如下所示： +- 在tools目录下编译三方库 + + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) ```shell - minizip-ng - ├── docs # 存放三方库相关文档的文件夹 - ├── BUILD.gn # 构建脚本，支持rom包集成 - ├── bundle.json # 三方库组件定义文件 - ├── minizip-ng # 三方库minizip-ng源码目录 - ├── CMakeLists.txt # 构建脚本，支持hap包集成 - ├── README.OpenSource # 说明三方库源码的下载地址，版本，license等信息 - ├── README_zh.md + cd tools + ./build.sh minizip-ng ``` -- 准备依赖库 - minizip依赖了zstd，libiconv，lz4，xz，bzip2以及zlib等库，除了zlib是SDK中已有的，其他库都需要下载。 - - [libiconv适配文件](../../iconv/docs/rom_integrate.md): 参照文档下载适配代码，将整个iconv文件夹拷贝到/entry/src/main/cpp/third_party
- [libiconv源码](https://ftp.gnu.org/gnu/libiconv/libiconv-1.7.tar.gz):下载解压后改名为libiconv，并将该源码目录拷贝到iconv文件夹中 - - [zstd](https://github.com/facebook/zstd):下载v1.5.2版本，解压后并改为zstd - - [lz4](https://gitee.com/openharmony/third_party_lz4/repository/archive/master.zip):下载解压后并改名为lz4 - - [bzip2](https://gitee.com/openharmony/third_party_bzip2/repository/archive/master.zip):下载解压后并改名为bzip2 - - [xz适配文件](../../xz/docs/rom_integrate.md): 参照文档下载适配代码，将整个xz文件夹拷贝到/entry/src/main/cpp/third_party
- [xz源码](https://tukaani.org/xz/xz-5.2.6.tar.gz):下载解压后改名为libxz，并将该源码目录拷贝到xz文件夹中 - 所有依赖库都拷贝到/entry/src/main/cpp/third_party下. - -## 应用中使用三方库 +- 三方库头文件及生成的库 -- 应用中引入三方库，三方库目录如下: + 在tools目录下会生成usr目录，该目录下存在已编译完成的32位和64位三方库及其依赖库 ```shell - third_party - ├── minizip-ng # 三方库minizip-ng构建目录 - | ├── CMakeLists.txt # 构建脚本，支持hap包集成 - ├── zstd # 三方库minizip-ng的依赖库zstd源码目录 - ├── iconv # 三方库minizip-ng 的依赖库libiconv构建目录 - | ├── libiconv # libiconv源码目录 - | ├── adapter # libiconv适配代码目录 - ├── lz4 # 三方库minizip-ng的依赖库lz4源码目录 - ├── bzip2 # 三方库minizip-ng的依赖库bzip2源码目录 - ├── xz # 三方库minizip-ng的依赖库xz源码目录 + minizip-ng/arm64-v8a minizip-ng/armeabi-v7a + # 依赖库 + openssl/arm64-v8a openssl/armeabi-v7a xz/arm64-v8a xz/armeabi-v7a zstd/arm64-v8a zstd/armeabi-v7a bzip2/arm64-v8a bzip2/armeabi-v7a ``` -- 修改CMakeLists.txt文件 - 在工程的entry\src\main\cpp\CMakeLists.txt中做以下修改: +- [测试三方库](#测试三方库) - ```cmake - add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/minizip-ng) - add_library(entry SHARED minizipNapi.cpp minizip.cpp) - target_include_directories(entry PUBLIC thirdparty/minizip-ng/minizip-ng) - target_link_libraries(entry PUBLIC libace_napi.z.so minizip_shared) - ``` +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录，将编译生成的库拷贝到该目录下，如下图所示 + +  ![minizip_install_dir](pic/minizip_install_dir.png) + + 将对应的so拷贝到工程目录的对应架构的libs目录下: -- 应用中导入对应的库文件 +  ![minizip_install_libs](pic/minizip_install_libs.png) - ```js - import minizip from "libentry.so" +- 在最外层（cpp目录下）CMakeLists.txt中添加如下语句 + + ```shell + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libminizip.so.4 + ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libssl.so.1.1 + ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libcrypto.so.1.1 + ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/liblzma.so.5 + ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libzstd.so.1 + ${CMAKE_SOURCE_DIR}/../../../libs/${OHOS_ARCH}/libminizip.so.4) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/minizip-ng/${OHOS_ARCH}/include + ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/openssl/${OHOS_ARCH}/include + ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/xz/${OHOS_ARCH}/include + ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zstd/${OHOS_ARCH}/include) ``` -- 完整demo参考： - [minizip三方库测试源码](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/FA/thirdparty/minizip_demo) + ![minizip_usage](pic/minizip_usage.png) -## 编译工程 +## 测试三方库 -- 连接上设备后，DevEco Studio就会显示被发现设备。然后，点击“运行”，即可依次完成该应用“编译”和“安装”的过程，如图： -  ![install](pic/install.png) +三方库的测试使用原库自带的测试用例来做测试，[准备三方库测试环境](../../../tools/README.md#ci环境准备) -## 运行效果 +进入到构建目录执行`ctest`运行测试用例（arm64-v8a-build为构建64位的目录，armeabi-v7a-build为构建32位的目录） -安装hap应用后，在ets界面依次完成：压缩文件、解压缩文件、生成带密码和带全路径的压缩文件、解压带密码和带全路径的压缩文件操作后的结果，如下图：
- ![ets_results](pic/ets_results.png) + ![minizip_test](pic/minizip_test.png) ## 参考资料 - [润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld) -- [通过IDE开发一个Napi工程](https://gitee.com/openharmony-sig/knowledge_demo_temp/blob/master/docs/napi_study/docs/hello_napi.md) -- [minizip三方库测试源码](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/thirdparty/minizip_demo) +- [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/minizip-ng/docs/hap_integrate.old.md b/thirdparty/minizip-ng/docs/hap_integrate.old.md new file mode 100755 index 0000000000000000000000000000000000000000..a4f6b08b1ef02b5f88f69ffc4d29c742d503c97c --- /dev/null +++ b/thirdparty/minizip-ng/docs/hap_integrate.old.md @@ -0,0 +1,112 @@ +# minizip-ng 如何集成到应用hap + +## 准备应用工程 + +本库是基于OpenHarmony SDK API Version 9版本，在润和RK3568开发板上验证的。如果是从未使用过RK3568，可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 + +### 准备应用开发环境 + +- IDE版本：DevEco Studio 3.0 Release +- SDK版本：OpenHarmony SDK +- API版本：API Version 9 + +应用环境准备具体可参照文档[通过IDE开发一个Napi工程](https://gitee.com/openharmony-sig/knowledge_demo_temp/blob/master/docs/napi_study/docs/hello_napi.md) + +### 增加构建脚本及配置文件 + +- 下载本仓库代码
+ 通过[C/C++三方库TCP仓](https://gitee.com/openharmony-sig/tpc_c_cplusplus)下载本三方库代码并将其解压。 +- 仓库代码目录结构说明 + + ```shell + tpc_c_cplusplus/thirdparty/minizip-ng + ├── docs # 存放三方库相关文档的文件夹 + ├── BUILD.gn # 构建脚本，支持rom包集成 + ├── bundle.json # 三方库组件定义文件 + ├── CMakeLists.txt # 构建脚本，支持hap包集成 + ├── README.OpenSource # 说明三方库源码的下载地址，版本，license等信息 + ├── README_zh.md # 三方库说明文档 + ``` + +- 将minizip-ng目录及其下面所有文件拷贝到工程的entry\src\main\cpp\third_party目录下。 + +### 准备三方库源码 + +- 准备三方库源码 + 通过[minizip-ng的github网站](https://github.com/zlib-ng/minizip-ng)下载3.0.4版本的源码包，并将源码包解压后拷贝到entry\src\main\cpp\third_party\minizip-ng目录，如下所示： + + ```shell + minizip-ng + ├── docs # 存放三方库相关文档的文件夹 + ├── BUILD.gn # 构建脚本，支持rom包集成 + ├── bundle.json # 三方库组件定义文件 + ├── minizip-ng # 三方库minizip-ng源码目录 + ├── CMakeLists.txt # 构建脚本，支持hap包集成 + ├── README.OpenSource # 说明三方库源码的下载地址，版本，license等信息 + ├── README_zh.md + ``` + +- 准备依赖库 + minizip依赖了zstd，libiconv，lz4，xz，bzip2以及zlib等库，除了zlib是SDK中已有的，其他库都需要下载。 + - [libiconv适配文件](../../iconv/docs/rom_integrate.md): 参照文档下载适配代码，将整个iconv文件夹拷贝到/entry/src/main/cpp/third_party
+ [libiconv源码](https://ftp.gnu.org/gnu/libiconv/libiconv-1.7.tar.gz):下载解压后改名为libiconv，并将该源码目录拷贝到iconv文件夹中 + - [zstd](https://github.com/facebook/zstd):下载v1.5.2版本，解压后并改为zstd + - [lz4](https://gitee.com/openharmony/third_party_lz4/repository/archive/master.zip):下载解压后并改名为lz4 + - [bzip2](https://gitee.com/openharmony/third_party_bzip2/repository/archive/master.zip):下载解压后并改名为bzip2 + - [xz适配文件](../../xz/docs/rom_integrate.md): 参照文档下载适配代码，将整个xz文件夹拷贝到/entry/src/main/cpp/third_party
+ [xz源码](https://tukaani.org/xz/xz-5.2.6.tar.gz):下载解压后改名为libxz，并将该源码目录拷贝到xz文件夹中 + 所有依赖库都拷贝到/entry/src/main/cpp/third_party下. + +## 应用中使用三方库 + +- 应用中引入三方库，三方库目录如下: + + ```shell + third_party + ├── minizip-ng # 三方库minizip-ng构建目录 + | ├── CMakeLists.txt # 构建脚本，支持hap包集成 + ├── zstd # 三方库minizip-ng的依赖库zstd源码目录 + ├── iconv # 三方库minizip-ng 的依赖库libiconv构建目录 + | ├── libiconv # libiconv源码目录 + | ├── adapter # libiconv适配代码目录 + ├── lz4 # 三方库minizip-ng的依赖库lz4源码目录 + ├── bzip2 # 三方库minizip-ng的依赖库bzip2源码目录 + ├── xz # 三方库minizip-ng的依赖库xz源码目录 + ``` + +- 修改CMakeLists.txt文件 + 在工程的entry\src\main\cpp\CMakeLists.txt中做以下修改: + + ```cmake + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/minizip-ng) + add_library(entry SHARED minizipNapi.cpp minizip.cpp) + target_include_directories(entry PUBLIC thirdparty/minizip-ng/minizip-ng) + target_link_libraries(entry PUBLIC libace_napi.z.so minizip_shared) + ``` + +- 应用中导入对应的库文件 + + ```js + import minizip from "libentry.so" + ``` + +- 完整demo参考： + [minizip三方库测试源码](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/FA/thirdparty/minizip_demo) + +## 编译工程 + +- 连接上设备后，DevEco Studio就会显示被发现设备。然后，点击“运行”，即可依次完成该应用“编译”和“安装”的过程，如图： +  ![install](pic/install.png) + +## 运行效果 + +安装hap应用后，在ets界面依次完成：压缩文件、解压缩文件、生成带密码和带全路径的压缩文件、解压带密码和带全路径的压缩文件操作后的结果，如下图：
+ ![ets_results](pic/ets_results.png) + +## 参考资料 + +- [润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld) +- [通过IDE开发一个Napi工程](https://gitee.com/openharmony-sig/knowledge_demo_temp/blob/master/docs/napi_study/docs/hello_napi.md) +- [minizip三方库测试源码](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/FA/thirdparty/minizip_demo) +- [OpenHarmony知识体系](https://gitee.com/openharmony-sig/knowledge) + diff --git a/thirdparty/minizip-ng/docs/pic/minizip_install_dir.png b/thirdparty/minizip-ng/docs/pic/minizip_install_dir.png new file mode 100755 index 0000000000000000000000000000000000000000..e2691cda67f6d23ed4fb72b241510dbe446aee16 Binary files /dev/null and b/thirdparty/minizip-ng/docs/pic/minizip_install_dir.png differ diff --git a/thirdparty/minizip-ng/docs/pic/minizip_install_libs.png b/thirdparty/minizip-ng/docs/pic/minizip_install_libs.png new file mode 100755 index 0000000000000000000000000000000000000000..53be7f2a9c5a7e03c663fbcfcdf5c1b59ed912dd Binary files /dev/null and b/thirdparty/minizip-ng/docs/pic/minizip_install_libs.png differ diff --git a/thirdparty/minizip-ng/docs/pic/minizip_test.png b/thirdparty/minizip-ng/docs/pic/minizip_test.png new file mode 100755 index 0000000000000000000000000000000000000000..9b76b6f7f6eb3bffdf57567d2b93b251846a28ac Binary files /dev/null and b/thirdparty/minizip-ng/docs/pic/minizip_test.png differ diff --git a/thirdparty/minizip-ng/docs/pic/minizip_usage.png b/thirdparty/minizip-ng/docs/pic/minizip_usage.png new file mode 100755 index 0000000000000000000000000000000000000000..382a32dc326cb6137f451545c36ac0e64f1f6c0c Binary files /dev/null and b/thirdparty/minizip-ng/docs/pic/minizip_usage.png differ