diff --git a/thirdparty/fmt/HPKBUILD b/thirdparty/fmt/HPKBUILD new file mode 100644 index 0000000000000000000000000000000000000000..9fa301ce0392745fe9656514d67af7a30a6efc3a --- /dev/null +++ b/thirdparty/fmt/HPKBUILD @@ -0,0 +1,54 @@ +# Contributor: liucheng +# Maintainer: liucheng + +pkgname=fmt +pkgver=10.0.0 +pkgrel=0 +pkgdesc="{fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams." +url="https://fmt.dev/latest/index.html" +archs=("armeabi-v7a" "arm64-v8a") +license=("MIT") +depends=() +makedepends=() +source="https://github.com/fmtlib/$pkgname/archive/refs/tags/$pkgver.tar.gz" + +downloadpackage=true +autounpack=true +buildtools="cmake" + +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`/build.log 2>&1 + make -j4 -C $ARCH-build >> `pwd`/build.log 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +# 打包安装 +package() { + cd $builddir + make -C $ARCH-build install + cd $OLDPWD +} + +# 进行测试的准备和说明 +check() { + echo "The test must be on an OpenHarmony device!" + # 测试方法如下: + # 进入目录: cd lycium/main/fmt/fmt-10.0.0/armeabi-v7a-build + # 执行 : ctest +} + +# 清理环境 +cleanbuild(){ + rm -rf ${PWD}/$builddir #${PWD}/$packagename +} diff --git a/thirdparty/fmt/README.OpenSource b/thirdparty/fmt/README.OpenSource new file mode 100644 index 0000000000000000000000000000000000000000..9cc237cbf204e073d216316876b401bb07600b5a --- /dev/null +++ b/thirdparty/fmt/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "fmt", + "License": "GNU Library General Public License", + "License File": "https://github.com/fmtlib/fmt/blob/master/LICENSE.rst", + "Version Number": "10.0.0", + "Owner": "CHENGLIUQ@isoftstone.com", + "Upstream URL": "https://github.com/fmtlib/fmt/archive/refs/tags/10.0.0.tar.gz", + "Description": "fmt is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams." + } +] diff --git a/thirdparty/fmt/README_zh.md b/thirdparty/fmt/README_zh.md new file mode 100644 index 0000000000000000000000000000000000000000..48c0627b843cdf33a54f3b5f08bf3ccae0642b86 --- /dev/null +++ b/thirdparty/fmt/README_zh.md @@ -0,0 +1,12 @@ +# fmt 三方库说明 +## 功能简介 +fmt是一个开源格式库,可提供C stdio和C ++ iostreams的快速安全替代品。 +## 使用约束 +- IDE版本:DevEco Studio 3.1 Beta2 +- SDK版本:ohos_sdk_public 4.0.3.6 (API Version 9 Release) +- 三方库版本:10.0.0 +- 当前适配的功能:提供C stdio和C ++ iostreams的快速安全替代品 +- [GNU Library General Public License](https://github.com/fmtlib/fmt/blob/master/LICENSE.rst) + +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md) diff --git a/thirdparty/fmt/SHA512SUM b/thirdparty/fmt/SHA512SUM new file mode 100644 index 0000000000000000000000000000000000000000..8641132a7980f342c0101bc16e688394b7e34ad6 --- /dev/null +++ b/thirdparty/fmt/SHA512SUM @@ -0,0 +1 @@ +6188508d74ca1ed75bf6441b152c07ca83971d3104b37f33784a7b55dfcc614d6243e77e0a14220018586fdb86207cc033eece834e7acd5e0907ed4c97403f3b fmt-10.0.0.tar.gz diff --git a/thirdparty/fmt/docs/hap_integrate.md b/thirdparty/fmt/docs/hap_integrate.md new file mode 100644 index 0000000000000000000000000000000000000000..57de3c54ca68ad7d09deb80fc0c0f2fd815c96a6 --- /dev/null +++ b/thirdparty/fmt/docs/hap_integrate.md @@ -0,0 +1,69 @@ +# fmt集成到应用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 4.0.6.3 (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/fmt #三方库CUnit的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md + ``` + +- 将CUnit拷贝至tools/main目录下 + ```too + cd tpc_c_cplusplus + cp thirdparty/fmt tools/main -rf + ``` +- 在tools目录下编译三方库 + 编译环境的搭建参考[准备三方库构建环境](../../../tools/README.md#编译环境准备) + ``` + cd tools + ./build.sh fmt + ``` +- 三方库头文件及生成的库 + 在tools目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + ``` + fmt/arm64-v8a + fmt/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的库拷贝到该目录下,如下图所示 + ![thirdparty_install_dir](pic/install_dir.png) +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + ``` + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/fmt/${OHOS_ARCH}/lib/libfmt.a) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/fmt/${OHOS_ARCH}/include) + ``` + ![cunit_usage](pic/usage.png) +## 测试三方库 +三方库的测试使用原库自带的测试用例来做测试 + +进入到构建目录获取,执行ctest,运行测试用例(fmt-arm64-v8a-build为构建64位的目录,fmt-armeabi-v7a-build为构建32位的目录) + ![cunit_test_result](pic/test_result.png) +有3个测试项目报错,已经确定是因为鸿蒙os的 std::locate函数抛出异常失败 +导致。需要鸿蒙系统修改 + +## 参考资料 +- [润和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/fmt/docs/pic/install_dir.png b/thirdparty/fmt/docs/pic/install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..bc504123799d500575ed5b39f9b654b53745236b Binary files /dev/null and b/thirdparty/fmt/docs/pic/install_dir.png differ diff --git a/thirdparty/fmt/docs/pic/test_result.png b/thirdparty/fmt/docs/pic/test_result.png new file mode 100644 index 0000000000000000000000000000000000000000..6c09fcd6b9583eaf3f92d231aacfabf6da4ef1a8 Binary files /dev/null and b/thirdparty/fmt/docs/pic/test_result.png differ diff --git a/thirdparty/fmt/docs/pic/usage.png b/thirdparty/fmt/docs/pic/usage.png new file mode 100644 index 0000000000000000000000000000000000000000..7fbc5d8d2306928dd9da06767b78d6f9681e9510 Binary files /dev/null and b/thirdparty/fmt/docs/pic/usage.png differ