!6 请求将distributeddatamgr_data_object合入next分支

From: @zxstty 
Reviewed-by: @yukaii 
Signed-off-by: @yukaii
This commit is contained in:
openeuler-ci-bot 2023-12-12 08:04:50 +00:00 committed by Gitee
commit bfadedd714
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 49 additions and 37 deletions

View File

@ -1,25 +1,33 @@
%define debug_package %{nil} %define debug_package %{nil}
%global oh_version OpenHarmony-v3.2-Release %global oh_version OpenHarmony-v3.2-Release
%global distributeddatamgr_dir %{_builddir}/foundation/distributeddatamgr/ %global distributeddata_dir %{_builddir}/foundation/distributeddatamgr/
%global build_opt /opt/distributed-middleware-build %global build_opt /opt/distributed-middleware-build
%global bundle_dir %{build_opt}/openeuler/compiler_gn/foundation/distributeddatamgr/data_object %global bundle_dir %{build_opt}/openeuler/compiler_gn/foundation/distributeddatamgr/data_object
Name: distributeddatamgr_data_object Name: distributeddatamgr_data_object
Version: 1.0.0 Version: 1.0.0
Release: 2 Release: 3
Summary: Distributed Data Object Management Framework Summary: Distributed Data Object Management Framework
License: Apache-2.0 License: Apache-2.0
Url: https://gitee.com/openharmony/distributeddatamgr_data_object Url: https://gitee.com/openharmony/distributeddatamgr_data_object
Source0: https://gitee.com/openharmony/distributeddatamgr_data_object/repository/archive/OpenHarmony-v3.2-Release.tar.gz#/distributeddatamgr_data_object-OpenHarmony-v3.2-Release.tar.gz Source1: https://gitee.com/openharmony/distributeddatamgr_data_object/repository/archive/OpenHarmony-v3.2-Release.tar.gz#/distributeddatamgr_data_object-OpenHarmony-v3.2-Release.tar.gz
Source1: distributeddataobject_impl.BUILD.gn Source2: distributeddataobject_impl.BUILD.gn
Source2: bundle.json Source3: bundle.json
Patch0: 0001-Trim-the-dependencies-on-hitrace-libuv.patch Patch1: 0001-Trim-the-dependencies-on-hitrace-libuv.patch
BuildRequires: libatomic libicu-devel libxml2-devel openssl-devel BuildRequires: libboundscheck
BuildRequires: distributed-build distributed-build_lite hilog distributed-utils BuildRequires: distributed-build, hilog, commonlibrary_c_utils
BuildRequires: communication_ipc, communication_dsoftbus
BuildRequires: systemabilitymgr_safwk, systemabilitymgr_samgr
BuildRequires: distributedhardware_device_manager
BuildRequires: distributeddatamgr_kv_store BuildRequires: distributeddatamgr_kv_store
Requires: hilog distributed-utils distributeddatamgr_kv_store distributeddatamgr_datamgr_service Requires: libboundscheck
Requires: hilog, commonlibrary_c_utils
Requires: communication_ipc, communication_dsoftbus
Requires: systemabilitymgr_safwk, systemabilitymgr_samgr
Requires: distributedhardware_device_manager
Requires: distributeddatamgr_kv_store, distributeddatamgr_datamgr_service
%description %description
The object-oriented memory data management framework provides application The object-oriented memory data management framework provides application
@ -31,50 +39,52 @@ Developers can easily use distributed object interfaces for object synchronizati
%prep %prep
rm -rf %{_builddir}/* rm -rf %{_builddir}/*
cd %{_builddir} cp -rf %{build_opt} %{_builddir}/build
cp -rp %{build_opt} %{_builddir}/build ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh
[ ! -L "%{_builddir}/build.sh" ] && ln -s %{_builddir}/build/build_scripts/build.sh %{_builddir}/build.sh ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn
[ ! -L "%{_builddir}/.gn" ] && ln -s %{_builddir}/build/core/gn/dotfile.gn %{_builddir}/.gn ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py
[ ! -L "%{_builddir}/build.py" ] && ln -s %{_builddir}/build/lite/build.py %{_builddir}/build.py cp -rf %{_builddir}/build/openeuler/vendor %{_builddir}/
mv build/openeuler/vendor %{_builddir}/ cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}
%setup -q -T -a 0 -c -n %{distributeddatamgr_dir}
mv %{distributeddatamgr_dir}%{name}-%{oh_version} %{distributeddatamgr_dir}data_object %setup -q -D -T -a 1 -c -n %{distributeddata_dir}
%patch0 -p1 -d %{distributeddatamgr_dir}data_object if [ -d "%{distributeddata_dir}/data_object" ]; then
cp -rf %{_builddir}/build/openeuler/compiler_gn/* %{_builddir}/ rm -rf %{distributeddata_dir}/data_object
fi
mv %{distributeddata_dir}/%{name}-%{oh_version} %{distributeddata_dir}/data_object
%patch -P1 -p1 -d %{distributeddata_dir}data_object
%build %build
cd %{_builddir}
rm -rf %{_builddir}/out
%ifarch x86_64 %ifarch x86_64
./build.sh --product-name openeuler --target-cpu x86_64 %{_builddir}/build.sh --product-name openeuler --target-cpu x86_64
%endif %endif
%ifarch aarch64 %ifarch aarch64
./build.sh --product-name openeuler --target-cpu arm64 %{_builddir}/build.sh --product-name openeuler --target-cpu arm64
%endif %endif
%install %install
install -d -m 0755 %{buildroot}%{_includedir}/data_object install -d -m 0755 %{buildroot}/%{_includedir}/data_object
install -d -m 0755 %{buildroot}%{_libdir} install -d -m 0755 %{buildroot}/%{_libdir}
install -d -m 0755 %{buildroot}%{bundle_dir}/interfaces/innerkits install -d -m 0755 %{buildroot}/%{bundle_dir}/interfaces/innerkits
install -d -m 0755 %{buildroot}/system/lib64 install -d -m 0755 %{buildroot}/system/lib64
cp -f %{SOURCE1} %{buildroot}/%{bundle_dir}/interfaces/innerkits/BUILD.gn cp %{SOURCE2} %{buildroot}/%{bundle_dir}/interfaces/innerkits/BUILD.gn
cp -f %{SOURCE2} %{buildroot}/%{bundle_dir}/ cp %{SOURCE3} %{buildroot}/%{bundle_dir}/
%ifarch aarch64 %ifarch aarch64
module_out_path="out/openeuler/linux_clang_arm64/distributeddatamgr/data_object" %define lib_out_path out/openeuler/linux_clang_arm64/distributeddatamgr/data_object
header_out_path="out/openeuler/innerkits/linux-arm64/data_object" %define header_out_path out/openeuler/innerkits/linux-arm64/data_object
%endif %endif
%ifarch x86_64 %ifarch x86_64
module_out_path="out/openeuler/linux_clang_x86_64/distributeddatamgr/data_object" %define lib_out_path out/openeuler/linux_clang_x86_64/distributeddatamgr/data_object
header_out_path="out/openeuler/innerkits/linux-x86_64/data_object" %define header_out_path out/openeuler/innerkits/linux-x86_64/data_object
%endif %endif
install -m 0755 %{_builddir}/${module_out_path}/*.so %{buildroot}%{_libdir} install -m 0755 %{_builddir}/%{lib_out_path}/*.so %{buildroot}/%{_libdir}
install -m 0755 %{_builddir}/${module_out_path}/*.so %{buildroot}/system/lib64 install -m 0755 %{_builddir}/%{lib_out_path}/*.so %{buildroot}/system/lib64
find %{_builddir}/${header_out_path} -name *.h -print0 | xargs -0 -i cp -rf {} %{buildroot}%{_includedir}/data_object/ find %{_builddir}/%{header_out_path} -name *.h -print0 | xargs -0 -i cp -rf {} %{buildroot}%{_includedir}/data_object/
pushd %{_builddir}/foundation/distributeddatamgr/data_object pushd %{_builddir}/foundation/distributeddatamgr/data_object
for include_file in `find . \( -name test -o -name jskitsimpl \) -prune -o -name "*.h" -type f` for include_file in `find . \( -name test -o -name jskitsimpl \) -prune -o -name "*.h" -type f`
@ -86,7 +96,6 @@ do
done done
popd popd
%files %files
%{_libdir}/*.so %{_libdir}/*.so
%{_includedir}/data_object/* %{_includedir}/data_object/*
@ -94,6 +103,9 @@ popd
/system/* /system/*
%changelog %changelog
* Tue Nov 21 2023 Peng He <hepeng68@huawei.com> - 1.0.0-3
- Update build requires and requires.
* Thu Aug 03 2023 Peng He <hepeng68@huawei.com> - 1.0.0-2 * Thu Aug 03 2023 Peng He <hepeng68@huawei.com> - 1.0.0-2
- Add requires and rectify the contents of the RPM package. - Add requires and rectify the contents of the RPM package.

View File

@ -15,7 +15,7 @@ import("//build/ohos.gni")
config("objectstore_public_config") { config("objectstore_public_config") {
visibility = [ ":*" ] visibility = [ ":*" ]
include_dirs = [ "." ] include_dirs = [ "/usr/include/data_object" ]
libs = [ "distributeddataobject_impl.z" ] libs = [ "distributeddataobject_impl.z" ]
} }