From 1bd96a6f0751e080a320da2571dc1138cb0de154 Mon Sep 17 00:00:00 2001 From: NEU-lab <2942375747@qq.com> Date: Mon, 21 Oct 2024 22:46:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=BA=93=EF=BC=9Asquirrel-3.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: NEU-lab <2942375747@qq.com> --- thirdparty/squirrel-3.2/HPKBUILD | 63 ++++++++++++++ thirdparty/squirrel-3.2/HPKCHECK | 45 ++++++++++ thirdparty/squirrel-3.2/README.OpenSource | 11 +++ thirdparty/squirrel-3.2/README_zh.md | 9 ++ thirdparty/squirrel-3.2/SHA512SUM | 1 + thirdparty/squirrel-3.2/docs/hap_integrate.md | 78 ++++++++++++++++++ .../docs/pic/squirrel_install_dir.png | Bin 0 -> 20045 bytes .../squirrel-3.2/docs/pic/squirrel_test.png | Bin 0 -> 8624 bytes 8 files changed, 207 insertions(+) create mode 100644 thirdparty/squirrel-3.2/HPKBUILD create mode 100644 thirdparty/squirrel-3.2/HPKCHECK create mode 100644 thirdparty/squirrel-3.2/README.OpenSource create mode 100644 thirdparty/squirrel-3.2/README_zh.md create mode 100644 thirdparty/squirrel-3.2/SHA512SUM create mode 100644 thirdparty/squirrel-3.2/docs/hap_integrate.md create mode 100644 thirdparty/squirrel-3.2/docs/pic/squirrel_install_dir.png create mode 100644 thirdparty/squirrel-3.2/docs/pic/squirrel_test.png diff --git a/thirdparty/squirrel-3.2/HPKBUILD b/thirdparty/squirrel-3.2/HPKBUILD new file mode 100644 index 00000000..573008a1 --- /dev/null +++ b/thirdparty/squirrel-3.2/HPKBUILD @@ -0,0 +1,63 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Contributor: wangjialun <2271411@stu.neu.edu.cn>, zhangqian<2371418@stu.neu.edu.cn>, wangyihao<2942375747@qq.com> , wangying +# Maintainer: wangyihao<2471389@stu.neu.edu.cn>, wangjialun<2271411@stu.neu.edu.cn>, zhangqian<2371418@stu.neu.edu.cn>, wangying + +pkgname=squirrel-3.2 +pkgver=v3.2 +pkgrel=0 +pkgdesc="Squirrel is a lightweight programming language commonly used for game development and application scripting,which is simpler and easier to embed into applications than C." +url="https://github.com/albertodemichelis/squirrel/tree/v3.2" +archs=("armeabi-v7a" "arm64-v8a") +license=("MIT license") +depends=() +makedepends=() +source="https://github.com/albertodemichelis/squirrel/archive/refs/tags/v3.2.zip" + +downloadpackage=true +autounpack=true +buildtools=cmake + +builddir=squirrel-3.2 +packagename=squirrel-v3.2.zip + +prepare() { + mkdir -p $builddir/$ARCH-build +} + +build() { + cd $builddir + ${OHOS_SDK}/native/build-tools/cmake/bin/cmake "$@" -DCMAKE_C_FLAGS="-Wno-unused-command-line-argument" \ + -DCMAKE_CXX_FLAGS="-Wno-unused-command-line-argument" -B$ARCH-build -S./ > $buildlog 2>&1 + $MAKE VERBOSE=1 -C $ARCH-build >> $buildlog 2>&1 + ret=$? + cd $OLDPWD + return $ret +} + +package() { + cd $builddir + $MAKE -C $ARCH-build install >> $buildlog 2>&1 + cd $OLDPWD +} + + +check() { + echo "The test must be on an OpenHarmony device!" +} + + +cleanbuild() { + rm -rf ${PWD}/$builddir +} \ No newline at end of file diff --git a/thirdparty/squirrel-3.2/HPKCHECK b/thirdparty/squirrel-3.2/HPKCHECK new file mode 100644 index 00000000..ba067b02 --- /dev/null +++ b/thirdparty/squirrel-3.2/HPKCHECK @@ -0,0 +1,45 @@ +# Copyright (c) 2023 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Contributor: wangjialun <2271411@stu.neu.edu.cn>, zhangqian<2371418@stu.neu.edu.cn>, wangyihao<2942375747@qq.com> , wangying +# Maintainer: wangyihao<2471389@stu.neu.edu.cn>, wangjialun<2271411@stu.neu.edu.cn>, zhangqian<2371418@stu.neu.edu.cn>, wangying + +source HPKBUILD > /dev/null 2>&1 # 导入HPKBUILD文件 +logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_test.log + +# 在OH环境执行测试的接口 +openharmonycheck() { + res=0 + cd ${builddir}/${ARCH}-build/bin # 进入到对应架构目录下的/bin目录,里面放置了sq二进制文件 + #该库没有测试用例,因此执行一个demo:该库根目录下sample文件夹里放有符合squirrel语法的.nut文件,执行一个名为hello的.nut文件,输出结果为:Hello World! + ./sq /data/tpc_c_cplusplus/thirdparty/squirrel-3.2/squirrel-3.2/samples/hello.nut > $logfile 2>&1 + res=$? + + if [ $res -ne 0 ];then + mkdir -p ${LYCIUM_FAULT_PATH}/${pkgname} # 确保失败日志目录存在 + cp $logfile ${LYCIUM_FAULT_PATH}/${pkgname}/failed_test_log.log # 将日志文件拷贝到失败目录 + res=1 + else + # 检查日志文件中是否包含 "Hello World!" + if grep -q "Hello World!" $logfile; then + echo "Test passed: 'Hello World!' found in the log." >> $logfile + else + echo "Test failed: 'Hello World!' not found in the log." >> $logfile + mkdir -p ${fail_log_dir} + cp $logfile ${fail_log_dir}/failed_test_log.log + res=1 + fi + fi + cd $OLDPWD + return $res +} \ No newline at end of file diff --git a/thirdparty/squirrel-3.2/README.OpenSource b/thirdparty/squirrel-3.2/README.OpenSource new file mode 100644 index 00000000..9bea07fa --- /dev/null +++ b/thirdparty/squirrel-3.2/README.OpenSource @@ -0,0 +1,11 @@ +[ + { + "Name": "squirrel-3.2", + "License": "MIT license", + "License File": "https://github.com/albertodemichelis/squirrel/blob/master/COPYRIGHT", + "Version Number": "v3.2", + "Owner": "2942375747.com", + "Upstream URL": "https://github.com/albertodemichelis/squirrel", + "Description": "Squirrel is a lightweight programming language commonly used for game development and application scripting,which is simpler and easier to embed into applications than C." + } +] \ No newline at end of file diff --git a/thirdparty/squirrel-3.2/README_zh.md b/thirdparty/squirrel-3.2/README_zh.md new file mode 100644 index 00000000..db3a03be --- /dev/null +++ b/thirdparty/squirrel-3.2/README_zh.md @@ -0,0 +1,9 @@ +# squirrel-3.2三方库说明 +## 功能简介 +Squirrel是一种轻量级的编程语言,通常用于游戏开发和应用程序的脚本编写,比C语言更简单,更易于嵌入到应用程序中。 +## 三方库版本: +- v3.2 +## 使用约束: +- [IDE和SDK版本](../../docs/constraint.md) +## 集成方式 ++ [应用hap包集成](docs/hap_integrate.md)s \ No newline at end of file diff --git a/thirdparty/squirrel-3.2/SHA512SUM b/thirdparty/squirrel-3.2/SHA512SUM new file mode 100644 index 00000000..73a6687f --- /dev/null +++ b/thirdparty/squirrel-3.2/SHA512SUM @@ -0,0 +1 @@ +6cd3c27e6e26e76ead3235e11afff14dec4d35cd5bad6bda5e8457ec46143e269ed598184c01cbe5058390c36cffd506caf1edceaafc421c1e4a0e4a1afde60c squirrel-v3.2.zip \ No newline at end of file diff --git a/thirdparty/squirrel-3.2/docs/hap_integrate.md b/thirdparty/squirrel-3.2/docs/hap_integrate.md new file mode 100644 index 00000000..5f2731f5 --- /dev/null +++ b/thirdparty/squirrel-3.2/docs/hap_integrate.md @@ -0,0 +1,78 @@ +# squirrel 集成到应用hap + +本库是在RK3568开发板上基于OpenHarmony3.2 Release版本的镜像验证的,如果是从未使用过RK3568,可以先查看[润和RK3568开发板标准系统快速上手](https://gitee.com/openharmony-sig/knowledge_demo_temp/tree/master/docs/rk3568_helloworld)。 + +## 开发环境 + +- [开发环境准备](../../../docs/hap_integrate_environment.md) + +## 编译三方库 + +- 下载本仓库 + + ```shell + git clone https://gitee.com/openharmony-sig/tpc_c_cplusplus.git --depth=1 + ``` + +- 三方库目录结构 + + ```shell + tpc_c_cplusplus/thirdparty/squirrel-3.2 #三方库squirrel-3.2的目录结构如下 + ├── docs #三方库相关文档的文件夹 + ├── HPKBUILD #构建脚本 + ├── HPKCHECK #测试脚本 + ├── SHA512SUM #三方库校验文件 + ├── README.OpenSource #说明三方库源码的下载地址,版本,license等信息 + ├── README_zh.md #三方库简介 + ``` + +- 在lycium目录下编译三方库 + + 编译环境的搭建参考[准备三方库构建环境](../../../lycium/README.md#1编译环境准备) + + ```shell + cd lycium + ./build.sh squirrel-3.2 + ``` + +- 三方库头文件及生成的库 + + 在lycium目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 + + ```shell + squirrel-3.2/arm64-v8a squirrel-3.2/armeabi-v7a + ``` + +- [测试三方库](#测试三方库) + +## 应用中使用三方库 + +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的头文件拷贝到该目录下,将编译生成的三方库以及依赖库全部(动态库名字带版本号和不带版本号的都需要)拷贝到工程的libs目录下,如下图所示: +   + +  ![thirdparty_install_dir](pic/squirrel_install_dir.png) + +- 在最外层(cpp目录下)CMakeLists.txt中添加如下语句 + + ```shell + #将三方库加入工程中 + target_link_libraries(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/squirrel/${OHOS_ARCH}/lib/libsquirrel.so) + #将三方库的头文件加入工程中 + target_include_directories(entry PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/squirrel/${OHOS_ARCH}/include) + ``` + +## 测试三方库 +- 编译出可执行的文件,使用原库自带的测试用例来做测试。但本库没有测试用例,改为执行一个demo [准备三方库测试环境](../../../lycium/README.md#3ci环境准备) +- 进入到构建目录下的bin目录,运行demo(注意arm64-v8a为构建64位的目录,armeabi-v7a为构建32位的目录)。该库根目录下sample文件夹里放有符合squirrel语法的.nut文件,执行一个名为hello的.nut文件,输出结果应为:Hello World! + 执行结果如图所示: +```shell + cd /data/tpc_c_cplusplus/thirdparty/squirrel-3.2/squirrel-3.2/arm64-v8a-build/bin + ./sq /data/tpc_c_cplusplus/thirdparty/squirrel-3.2/squirrel-3.2/samples/hello.nut +``` + ![squirrel_test](pic/squirrel_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) \ No newline at end of file diff --git a/thirdparty/squirrel-3.2/docs/pic/squirrel_install_dir.png b/thirdparty/squirrel-3.2/docs/pic/squirrel_install_dir.png new file mode 100644 index 0000000000000000000000000000000000000000..7ac40298eb26ea00e6ca1caa90ca9d8f014d7b8e GIT binary patch literal 20045 zcmcJ%c|4SD`v*KyvL;E$8jC+e2?$(Jc_@4vG{!74LOx_nwjXzcd)P4Z&;T`yf}0EMaxsSNQsaAcfz0YdUEc(%WI*1Y9eD4=fD4A98UdMgm^-_ zh-pbY`tD`NxDPBXiY$h9^N-tE2Hw-N(u)ZBS|2Y>XVNZkQ>`*=3H)OHwcM{gmOj!q zpow!j$23>aJ3!+5KZMWWHWCL5?H1v|uC}_>Z@=k^f-WdlKX45w%IO0u22#mmFN;G? zU`qY=dM#`yRBXESBKClu>)htT_soyaekBjh7VY*dAh#=!R7M_gB$bq4#&wG!z4Ui) z@TfNlGuEVF6_u+N5SQq2ic$cT8N_mgDu|E#cxkp{Wbpl1!U2^04NgKo%J&H?KPW27 zXtP2SNNwh<~dSoN|DK=5BTyI zEy!k{)wOh+D>^eH_{TbplPstDi7s37JFz;8Wu5V?)v>$CXK+pJ>rWn}yyQ^?owDkG zpvEFafcxkz^Ln6h8Y|#@SWwP18?REM2zIoXx|FvUba59yYW<~C#hrKE{DO^O4bZjK zUHpom_x_SlQ0Vi$iXejvz_Z0=fcf6LzhM`Mm7TZ)v@;ye1iEL027wF@F)rK5k5Zen zbtwz1Zd@;NCr>owQ2jv$)f1wq$%;od1oSuHebGt-7+-p#O-SXe?rzWp(dr2EzHu#o zdZpc|iwB;qihL<5_k2L;A6?4a4U%~<>Qn9M#96}S&_ zqSzFkbH|G%hrh!xzQhdMoH>oI1RjM2F0!QuI|*zYd0tuCum zq|ui4YG2ShJ;g(IQ=Zo-xHHY~y5Cuq5%wemDA3Xi@jdAQqIFc?mPr24Lr3MI_a7$8 zNI(|}sX^f2Y-fcI!iz9OaNjsigYA*hHM6q%sm(QPGzNN!Mhfb1D_W;Lj1UGrx^N23 z!lw}DhYpIJAN&CKSlyT+r39eMo)uyTCWJ+l5S3rpZw?cNo>Hi{&%$(gFG7ZWKn9t& zx$)w;Qn$Gwy(-5uhdTV#Dxr-D8o5h2n;QqFf|Eah)y%a~ zf{`5q5beai0LEObsV1&#dW0z957&-=B7M^020gmGZKa*?kL^aBRFXZ+_oDmAFc(dl z(C!5bq6rY(usfUIj*pL!0)$h@sbP^xaT?}3Lv{XYx4u=lcKrqEOfp&`dQ6?k;J}A) z*JptB%7_wYnSpIL#)H!P`SV|`_pe6&>}!J$3~BCerR0bHKFr^<#A`k}&IFp=2Stz7 z-JlMVZC&UCZ>Yi`gMeq!(B@`J3{?kYp!rM@YTcyZx&tJDtPW>5$~|`V8R+E_`8g%I z!)@2&>*#vGo-cg-(Qn6&_g^OtpjL!z8D0{rIHc62O5;x~Eq)?=5sljs1?)7IBY4wr z-}HI^kM5m058)kwfnYXA zzFpj)RIFL4u!MR&qY==D=lf%oQMPy3ff6ksqsFGIFSwq<2jKXBxh zWy!!A-eVvENO;ik#->@1g<$)xeE|`!*WYO}KfN%&VC;OQw0(0R=8U#-p9UebmWkZ8h$5nJcq};d!M&EK z+rqu>ZEK75?_>h)m+Oa*)FEw)^J-VZ6-b+QP2p{8fsQOw+T5TE>DL;47Uz%pR9Ok# ztnF?{2#+EP34xRa47Z|PKQBo@LCPEVw&2a;<0fc^7Z(Fu-J6m6;&F1gp59xFJLm(` zO8K@$CXy!f_5v5zU@LcIS+z92h~HTf+vjO_dc?Dm$v`kc0;>Au>CI0#bBQT!>Bka{ z6>HbM^S8kD)|$h<#5aL2`ErvyG$eZ12gZU-Fv~FKXWbNL1M6L4C_@wT{d_3-Y!x*b zwlv(^8zvJ;2jg1biGf;WzrndwZF1hi)nQhi8aa;ovnwjt-Z^!0YxuX4TQsKUQTMp; z&vT`KiH)iQJ`xUB{(LjCp}|RaYGr|c%IiAK;@TX^+M3FEkPxbOQqyMlu|fI#(M_0v^Ot%tXX9a#Bf)Hsi~xGlO>A;zH*V>Yz?eLRY7Q-PV*G48j^+Lk9T#l9IyFx3k3S-0@kP|S@4JI?| zQ@5WiwYpmKs^q~dn2ph(sQl+!&FbI$!}ltRHSD^UzH^HhW!U@}&h-8phaS{u%(5oL z9y`Z@47!&41YTh!>kH960E=WS+)~yM`=!B7iFfaoEgN<{-+!7%G3Az7`Hd+lo)wXJ zlTl(fQ^^j;#369@!OQ3~vY|rePJ91);onzhNkAg%n2YrM9h8t zdhL1FzUl{UD|v4vwN$)jWT7Ro>}f-6{Gp%!x~w9K)J7gJv7EQe&M}`3q8e3F%Z{%P zxQ#aof?CDb0Q`4xQ4MtxYPSJ9ySwQj;)OHC{HAJn>&AfFT#$$;-wv7G4Ne0=E;jB; zXDKGl-=n!e0-XO2yXdU0#bNnCpltt}x2L>zfed8+8Sj*)TN5s(^|pz0c)AxH;Xi=E zGJ_tOqUDv4bfMV<%>9S1c+Y&YbHONp?mtRE6VY%%p&{+jmD0RLyd}ohvgk}FY(o(A z6}aUVvDFB8ANL2huD{Dc^#D&=l|aK4iY}eyU3z*mh0bAqM3NT2J-dc_vgPA9uyP&~Y>NNj;erA)XIDGYKet*o%%h(Ub0vbQO29NaSSEPt2sLT>wJj*usoO}<8O1l{5dI7kjGq(Z# zoGtR8*k_Qk2Wyg3Ke1a)X6{m$NAitV70yWIMz9cbXsIMLF}o9eP#@yws$~_Sou+!1 z*O=q|abR-)idB{Wd9D6ibl=}#8TvO+RR{QQv=ZqzfC{V@`x8ph%JxcvKo(&Ipa8`r z)iW^6TZ*b&pUrg<>{&=pg3UB1yQCl@0cF5dKwJBFKt)PMsJKFaSMaliphnNq#+#hi6=a>*q z-U1*eLzijnB-L9T|a~7^e zyzR5%&-?zSB$RC<BZ6jb)=W>C6d znokgRPV4r7Nz z{2Y1*@IfgblZC3Q?@se6u4^u*!Xo08<7YL5rS+%>u79icaHw}C%)O@neEzlIThQa&8+zH`fLr>WEl)LK80T$n_+nB@^@XD|XRQj^;IHvEygc;Y^LD=+k5UKiG7~ zm%Z+jD_jW|hwOvQMAFizF;06?G7Y;p#fY+ODGt?lZzIQhNqMd7XOTa8hM%TFhc3jM z#++ll@fbbVed`MNC$WP4NRSjtNM*HC6AhP zUh9E@!D$2+WESDmOch}k7bMC?_P~)eb)PrO<*9+Q<*5M+SQh|B*3D$t=g;t`g>ZN~ zvE3i`UvQslc9R%?e9njZ-M_4<4!PnHs~rj-81J86uQWH9BLl8&Fi`30=2fKyOsc^U zsh5sqIt6^6gaXulV-}U_fjVIkjL=_{)%_K{I3Qk>+Cx;I*2 zugJIo4-Z_OwF≥0J-Gs5Wn8-NKYQUF}6r1c=K|21`u*C z@!PwdoNMOpotWp{sLg+!b*YS0_ZsH0byyYlO4;9IjDq{P)36hs?l|tT%FLBCy%99j zUeV&Sk?a~JbSbv05z$LaPZ15h5ms=xyTRu+*-i3d7UYYPJ>-(Jl4zzj!ni$nD`_Jx zTQ~EYI%l0wi3p2#hfG8p{{h?K`M1`d{yE+QaCaYF8U?KeXZGD z)X(1=TpaILrMleFuR3&#VWY_N?ZH(% zMN(Vxk_tPgoL5S2H)7b@ykJ?RxMYkyTI>Nog%G=XJQ`_T-1)<;$(>(XaRKiYQ`Sjt z-{}-WgLWd+vrlWW7^pT_?i-14-53;VKhN77v_Cj`Oq6R!s5tN_a&AMliF!5qjdZN= z<0y4E0Osriu3paOh`g9OZMRmcXV-~d+=8Ah(%}_!?Pui=JsjqGrX3pcT#WBrk=^%2 zG3ka~;%tALHT=o76f~VH%IMu%rEfv62hUud5C#eOgcZEdC`j^2pCBL!&kr3qUu@FB z9BKg=;;9@dhtnMROLCvg{Xy>mCPB(EN9v+8RPK`+s@&7|{6-?#L1rxQda0i|7nxw#@;!Kgg*VJ(f8r(?B|@L%Gy0%Q|~t z{_&9Fbn-w{^#Mc{NgbL`>J=pTMYRi)Xc;Aes?B_Vx8noNco#D4KceoXOL5*Fuc)ey zEeYz%UlbMfOl+<4#4UL3-m8cZrs)tUEt1uWTc{+8-Pz|0)Kp4;akc)zJoLi*9+fcD`MGQw7 zHtqU^)ag49Oz`xOhn<>gnb!_t-O1Jd#nFPdA@+-P=oHItS0<;QuEe>os;B28e_GeO zr4#C!v@ku-*_r8{`5IDw%8)+bNRD!5rlFB#>V}`ygs1z_X(WTj$!a}5-3U~7=wZ(^Be(AD8F>6)xs!RZH+9crRm9@J6Fk|O;TS7Y zzoKgRp+yTQuKlV98pguAmG`!qt_;mMq^5c`Yg#L4C|-1O;OS_ZTpNNfGM3$zG@=`O zp6_}(&;RNJn%_E)+!;x^2lxQZzxaSO#IP@6x5;W078BD~9rylKErhhTNNN-OBJ3C& ze+eI*FWP0_5|$(4EtU1<>OU(()^I#i8#l&l89(H(jD{FFKF)!c^sUXD?EBaq)6-eyw&eVk9|&#x%k$g11QGRG-p zJW6K<<;MIL;)RYi{Y{AfxHb6>q}<91`ILM!vPTeqdO1pNVW=;@&Iu{-2%Twx=wyIu zsq3cZFFMePWe*DI>SrVmDiX+(4p&G6SNBM{e=xV`(KP5{g_z-l1B^mW)V3G;&Oc5( zUQ&Bd5S!>5FNz(&Dvx>(8$C6%I65nQO#rx3I88s>8LH>;w$69K)`j+1Dc{k1WweB| zfzNUk5kqSrzIaJ{thHO<0AOI&ed8O=1q6$Pm9&ku{Awxn>dI`uwMIudp}{l#S+-kF z9->OsVEr;-%m4{BDumSOt=>_pNuVoj72=((ZfelRD%&(+i4LfbqyGQ^j%rw1uyY+> zBDwBf2UA2iJi*unT}MyVvJ9{}tLtOaUQ2PryojW96kmrJcI;!RUK$+2aeX#!=Fga2 zBrd_s0%;KgqJAJ^DYm3@#XVL>c5ayzc#G7#b1=9Vu(;k~F)q_#$_wOuy`P_Pi@4DZ z@$0?p=&QcceBS3RZ1KmLv-KOg>a_dz;H2*%n{sg~WntNN1c>FdG)hdVq7v*G)V1}L z-^=i}m@SzXnDX_?G<+29c)Cy(?O>N<4WhVV6Io3ggXu&TTYlDj|8_fu;#0^9>OM;! zVdWk_E}ZSq%kE4I+|X2~0meQ>IWOS|W4}Kw?LpXicJC@DR#Ri~)$z~p090qy2=p=Z zb!>GrT7@j2TMNM`Ngp($rH*q^g|A%!R_sOi+{Em_$rpOXuk7nkuR82>bo?j}Q|X&Z zWXTfM%PsmH+c6Dl1S}qaM7F*Bt145H z%Mm&fJ!Nn4vm!$#uaui~A3d(FZj1hmyEZ1qr%@#qQJ{9?GTJ3!LNspwg^A2?~litC(moQy!^#*gFlz!w*TiNV5l$%2N6^yWIi{(?2eDmi$Q zD09cL1JfI@d!_YA)HEjb!bg#Dp-X7I(^d?_&VLQRS^-YYl8#!J`Jw!AI zEQrH7sZgjT0DDcE4{B^<16j89&kTCfTPes|tk@Y!4MDxK%8dL2ZK%J3q4Yn;vcI-c z@~3k1Zo8Aelw+Wf(p(biYW>T;tfD}G zgIwc5?Eq-Uenu$<0y86g_Gk+f4qY+?^5I{Fx$M?`FDMXwvY?`0{vLjFKM=4~|0(wk zlXKY*ySQ<1P0v{Tcv#!*U`KNd`K!Cnv`4#;Qe@&l{o6aLrTTk_j}H2xQwwM(`2%+< zZ?Gmc#>9&hqZh1!tZU^|yUs>w5}IFnAME9IUQV^~w_-0-fc!RnY1Oqd(Z{dTmDK5f zR&Mcl2d9kr*Rhz$ArI6-W(BSeqq~^O6vfgoNj&)`>t87I!C(V97_aFIfh1jGu_zG#hnU@WN!NR4GVYOMVr`eN`>1}l=^gtF{DlIdO z)?F<4{-!u|SBpBdBiil;a=7mj+6KJ#!qh#b_!I9gDtR0=f~^&!+teMGG6uJ)GYfDr zxQ++rqPJ4gN~$%1On0S>o@!L@;aXUTeV?CUKwiVXd9Fr$O!t8;LEy(eaOr~`o303$CPKfJX_TRc(X zAE~Zf$fqFI@89?ewP5~B-dZF-dCCbChLVD$X|K5l1LlN2Ix@YPjDRB z|MEgm*S;f(5XtfWZjbJ9f8Ha|_um10b6g|Ds1qGDd=0rUSk*(}x4(#;n!-2=hRHqp znG_qru6R6$68y>9Z*B))64O_&dLfP1=$VMijVs}#N{i6ET~lb3*$*9WT47Gt%LrE| z`{mO-hlemdLG$>7*z^$3s+GpWK=x8t>PGqKp5%>tN}sZsN7mutFY6%AK?D`hQwGlB z!dKZ}dM$gtApiBbf)spkA#966N*i5INDVGouTq92Dz`-AM`0c~Y1O)Km;Jb7!EKX6 zU=jt*%$lSdgUs}-*;x+IxpDAF!dzgr zuz~#%vaC-Z3_FPEYah(G`b{NcAi{Ha%Ig8xZ$;}Ce){p5pQ!iDr{4lt2Z_S~uxdt@ zIy=1LGBrZ&nfDXwvRUp_?KZj=tRW@`9!`5J>`Yk~jU1qb)4cp0w&0(URk7EuvQ{sc8i(TR%R^U-r^<~p- zFULPFa9M6CX}QvPavQTs9TI!@MCN6{Vz|=WI5}!=v$MCSRqam{+}wjB?*@Wg&+IPJ zrUOu;diuA)=^wQ1FD8qy)hRWVbk3xMX*lVVixg z%Hg^dPiw<=g8+YOsVZ$F;nQ64RA>A&t&;r0(^@P-0_EH@s-_&n3W@CR+Ly0}nw%%P zgm8U%7}4g33=rr;_$Hk&v;DqLMh*BzHPg(`guR|>1tPQ@sdMthC!0%Nj=aEnQB(7)aBNyoZI*DdE|TdW(z!FGr=nn2qxaGM`QYaad` z+&=vc+}?_%r_yroJ{sB+#k_6*|0i7QSW$^>7choC8OA!&!+;59kX({#LPz#4x*EqW zEMnMc)XBxiY1UGh0~dU^T?wPue)eimiC~eC{^j_x^WRopWd@&XucKwAR@38Kl2aPK zR!0tjZFzUp7}+0=^cf7)#rwJ zGwKijh4h+?aD^!^F{)SGjlF`Zl3&OHsKzSY8H-GX8BBF)EhKI&?=5+BWM%F0q3zVM z9R9!f08T{TS$xJ(zz3w<|J?`FRAYbAU;e+-Uz>I5D(xzi<7Q>xYr+gPsR0GlT@W<} zOISbju4)xNiYD9MZ!pPX8~X#hAA8_d@c{WIGH+P~2i{qz-($P63pf~^_aR&~>l z?)(t0sYuRYb$0Fy-8#Gw`@_0wo2;d3_c>i@`XoODs1wHqRqn)UgyS*f-c<6VUS z*V@%`B?1v2L$4;=Pfaa7MXac`b*0f4XE9yaOBr(FX)7aJ%bkHpSU7B(`F4Z}{uKad zc-NBrrfeOoNpjzQC3g{XL&f=*5?=TATzcJ$bJg!NPrXU{A?wRGA@A@+s2I~e3_5$` z4_@p=m1pwryjX7OKX|d(%{pj1y$jytetr=A?T-}g|3r>0U35jPH1pGy0(kfjQ%fxM zfho`OtO;muiE6C&s`-rySMq3%U$fbj!OY3A9Yg;&O8o5SKPd4>|ArF3o)cGItT_tr z{K*U0pwFQ)-Hm5gTs9`>TxRD#HhMe9<_(axF6yh6V|g(VAN+XB8?SXl)}(N&L2s!& zMyt4w)IyL!7tv$ErjqbI%JSQOtilp$DCVdq;n^Z-q|1RQ8ZEhcgZ;#CE;>1_W|*~| zQ+m_F!JFoQ);a;Z@lLPPXRY#xZflto1`J80%I*UMf1@=ByYAO?Mn1|QMs5*Raa+&i zU)iDGz(Q7q)K{jIRv&20FBvB)f3ptf+fRcPg?Ri(`jP3Qc4v#jE_UVzKjtqkW2V_X zDXkp2VAN^+cTQt*J`XTN3&t)Uf}hPm*tORJE|=~hX=9$TmEis&{QVC%Ju441SWB~G z-dl2Vk$(|O3{T-H|F4W$ok}?3DusmpZFqY`?)t5UwLe2S9K56!2kBxUZgi)~!QrNFpx3MJ$@;$#T z`1F*!}o!? zAvpkX53CvJqe zx|I?9kf7G0{lup!iN@wIyL~DI73&E>MenjI&+;j0cf!|6m?AdCed=U}4{V<%f&H$~ z0Yt|!oH@AWbj^pofoFK5qktQS4H|k6+QK~amQ$yECY-5skbu~S2-nYD`@-bbHy*Jj zkq$zACs+lPgMrEZ@Zp02AaCS=G@E)YuUu$ISlSqiQTr96RiJG6y{0)XFvmJNsP$++ zyhyP#-`n{dL#|T{XJZRR#FIz-AMhxycu&oh!5+fWgq`a>R?v;E8jc^s&4Vd+_i?B* zdxf@w+t|}|g^mq@p4opF>kxRM(ipwh8m`~uwd@bqCo<^Z=M(}Wy?z&yfi+;} zzeKp)y1^6M5*5+Z^Z+OmXfOLet6Jn4g#;M+_5(nOH~T5vWLtLzXr9dNw;}?aNaAC^ z=@&~_lcW^?R4{r0zZ9U>Edq5VOrZNbP;??*c3aBbG44UZ1HT@vK<>L=)tgbH?pb@-2Da7E{i$X1Fz_)a?VrT5FB~6OdNh=2nMq7#&?|+W zzJ#F^cT&MmS&XG$TESLpeeoGEwPt#N2D&D^iw0H%U!a}o@H2d1&UyWn(*$_j<)qA_MOMJ&o1W(%i-4jEzBX=a5&g=I?TD&pqJ~3( z8E--DCmwuO+vt>Be>FuWpmB1&MgSBF_i2%Xsv-u<^sfPw__juTyiv-^CQG&4`RZ-O zGG)+s6x@0_-ODWfu+fG}HlIRSCs6i>IWKsxzhwzk0VF^x=52sN^5y?~^;rSvZ`Rl! z;B36?M-l&!~gSI8(?=wDiS1T~6qlR##36PiN0jir{V$}j|Ki5%zvvS;K_{;b>x)VDC4W9D4HXKazgf5sqSe!dP z4Kf)0LwN%1U*m~U50fpOl0eIm0&rEz%grONl=3mn8i<*#gb}2VQ-z=iflwYqob?y! zOa?sxH}L(bQ4PnT)446axwEOsl(lP=lo7mQl%R|2sMFoA38Jf8)0(rTLhhYMrQ># z$jAh}BZ>O-C`j3b6~gqNH!ko}vhV-x#$`}&yGnjZ$pRj@Uf*~+Sb*1toc4vB@=%}= z^rSu1r=E?2#5o!)#eeQqK~!W0QY0DJu8r=|YtR8r&ZIq0_|yiJyh?MQk&lB~?!ozR z+p1zjvd~!A?jbw{Ln}&Mim5S~LS?@)? z2gIR=Lhe81w(KucOp!{-lG0gx&FoZJc|C4 z80hKra(G4K33O-)u<%v?VgCZkFup{LtKXzRf?4hFjqJ$zw(u^ zf}Qg}9k)p)(Z)C(1YVec9ztG zcQth?)jXsF7w9T@Cwr{73aJ;#y(oauVcFHZ3()%j=3;El>D}z)u}JZvv=3vd)4V0J zZ<(|Oa}i1w-20MwiyjVOi{=*#0N#fg5vLmWqQb{R9^R~@~tnv z8R-zwmf_Vh-E@l?EDT#tXgD~f{1mf0zt9qcRE-^WAD2?w2k2~GpGOgo;<;r9wXWm7jsc#67Ie+^W#vS{#{D{{9 zEqqvk8gwdfVeWee`W-7|<)H1j?Usiav-l(U2e~zPMRTm4tlO>@t|awfETs=!Hvk#* z5iB8=!mKItZF($#q~{*cr*gY7$8(dJ6@ozEa`nK_MGdwDH?@*T0A<$#V!ohQCZD~o zG?!u?Ww0CQ2P=Q=@}4ARmAzB1P{3X6NdwMyxq_K%rr}eL^AE7TF-PzYlo|Y&vbU>n zHUgq|sGalk!QFsxWmoZU3Q0pb&57CsA;Rc`kKmkPP#;gT#h@AsBkq6%gXT zGeRpXYgwC3Cw4?Twj zrXUtfKt`SoH<3?y`kDfM$E$b^P}|o22ZzO`3pF_e4HYBa`?p|2PN-qm8joUA=^tJz zqODNI%}U4@qEZQw0E}13M}9(}3Rfo-ht6u3ZH3tn`)Xq4w>*DVj6r9^I3j^Y2_c0z z2zomS9$jm{DB+7cyhrQcZ*;hag7^%r24Ji~sjU1LQ?85@jgYi$BpAL*c~Rb+^qB2w z&7EL-H55be6}RLLE*4DT(keK_s|ZBmL-B^V@~9s$XuJ5DXw63x_vgfAm0&=w%X0;`qtFz(KV2Rvv~7HfK9@SD);ZiL*F4K$1cXit!V z+5w0jm&wOWW!|f`6M*MwnJL!UE~0*Gen)xV8-|;&>B;0cUtjdut0;btF+Yjt>;P458UOg8*C$TIKoQTO0Z<#(+7%?F7) z8cv{__Ok#miz<0FtKtFjcx(R zrBykF{C==4t0_p=k~UXRSkbhRK(4qe!K1j}<7dxJ(K-3dZu_$gAOrl!o9~S9*KzAj#Cz^(utcb!|@9S5J0c=g5NJj)}W) zhrBa|i+zjK?e;L}Vy=$J-t))i-`;Waj;V-seSl*RSK{=@Q+-gNo~WDa-KmbhmXqH& z6V}$-K7RH&B#h$(9_Zx(bY%OII)v7VX9xN7D88NYINiQrPG^`t(C~<`nn+VO86U^> z7mjP&b+TD&Kg}!|R+gfl3)R`H7!}4)e*+J9M(=Sp=!+f(j{|)LgR$(|SXJT%g}+bh z-o$v_s{+Y;9gYSF`*}^l;3Ed2jOG5%3S7o)bpyp#)yFE}+uqEba?oY(3H5f)BM#EN z?#IsrEvie*oNUE3Q*w=X@tpO%;@n{zFM*c`GtQ<9obwpnc$H<34vRFT`S9jQy#x9^ zv!~yM(=(C9Srlz1puBhC;BR*B2FktvcRa!$Y{TETi5Rf_D>Pp|fxe*C=E_%5=hanH z4Ec+b3=P_=_^kC;&upNHleP7L-x;Oux`1Fu1Qua;z>6SDh&7BJuxmX$X*1NZ@Y>2Q+*#MU2)E9>u6V4dEB#{Q+Nv zU()i+rgFOh*}k@_uZ)%zKc!IC%}QzU%3ZY2nd#*A@x=uztq$tPc6ls8)O+g<7#f$5 zvU{(YxEy1M-}r+4B8riB+0G&YkaD8Z%Dz#Dr6In7+)0Ao#p)57Cm(zYSO~N zZ|4Bey3bJyELw?bRhEHp~`SuqUk#AdejpOI6k%a;yxg>;Q{3Jrw=2 z?k79&Dz*%Tr46d`dZPqeIEXt`1uEcdykd=dSgs^Nyk4JfbGmbEbro-jE(Pc#Hppb< zfAZmXsBhr+e{V$Cbp!q{P+wdhc;_+z(9H?)V`zbVRH+&~ig0nR(+V>UYS~RR%5MpT z0?Aq*hgs{rr*)2jag>GcKbuY9^)Gc7oUaWtY(!rCD2Le|Rl9H{S0i-j6=2L`-~9Rb zP<9k%KvE9{_O~t5N}ra zaofE8mDakaD%*mXpZ)8A3cb~h<312?_y6AY;WE_)VSsY0y=M;NPJfgZfHgblpH>6n zj^_9bz6TsUr=G#;gn7m1C+y7fObYIWZ2}5szMfTMBcguo1_%Ede>^*df#%1jLjKVG zH)^Wy4ymYO&u#a*yHl!pwQ1358$`E{)Kow>G6=IH>^Th$a$6*Sb1y0h3aNJy6^p(& zsLp%~2#u|O_K-ekn;cChw-dZ`DJCEM3X$p6*)@iz5UYvg)Elq(H5C=0MXsgyr(@#p zxTT}tGXaD`1d5Q7Xkm<=U{O*NkZfzW_w4+B^PK7Xu(p8m>C*dsZR*u!M`*`+Ga8rn z#Ll6c!;ZiFC^M6K_gEN*Byl+WF{AB75NJx#nPZvD81a|LuA&N{Uc^43dY?5Tmd1Jy z;Q7EbHA8QLx3~Sq_Ukg@jwU!Tj_hT7p6D|2HD0vBsZRR*{$YG`&^O7Pii`zm#-KG*Kpu|m9GryACYD=D%Q(_Glf|N6yV zr)rou7X!NpDmobDoDc^GAelRrps=)ncFJ7y{P}m%D?G?Xu5%EgYAo$~%y}WXh3#*7 zsq$M6%A&0G|C4*!Rre43-gYl%+VxOC=W-F`a$-UP61ys~koJ>7a_VXampQBFsl*=$ z-w6mRv+vxHngr+|=4gnW`KxjuEe^#2G5pr&rB*p;05DN%K(s!1qn4GQ*zk?vNFwng zgGiBLZ~nlo_a`%nrIL;havWb?>tz1`lNyWZ4YS4Gi5bvY9QAlP9%Mg^>)u#Up%w== zIwcNMF&Y5t^Y=k0Kj_aOWMjTe-KVJb3R74woZC22>-*~nhm`((O8dhYUXM?~VlApI zG89*bE0k*+ukmQ)^NXU{OgU?N1lDBU6=~*d;r;2ma=ybgEr4E`Ih70{Zd*L@k)YZ> z#c7^wxtY{Z;K&1+3`Sccssqj=!wKAx-?9}NG(N?ko=?g`RSuOp0dnwR9K{!{TD$$~ z-I{?x=M>~KR~P4cWy0Hj%Bv90r-}RU?8`TFQTOql zbK!@b49y5Cm{T<0wQbtM8cpcVq^Kz`0=8g!;K{S_!@C8G8?5&ll?BX)=q z?XDMqifryj0d(6*MpQGa1pw=ue@4w`+HQ?UoRIm>Qk`IoH=pCLFq8U^^A4_v^reo8?WP8z%z}3-BL%J`W5z{cTCJ;;nx-fZ2dvN!n4P6!%Y+7?GUt zC4hI~1Y(}c59mlyg+BZFa^;TyPw>FsvqZ9yzn`Iz@LP-GBLnnlgTCk6XK3hH9I*I# zhQ^6sXJ`Zf8iqrUrCY}$?>~ZMwgJ^HeLw=kscQEpt7m*2B3U6eSJFc7P)= z1Wu!EyhVR2)nc^oyRe`H)p)gG)<9Yae1ojbbphf&ErSJX zi(@yuVtE$?6B$Ph6yIu2%tDSc30wsVvW%54gqt{7>gvalQQxPXpbSMT+K1LuMIP);6veJscM zd4#uc|2#FS+FQi zs=e?{hv_U*O^WJBtsAgKh;{9_XNdl){+owC=P1g*u}P4p#XYa#e(x_170|5Xb^<6A z5V4`9%WD}|IY8<5B|CI^T%NMM`hUS7U3uyTy`pJO(R_~+K_5Rerz}vs`t;U3dk5>+(1C8Ug{Bc^_EPFHL1nw20IbF3*t235u|LR{X1|Ehxm_sSn?ACkH5&R?G<=x|YpY;QN`+Mn)p7-z$dA--` zMeLG2W9z4_Z>pM&5@)T3Wj~L6^NBL7)c{KJ97kcjP4*d=V}Eq{kiU_BK-5=kxqCQB zgbRMbw8mLivCY@B{m%NYW0$fJGIQ*W(wqpkxGwBGIA&(K*&MxxM=>l4eyGbaRs>&G z)JY#5n(cb9nU)$zi0zrA>KE5hH)Hb#Nx{ZNA!Cxnad6^(n#q#-L2 zaznXbyA`b|o)33k9UFX$*j?<9;kd)0Sq(2Yp6nh`9fS6UdO0R9 zWYnikB`~68Op`Lj| z&6re4pQu$P4dG7!TK()9y==XeC8fNO4PtS@md8}o#>m!cXYcM}dfY~Cw7$jpA0M;w z@SDVt;^3vb`j@u+8vXQF_45|=x1I$ao8pa_lAdX9z;fN+v?jdIc&G_1ei;(w*WAmV zBotn#mf-=&p$9C=sZNpSY~Ghf0SS;s7>6Bq2+RyQA3xng($_5xp8KG0L866(*kZQ$ z>t6;>o7NZTQCfHR3@-2P30Zs0{l-sk^}+1c+U}4yl+Afw7Zr!Tm!99)z(I{%Cul4+ zVq5(ewhASC1Md4`yYb?&?Co45E8whhG-aP+qfU;Sy?2B^dfJ$RjdJL;;vNt2Ka+@O zImt&fYRbJ-1~h(|_Ux__vm()yLUKemwnQ&-(_ay{ZmoH8=Mw^^50T@x)`H0c=JiFH znKWIpe#op?UI=wb-!dVDZlGhJg`2=1SEGh%Sj&KZKkE2d-S#GNwbY1 zD;DHf(I43xrdzg+84+6*4#mWfTWhe!MX@)rK{F?2<0`ldcw_1LHf!Ll3zvA~M^(6Z zcT2h_9!`z(x{n7ycWja8;KnNwcamr>pEg2cU$vg|tFc8-G5kS%hS#Ug1;=!%I8L3F zHxBI`#IzipUHpNL3@}i(emyi0O)Q&L%5pj0rA+wlDU|7UyiZ~) z_($2S+IgKq(Uc7+oM6u?uJc#?HQ`0xVwN-T8`OOo@eDWu4rFF>&KPBM?cVG+MN>`*Py-N*9 z2MN6sg0uhAE~x8{0L8Hw?vq!j@nr zHieU?B_CIo&cOx=OJGj>X}cR46(~=;5%slM_`sKr+LvuUUNz- zb)V!$+obl#z&&W|g{1~>2JpMoWuLk%EzlS~0PnAcmQNX>;PFs|^?=iReep}sI+T3A z-FmpjQ4*v0tK+(v9FlscOj2ejeJS$7U6!jEv0rtXXLez8iv9^lDkjEK$h+UK@2Km7 z#OQ^)FMn%)dtCPzy&{gNpm>IUiGJLuX&m|M68+e1;H)A^!)mj3m4!MmFhZ%oH%J4; zW)7gukdj*R>n+7Um35zdl+>H(d%7uk@w+|UZYZhUfcxXmv2!}LWb6vHgT`_g=t;BQ#4x+w@BgP;6^Y`CH<~psEx$u= zKeD~{r(5Q|OLx?ugI7#04fpdGr6Z}Fqa0gO8QZFJu{Kr%)H|9q@54=1k%@@-%iYhL z-=NvkK-W>F#(NK~{n)v>;@Dqb>y*-OL!CeS z1X6!Z2DLAK)>I{h{RclX>yFl!n7;>X@&2ry!4ti(p{aAqmlHT?esf-hZicXr9Kz2X z3T`ECr)^rMCgvg%aL~l)KUFGXV<6N48cH6GCNVqAqQZD$a>L>(axyeB`OX>dSe>Em zr{6+8-@E84h;i*fNlWVeZN1!Q^#?DN6yp)OLUY%@<@jnbhJ$1TxyAl1P<@(PLZjwQ zKexTJE6qAK2-~ns!_Ig+@JJYbTlkb8FtGZvUjT`c@O1Q@Bm{?@_~Tl8X}W8Pq=18~ z@sW;|%(1SWgSv8x;i4IAuY^})=l9ibjGQ$fTTRCPS3^z|PQ{{8h=bj&B`(8DlB|9E z89BU%8RBq^)LDI)(dL?+e>}ml1)1pMO+ z-OS(^5N$0bul?AJ58_*iTj?+tE`5-e$uk|rKw@MhFjq(s5H1J%i?zG`d{wCR%s8_( zfWOHqe1H|J$3O|97n_W8NKugaQ;f5*jgi>O8MZb%hlLsmL!0248( zMG@PY6S~<9q=sVG#A!+g+c*)8K2?ZdCx;+7QU%)ifu<26L6w{nI>d;4+=E=siW$rn zoy->1Nak4ywN|MmSATSy1Z1iDUlTQLIJi~xY+^GLzif$c%P_N}sSlIplL}lXTzX6% z3GttbhHI|A3^ON^41$`hGptMZ(kdw@cye;ORVHX8!_r5-`k0GZ5*@?te4oR~?jV3Ob4D$**$C%IeD##H>qgH5qE&=aXPV4>{B=jfWa^^? zym$RWR;pz}5=?=M)auiH1~{Z+aK`geuYWBA{F?2jHK0&d+Nj05%Mgq5=-LN}T4Z4= zP55cx_C+X^qH@sQ?U1khy0qLTo~YbI=%Y-2LHXK7u|78GR=qfG0Q}ykuA2YA{I9V~sS}FY4<9?^C@cgqVxQ1*}q{!&nlZlhvMF4}jb~BaV z?I%b78EgNqu@-lxMZSI?6J(`S4^43IhSf-(0j>j?Ro|cQHRA&|l`4 zM|i_1v#fC2Qo)G*4D1ZH^i2Ee&PNpvJ#=xw0~ z=cVgvTs}W-`MspQ_gsFun?auvX8cKb)~Akrd(2&-4>d+-x~2^Hthw%L)|C9bVUOuE zkav!$O-x0%5tDa4A0_huE5c7>nkHRN(dg3K@oY z$JtB)Ee-{@pmu;1ySU4p>_^9ET#C68Nhi)%vjLK`&+=Gnv@~%p)CY7maGK>P%sW7) zrav?%Q#%uxg7YA|h{W>-JnVFffChh|sv%+?$29}r+nL+mc0js503G9Td6#_+ZesQsb>%>b z7Gds$Rt9a8*kD0+)vAd}w_q5l6`{{_i!2c}tKgTD5`7zT=AC(%)5uF?y}V?>zvIzS$Nun_i>sY3`63Z$zHjuGzx6lH41#G z!#iPOJ^B5d!^6XT>flEZ+d}>g+OYfA4nMZU-mpMPtckapnwenA8@lJ0@VnK;D%KpD ziXP!Tk5jeTUMaPan#S9(rl=oE`eTltOGjh0i&3)&Ufao%Z-E>4v#Jq_W5LR-M_w?* zOZ$G+^+AFh0=*8H3Vfw$(orh6*X6hCF9Otls=8H&K0dTqVjCp@8Z|?GJbGlxCW}`9 z%}t*JuONo8g=B~g2l-_kj6tj|J^yxujbk#D5huH~<)b>-@RN4%La#r75Ap zMZH~&>e`i`3VIp@-jB#nMeM6b)}xAk)(cFlGJWh@{raFJPp}Y_(rb2cAeL)PvCi21uMuN+lkLV&%DT?a%hwaTh#ECDM__dg@DKS=|# zcKC{|3N=$Z-L5ykOQkZsixsO)xhjvgt&JD;qrIQj#}_`JF&kk8%MwH82KAF7MVxW6 zI!iq=?XueFu?_`_4HHGotaHjS_iOUBAPJnv-$Rp7zp%6t%l(0(l_{x)!|cL31DQ<6 z3qWkss>9LF%Z;=6F0hzc$zyA5%*5fqB$}Qcy_!~WO&3SnyD#L9`WHTGL-R98u<$Wm z?TIbk9V4B%>s0Gy9j)&oaT|OzDyeC`lBkjwn4QFYJgA>?d1TQ;Kjjv(ZV^m^sLh!= zF*a)H%yiZX^>xd4H7I}E`o36u24Z{@9^9NxR;d-!Jza=mN~I5ONV5JjVz|IxxY#{Ay{Uw6G?RvUDfa&7zV5Y?$STw(R7b~Kn!;6Th6*323*MBA6kWW zM z78N%^UM8m1>r$9++ zIn*I8!X-k;1#7pv!k@ zER@3Lr=ZNcxL8AK9Rxl;oOLn^9ETmbf$jBI4HuNjscEpw@d%H^4L^D!{=lx3R7Afk zXVuw#!!$o-(Fz-fr^nuNALd>`E`MzmkzF+F z75o*&d=d%qm%N_i0`9?IKTd{i@la+A;2 z)WqxlU?_o6t@8{lvQg?JS%jkf8m90V`*r1~AXJ;Qv_6hx2@uQNEx#qABS^k~W4m&8 z_R%?lX6?QSMPzBSz+%^-HO7eGHoGa&3C_MJN0_=)I=y(i388rX;8U~8t;hxaH6&8C znn56l=K!PIz_853#>80@vmwQR@e6!EchJz9u9%voaCk6!p=h_7AaVPdit3Ho=AV_4 zaDGdjPD`M4z^DV(O_X2Ccvn%67CI%C=FS0(B;35vtw#Cenz~ zM+#vdBay6w_oW8DHU~e8t%{^)^##1+-P4F-9LtSGm7}{DBpCZ-mwBF#$?Eh_*k0j1 z6-gR+sJR~&RI^BRBD(OqJ_4^v@1)jraiC$-rM?EybY@MjJbpX#wJb>-8PERGY-N?ASphA*6m8*`w-el8IBkzV z-*8}<7g!+`6AaUCQSWs35L$(kKe|rb>{L)xFKs5d;t-6&VLn? z41#GN6Ypx5(nF9OcF&$hJ7su+RXT6IX_M{I=mZx?PXNX@ws?iCntc~fZv^YJU(?dC zF0;c)vf7sx?)h7%MSc*a^St}Pewd5LHxN_` zwSRzC4GKajlv&x*YM)4rb^?=v zIY_PLsyL0W9fwb_rPV@9fn$3TAQ&+X-bf>$JHzfY-V{spntHV3PS}__leO_?S%{5s zrGT@&@Z`_MF7{@(1%z~&Z_7h-32i#LQi)lV>jp1@?OLnudszJJvNqh2F86IIF3+dK zms?+0PLiFZ9=V+(-XUt|D5A@ZWJl>6qq4BsVmHHuj0NG@v7@X{xu`xqQqIkKb$5?>fADX2kdIJm{SH8UX)6vmhZ4=goLZvTICF&F83-raxps; zI8PPt=}$~dqqXJA=D)f*41PvTV}2TwP4VQMzLbhlT8n~vcFCY}=j>O|@PjMLRn*>( z48Gm&U5(&}k#+{dHR@&pm||i<6q@%yh9vlmwNZ1q_whaJj3PFl1iT)IzfUV_K$cpY z7nnwAsTS_yuxyp@K+XDrzp-9Y_a9NLJF>-gp!S<=V8Wn+4$vR6G5tk0TN~v>4gRue zdheQ{I`Hv>o4u|}@M73sr>(_-rrbF@FK;uo_cDJyk}jVA(ESYiVRtLV4BN%5as;Vx z{N>2^rVgRI$y_=|7^mm}qIe#c7A`jwn28T(YU2r<< zldRsbkHKz|!dUyqB(UwxHvAY_Vp$~JC`|V$-Z0U=Gl8C$x+>bUk?E)+m`&6`>R~Fa zL#Em-P1KLV0%|F@5bEufLf|7(>D&?`^0@ru8kD15>x^|Xz60Mcegp%L&`gV#ZL?{XS(&d5ZC{y0C0Z-YPQMMd z+Gg#{$n-@P8xx*hk}~6qZ?LS^cKRR*QG2KJeEMPN!n2_>mc3zZKchDQ26d>s|3xFr zv;WeF<#j}Amc=g{u+$JhpgA0jz9>KDlOi4c-bX3WX>rzxE3QWsCW~WnA~Bmvh9{ZA zk)juUDoMdgTFyA8^L|O zN};%rYjt1Z*)xHoOCv%<>J_kDCd{Gr?hj?0mx57U&@CX;Vm-OoXwLazqOz9^xyg(x69{Xep}Q0BOsbXc{t zH@}JtE~dy&Ugk@84sQOxfa0O}{{V{e4$OZzaX4ELJ7o7$H-{xos`7XRL!cR78zF?1 zz}#e)I6oJ1d(ASuA!_DZ?4_S5`vh|N&e=H7_^6C;}Q&WM>|cuOolFn{O0TKWh_ zWDuDwN!uHka7ro)X7AL?{bsl=^B8))i;ElF;zFN@&nHL2O!Yb8cDG}MniU*9nXQmY z;}ah-rVY7x4-F?lX5W58n?H+87T#j5h%6_Vd>5BoR=Q_bEdk-xm^;c8=pue{{npRH z>HePoA6ZnjJKUtE(qyaMT1;I{gq+MBms+fv2tyKLY@b}qC;uW924>^EZXBk=6oO$k zSNE8~helWq%4@AW%oX@rjKeeYiY_5CQ!#=9454}n-)NtHlg^8&Zv^x~iI_N=agJ<4yF2^=TKGvLAX%m=x5R%zM zEi(}5lU}}N#u8{Cnr$cZv9m>T$88Ppp1u=uDnj((VwSwheh{ID@}xil7lSOl;jWTv z&s7)*KAbB-kPd5dX=A;uDz@g^6JMxKBanGr7O9^r>!MwhR^EO z%r>)91voD~N%I#?A0aoFWPYZ$@iXGE!E)V;isQFS$F^eR(5Y0ZKKVR-EGE7k$hrCWu%?&qd=#30G)o=f098IfhZ9|h%vHjBW|eMjewCMo zv#!o4^#d53`JN#^1c*nR=TfC1Mb7X>d0z(g3&XFum%pI!qmhhB!b#W zo!FI*^NklOrf-ILd>tf)8=lzT-;{?pL7EYtr9^{O?>=fNd96acGC%H@2nAPO2ay== zon9*aHbf4vKd^o*RK0Dy$efU_Y%Z#)mC!|BQO}=VP{rs}B%*k7^jm`(w2UL8I~t}I zSB2&v&r?Qk4s#18NU?};EMER4Nt{H6*k8!eU$Z`S`uvb=t639e&tO4c@Eg{(IGqJ_ znv>Xb7s0|YUcyy0g_c#Vhi-LVo@9>s@fNB=R-I((bYNNq*k4Eo^awOw|3^v_Klkom z0Y&6rMXAmbE#$BTcwi|sI6+qjYyg0aobUOg3^mM z9(gEHe%qz0vS*gsiJl&^HpZ$57o64G@rkqM-JJhh)=3)@mM}aPf8E>QOtPeO!Hj8W z^{gqBTXFV+Az2G!m+0w;bt?`}r3eGD6ICU0+)S!s0g4^Jh`r!lmNAMxR6tY%NVkG%bAVzrK=O2OBk* zV)!NiizaTl)NoC1&CpL?uC}j^JWu2Yf|GlBemf1vY0Q)3^#P3*7U117I9AosNF?vi z#Bu<^v6F>dbMTMS8_PlSr7$R62MGiMuU08Ds_y=Om zWBH%@CcS#UHGHHuEH3l;zP-JP?W^WGHLEkPUYr}MtEWMZ3Rl(4Tr_G%+->UW0`o{@ zwO=5vmrHs6QU4kRD(4h?QHmGKO>C<+g(buS-Ft*!KNAEd^hT+T>U!jJdO)!h=)dOAMk&shtU6u9{iX8e#hOf uX*@6dkH$aK_K%SNKi@9^LQphOzYi=woxMsi^tUV+46mD9E77%i`TqczgmMi4 literal 0 HcmV?d00001 -- Gitee From 5b63ab55cfaafa0ea8948e108058846ff0da29b1 Mon Sep 17 00:00:00 2001 From: NEU-lab <2942375747@qq.com> Date: Tue, 22 Oct 2024 11:30:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9HPKCHECK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: NEU-lab <2942375747@qq.com> --- thirdparty/squirrel-3.2/HPKCHECK | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/thirdparty/squirrel-3.2/HPKCHECK b/thirdparty/squirrel-3.2/HPKCHECK index ba067b02..9cb8be35 100644 --- a/thirdparty/squirrel-3.2/HPKCHECK +++ b/thirdparty/squirrel-3.2/HPKCHECK @@ -20,25 +20,27 @@ logfile=${LYCIUM_THIRDPARTY_ROOT}/${pkgname}/${pkgname}_${ARCH}_${OHOS_SDK_VER}_ # 在OH环境执行测试的接口 openharmonycheck() { res=0 - cd ${builddir}/${ARCH}-build/bin # 进入到对应架构目录下的/bin目录,里面放置了sq二进制文件 - #该库没有测试用例,因此执行一个demo:该库根目录下sample文件夹里放有符合squirrel语法的.nut文件,执行一个名为hello的.nut文件,输出结果为:Hello World! - ./sq /data/tpc_c_cplusplus/thirdparty/squirrel-3.2/squirrel-3.2/samples/hello.nut > $logfile 2>&1 + cd ${builddir}/${ARCH}-build/bin # 进入到对应架构目录下的/bin目录,里面放置了sq二进制文件 + # 该库没有测试用例,因此执行一个demo:该库根目录下sample文件夹里放有符合squirrel语法的.nut文件,执行一个名为hello的.nut文件,输出结果为:Hello World! + ./sq /data/tpc_c_plusplus/thirdparty/squirrel-3.2/squirrel-3.2/samples/hello.nut > $logfile 2>&1 res=$? - - if [ $res -ne 0 ];then - mkdir -p ${LYCIUM_FAULT_PATH}/${pkgname} # 确保失败日志目录存在 - cp $logfile ${LYCIUM_FAULT_PATH}/${pkgname}/failed_test_log.log # 将日志文件拷贝到失败目录 - res=1 - else + # 检查是否有输出 + if [ -s $logfile ]; then # 检查日志文件中是否包含 "Hello World!" if grep -q "Hello World!" $logfile; then echo "Test passed: 'Hello World!' found in the log." >> $logfile else echo "Test failed: 'Hello World!' not found in the log." >> $logfile - mkdir -p ${fail_log_dir} - cp $logfile ${fail_log_dir}/failed_test_log.log + mkdir -p ${LYCIUM_FAULT_PATH}/${pkgname} + cp $logfile ${LYCIUM_FAULT_PATH}/${pkgname}/failed_test_log.log res=1 fi + else + # 若无输出,则测试失败 + echo "Test failed: No output from the test." >> $logfile + mkdir -p ${LYCIUM_FAULT_PATH}/${pkgname} + cp $logfile ${LYCIUM_FAULT_PATH}/${pkgname}/failed_test_log.log # 将日志文件拷贝到失败目录 + res=1 fi cd $OLDPWD return $res -- Gitee From 667d55530aee9cc097d95227d335e1205cc2d5e8 Mon Sep 17 00:00:00 2001 From: NEU-lab <2942375747@qq.com> Date: Tue, 29 Oct 2024 16:57:13 +0800 Subject: [PATCH 3/6] 1 Signed-off-by: NEU-lab <2942375747@qq.com> --- thirdparty/squirrel-3.2/docs/hap_integrate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/squirrel-3.2/docs/hap_integrate.md b/thirdparty/squirrel-3.2/docs/hap_integrate.md index 5f2731f5..bd8b3755 100644 --- a/thirdparty/squirrel-3.2/docs/hap_integrate.md +++ b/thirdparty/squirrel-3.2/docs/hap_integrate.md @@ -47,7 +47,7 @@ ## 应用中使用三方库 -- 在IDE的cpp目录下新增thirdparty目录,将编译生成的头文件拷贝到该目录下,将编译生成的三方库以及依赖库全部(动态库名字带版本号和不带版本号的都需要)拷贝到工程的libs目录下,如下图所示: +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的头文件和库文件拷贝到该目录下,将编译生成的三方库以及依赖库全部(动态库名字带版本号和不带版本号的都需要)拷贝到工程的libs目录下,如下图所示:    ![thirdparty_install_dir](pic/squirrel_install_dir.png) -- Gitee From 522c08c503423d9348a0f39fa606dec28c2c6ae9 Mon Sep 17 00:00:00 2001 From: NEU-lab <2942375747@qq.com> Date: Wed, 30 Oct 2024 20:26:08 +0800 Subject: [PATCH 4/6] change HPKCHECK Signed-off-by: NEU-lab <2942375747@qq.com> --- thirdparty/squirrel-3.2/HPKCHECK | 12 +++++++----- thirdparty/squirrel-3.2/docs/hap_integrate.md | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/thirdparty/squirrel-3.2/HPKCHECK b/thirdparty/squirrel-3.2/HPKCHECK index 9cb8be35..812f3de8 100644 --- a/thirdparty/squirrel-3.2/HPKCHECK +++ b/thirdparty/squirrel-3.2/HPKCHECK @@ -22,7 +22,7 @@ openharmonycheck() { res=0 cd ${builddir}/${ARCH}-build/bin # 进入到对应架构目录下的/bin目录,里面放置了sq二进制文件 # 该库没有测试用例,因此执行一个demo:该库根目录下sample文件夹里放有符合squirrel语法的.nut文件,执行一个名为hello的.nut文件,输出结果为:Hello World! - ./sq /data/tpc_c_plusplus/thirdparty/squirrel-3.2/squirrel-3.2/samples/hello.nut > $logfile 2>&1 + ./sq ../../samples/hello.nut > $logfile 2>&1 res=$? # 检查是否有输出 if [ -s $logfile ]; then @@ -31,17 +31,19 @@ openharmonycheck() { echo "Test passed: 'Hello World!' found in the log." >> $logfile else echo "Test failed: 'Hello World!' not found in the log." >> $logfile - mkdir -p ${LYCIUM_FAULT_PATH}/${pkgname} - cp $logfile ${LYCIUM_FAULT_PATH}/${pkgname}/failed_test_log.log res=1 fi else # 若无输出,则测试失败 echo "Test failed: No output from the test." >> $logfile - mkdir -p ${LYCIUM_FAULT_PATH}/${pkgname} - cp $logfile ${LYCIUM_FAULT_PATH}/${pkgname}/failed_test_log.log # 将日志文件拷贝到失败目录 res=1 fi + + #保存测试失败日志 + if [ $res -ne 0 ]; then + mkdir -p ${LYCIUM_FAULT_PATH}/${pkgname} + cp Testing/Temporary/LastTest.log ${LYCIUM_FAULT_PATH}/${pkgname}/test_failed.log + fi cd $OLDPWD return $res } \ No newline at end of file diff --git a/thirdparty/squirrel-3.2/docs/hap_integrate.md b/thirdparty/squirrel-3.2/docs/hap_integrate.md index bd8b3755..822d6128 100644 --- a/thirdparty/squirrel-3.2/docs/hap_integrate.md +++ b/thirdparty/squirrel-3.2/docs/hap_integrate.md @@ -47,7 +47,7 @@ ## 应用中使用三方库 -- 在IDE的cpp目录下新增thirdparty目录,将编译生成的头文件和库文件拷贝到该目录下,将编译生成的三方库以及依赖库全部(动态库名字带版本号和不带版本号的都需要)拷贝到工程的libs目录下,如下图所示: +- 在IDE的cpp目录下新增thirdparty目录,将编译生成的头文件和库文件拷贝到该目录下,将编译生成的动态库(动态库名字带版本号和不带版本号的都需要)拷贝到工程的libs目录下,如下图所示:    ![thirdparty_install_dir](pic/squirrel_install_dir.png) @@ -67,7 +67,7 @@ 执行结果如图所示: ```shell cd /data/tpc_c_cplusplus/thirdparty/squirrel-3.2/squirrel-3.2/arm64-v8a-build/bin - ./sq /data/tpc_c_cplusplus/thirdparty/squirrel-3.2/squirrel-3.2/samples/hello.nut + ./sq ../../samples/hello.nut ```  ![squirrel_test](pic/squirrel_test.png) -- Gitee From e7327210f69aaf7fa031572428b6960810f484d1 Mon Sep 17 00:00:00 2001 From: NEU-lab <2942375747@qq.com> Date: Thu, 31 Oct 2024 10:48:08 +0800 Subject: [PATCH 5/6] png Signed-off-by: NEU-lab <2942375747@qq.com> --- .../squirrel-3.2/docs/pic/squirrel_test.png | Bin 8624 -> 8142 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/thirdparty/squirrel-3.2/docs/pic/squirrel_test.png b/thirdparty/squirrel-3.2/docs/pic/squirrel_test.png index 4d295ddb178a5683bb02a5808226125d3131b700..eb68dede8d73a653cde1f4063fd377ac0916e93d 100644 GIT binary patch literal 8142 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 literal 8624 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 -- Gitee From e319cba55ff0de4c82cf96578862d1ecc010adfc Mon Sep 17 00:00:00 2001 From: NEU-lab <2942375747@qq.com> Date: Tue, 5 Nov 2024 16:45:19 +0800 Subject: [PATCH 6/6] name change Signed-off-by: NEU-lab <2942375747@qq.com> --- thirdparty/{squirrel-3.2 => squirrel}/HPKBUILD | 2 +- thirdparty/{squirrel-3.2 => squirrel}/HPKCHECK | 0 .../{squirrel-3.2 => squirrel}/README.OpenSource | 2 +- thirdparty/{squirrel-3.2 => squirrel}/README_zh.md | 2 +- thirdparty/{squirrel-3.2 => squirrel}/SHA512SUM | 0 .../docs/hap_integrate.md | 6 +++--- .../docs/pic/squirrel_install_dir.png | Bin .../docs/pic/squirrel_test.png | Bin 8 files changed, 6 insertions(+), 6 deletions(-) rename thirdparty/{squirrel-3.2 => squirrel}/HPKBUILD (98%) rename thirdparty/{squirrel-3.2 => squirrel}/HPKCHECK (100%) rename thirdparty/{squirrel-3.2 => squirrel}/README.OpenSource (93%) rename thirdparty/{squirrel-3.2 => squirrel}/README_zh.md (91%) rename thirdparty/{squirrel-3.2 => squirrel}/SHA512SUM (100%) rename thirdparty/{squirrel-3.2 => squirrel}/docs/hap_integrate.md (94%) rename thirdparty/{squirrel-3.2 => squirrel}/docs/pic/squirrel_install_dir.png (100%) rename thirdparty/{squirrel-3.2 => squirrel}/docs/pic/squirrel_test.png (100%) diff --git a/thirdparty/squirrel-3.2/HPKBUILD b/thirdparty/squirrel/HPKBUILD similarity index 98% rename from thirdparty/squirrel-3.2/HPKBUILD rename to thirdparty/squirrel/HPKBUILD index 573008a1..49018ddc 100644 --- a/thirdparty/squirrel-3.2/HPKBUILD +++ b/thirdparty/squirrel/HPKBUILD @@ -14,7 +14,7 @@ # Contributor: wangjialun <2271411@stu.neu.edu.cn>, zhangqian<2371418@stu.neu.edu.cn>, wangyihao<2942375747@qq.com> , wangying # Maintainer: wangyihao<2471389@stu.neu.edu.cn>, wangjialun<2271411@stu.neu.edu.cn>, zhangqian<2371418@stu.neu.edu.cn>, wangying -pkgname=squirrel-3.2 +pkgname=squirrel pkgver=v3.2 pkgrel=0 pkgdesc="Squirrel is a lightweight programming language commonly used for game development and application scripting,which is simpler and easier to embed into applications than C." diff --git a/thirdparty/squirrel-3.2/HPKCHECK b/thirdparty/squirrel/HPKCHECK similarity index 100% rename from thirdparty/squirrel-3.2/HPKCHECK rename to thirdparty/squirrel/HPKCHECK diff --git a/thirdparty/squirrel-3.2/README.OpenSource b/thirdparty/squirrel/README.OpenSource similarity index 93% rename from thirdparty/squirrel-3.2/README.OpenSource rename to thirdparty/squirrel/README.OpenSource index 9bea07fa..9cde41c5 100644 --- a/thirdparty/squirrel-3.2/README.OpenSource +++ b/thirdparty/squirrel/README.OpenSource @@ -1,6 +1,6 @@ [ { - "Name": "squirrel-3.2", + "Name": "squirrel", "License": "MIT license", "License File": "https://github.com/albertodemichelis/squirrel/blob/master/COPYRIGHT", "Version Number": "v3.2", diff --git a/thirdparty/squirrel-3.2/README_zh.md b/thirdparty/squirrel/README_zh.md similarity index 91% rename from thirdparty/squirrel-3.2/README_zh.md rename to thirdparty/squirrel/README_zh.md index db3a03be..39d3a765 100644 --- a/thirdparty/squirrel-3.2/README_zh.md +++ b/thirdparty/squirrel/README_zh.md @@ -1,4 +1,4 @@ -# squirrel-3.2三方库说明 +# squirrel三方库说明 ## 功能简介 Squirrel是一种轻量级的编程语言,通常用于游戏开发和应用程序的脚本编写,比C语言更简单,更易于嵌入到应用程序中。 ## 三方库版本: diff --git a/thirdparty/squirrel-3.2/SHA512SUM b/thirdparty/squirrel/SHA512SUM similarity index 100% rename from thirdparty/squirrel-3.2/SHA512SUM rename to thirdparty/squirrel/SHA512SUM diff --git a/thirdparty/squirrel-3.2/docs/hap_integrate.md b/thirdparty/squirrel/docs/hap_integrate.md similarity index 94% rename from thirdparty/squirrel-3.2/docs/hap_integrate.md rename to thirdparty/squirrel/docs/hap_integrate.md index 822d6128..6797a3db 100644 --- a/thirdparty/squirrel-3.2/docs/hap_integrate.md +++ b/thirdparty/squirrel/docs/hap_integrate.md @@ -17,7 +17,7 @@ - 三方库目录结构 ```shell - tpc_c_cplusplus/thirdparty/squirrel-3.2 #三方库squirrel-3.2的目录结构如下 + tpc_c_cplusplus/thirdparty/squirrel #三方库squirrel的目录结构如下 ├── docs #三方库相关文档的文件夹 ├── HPKBUILD #构建脚本 ├── HPKCHECK #测试脚本 @@ -32,7 +32,7 @@ ```shell cd lycium - ./build.sh squirrel-3.2 + ./build.sh squirrel ``` - 三方库头文件及生成的库 @@ -40,7 +40,7 @@ 在lycium目录下会生成usr目录,该目录下存在已编译完成的32位和64位三方库 ```shell - squirrel-3.2/arm64-v8a squirrel-3.2/armeabi-v7a + squirrel/arm64-v8a squirrel/armeabi-v7a ``` - [测试三方库](#测试三方库) diff --git a/thirdparty/squirrel-3.2/docs/pic/squirrel_install_dir.png b/thirdparty/squirrel/docs/pic/squirrel_install_dir.png similarity index 100% rename from thirdparty/squirrel-3.2/docs/pic/squirrel_install_dir.png rename to thirdparty/squirrel/docs/pic/squirrel_install_dir.png diff --git a/thirdparty/squirrel-3.2/docs/pic/squirrel_test.png b/thirdparty/squirrel/docs/pic/squirrel_test.png similarity index 100% rename from thirdparty/squirrel-3.2/docs/pic/squirrel_test.png rename to thirdparty/squirrel/docs/pic/squirrel_test.png -- Gitee