diff --git a/thirdparty/pupnp/HPKBUILD b/thirdparty/pupnp/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..8d6b8b984b050bf6832bd790bb8f1de6ee3daa6b --- /dev/null +++ b/thirdparty/pupnp/HPKBUILD @@ -0,0 +1,50 @@ +# Contributor: 小肉头君 +# Maintainer: 小肉头君 + +pkgname=pupnp +pkgver=release-1.14.16 +pkgrel=0 +pkgdesc="libupnp: Build UPnP-compliant control points, devices, and bridges on several operating systems." +url="https://github.com/pupnp/pupnp" +archs=("armeabi-v7a" "arm64-v8a") +license=("BSD-3-Clause license") +depends=() +makedepends=() +source="https://github.com/$pkgname/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +autounpack=true +downloadpackage=true +buildtools= + +builddir=$pkgname-$pkgver +packagename=$builddir.tar.gz + +prepare() { + 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!" + # real test,需要连接网络 + # ctest +} + +# 清理环境 +cleanbuild(){ + rm -rf ${PWD}/$builddir #${PWD}/$packagename +} \ No newline at end of file diff --git a/thirdparty/pupnp/README.OpenSource b/thirdparty/pupnp/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..d13825303b8a1ee583d89852c6c2c340bba6b568 --- /dev/null +++ b/thirdparty/pupnp/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "pupnp", + "License": "BSD-3-Clause license", + "License File": "LICENSES", + "Version Number": "release-1.14.16", + "Owner": "chenbaodi@huawei.com", + "Upstream URL": "https://github.com/pupnp/pupnp/archive/refs/tags/release-1.14.16.tar.gz", + "Description": "Build UPnP-compliant control points, devices, and bridges on several operating systems." + } +] diff --git a/thirdparty/pupnp/README_zh.md b/thirdparty/pupnp/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..9df3c8eb42274b31f7254a65d2e4a096e136c125 --- /dev/null +++ b/thirdparty/pupnp/README_zh.md @@ -0,0 +1,12 @@ +# pupnp三方库说明 +## 功能简介 +pupnp是提供UPnP协议能力的三方库。 +## 使用约束 +- IDE版本:DevEco Studio 3.1 Beta2 +- SDK版本:ohos_sdk_public 3.2.11.9 (API Version 9 Release) +- 三方库版本:v1.0.12 +- 当前适配的功能:支持Upnp协议能力 +- [LGPL-2.1 license](https://github.com/pupnp/pupnp/blob/branch-1.14.x/COPYING) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/pupnp/SHA512SUM b/thirdparty/pupnp/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..94ce05ffaf6a1c9c1ee96b3862fc4c18f3a57c83 --- /dev/null +++ b/thirdparty/pupnp/SHA512SUM @@ -0,0 +1 @@ +f02d72415ec4891e019724b5774aed2bd470d64ff1f6c179140a3e61bfb34794f0e6069d5f4baf0d8260aae09eab607a61575f02c4f853616180aec7f701abd3 pupnp-release-1.14.16.tar.gz \ No newline at end of file diff --git a/thirdparty/pupnp/docs/hap_integrate.md b/thirdparty/pupnp/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..568eb0b3dc08f3b9721b4444a99bc9c8dfafea67 --- /dev/null +++ b/thirdparty/pupnp/docs/hap_integrate.md @@ -0,0 +1,95 @@ +# pupnp 集成到应用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环境准备) + +## 编译三方库 + +- 下载本仓库 + + ```shell + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` + +- 三方库目录结构 + + ``` + tpc_c_cplusplus/thirdparty/pupnp #三方库pupnp的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 将pupnp拷贝至tools/main目录下 + + ``` + cd tpc_c_cplusplus + cp thirdparty/pupnp tools/main -rf + ``` + +- 在tools目录下编译三方库 + + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + + ``` + cd tools + ./build.sh pupnp + ``` + +- 三方库头文件及生成的库 + + 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + + ``` + pupnp/arm64-v8a pupnp/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示: + +  ![thirdparty_install_dir](pic/pupnp_install_dir.png) + +- 拷贝动态库到`\\entry\libs\${OHOS_ARCH}\`目录: + + 动态库需要在`\\entry\libs\${OHOS_ARCH}\`目录,才能集成到hap包中,所以需要将对应的so文件拷贝到对应CPU架构的目录: + +  ![thirdparty_install_dir](pic/pupnp_install_dir2.png) + +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句: + + ``` + #将三方库加入工程中,libupnp.so.17是对应的三方库名,libupnp.so.17依赖ibixml.so.11,所以也要添加 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pupnp/${OHOS_ARCH}/lib/libixml.so.11) + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pupnp/${OHOS_ARCH}/lib/libupnp.so.17) + #将三方库的头文件加入工程中,pupnp是对应的三方库名 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/pupnp/${OHOS_ARCH}/include) + ``` + ![pupnp_usage](pic/pupnp_usage.png) + +## 测试三方库 + +三方库的测试使用原库自带的测试用例来做测试,[准备三方库测试环境](../../../tools/README.md#ci环境准备) + +进入到构建目录执行ctest运行测试用例(arm64-v8a-build为构建64位的目录,armeabi-v7a-build为构建32位的目录) + + ![pupnp_test](pic/pupnp_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) \ No newline at end of file diff --git a/thirdparty/pupnp/docs/pic/pupnp_install_dir.png b/thirdparty/pupnp/docs/pic/pupnp_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..ffecdd54a3e3d8f51c1e681e3bb4351b01358ba2 Binary files /dev/null and b/thirdparty/pupnp/docs/pic/pupnp_install_dir.png differ diff --git a/thirdparty/pupnp/docs/pic/pupnp_install_dir2.png b/thirdparty/pupnp/docs/pic/pupnp_install_dir2.png new file mode 100644 index 0000000000000000000000000000000000000000..0d22a04c545753587354f3cda4b8beb851673c5b Binary files /dev/null and b/thirdparty/pupnp/docs/pic/pupnp_install_dir2.png differ diff --git a/thirdparty/pupnp/docs/pic/pupnp_test.png b/thirdparty/pupnp/docs/pic/pupnp_test.png new file mode 100644 index 0000000000000000000000000000000000000000..bc725cbaac0de2fa0573edaafa4c6a400b66c73c Binary files /dev/null and b/thirdparty/pupnp/docs/pic/pupnp_test.png differ diff --git a/thirdparty/pupnp/docs/pic/pupnp_usage.png b/thirdparty/pupnp/docs/pic/pupnp_usage.png new file mode 100644 index 0000000000000000000000000000000000000000..0ec8b955c3a18267edac9e5ea4ad042cfcc6febb Binary files /dev/null and b/thirdparty/pupnp/docs/pic/pupnp_usage.png differ