Build plugin if there's build flag 17/242917/1
authorYu <jiung.yu@samsung.com>
Wed, 2 Sep 2020 02:50:55 +0000 (11:50 +0900)
committerYu <jiung.yu@samsung.com>
Wed, 2 Sep 2020 02:51:05 +0000 (11:51 +0900)
Change-Id: If747d01953e69c02ca5202d087735d011f6346b8
Signed-off-by: Yu jiung <jiung.yu@samsung.com
CMakeLists.txt
packaging/uwb-manager.spec
tests/mocks/mock_plugin_dwm1001.c

index 932465c..bb08890 100644 (file)
@@ -36,3 +36,6 @@ ADD_DEFINITIONS("-DUSE_DLOG")
 ADD_SUBDIRECTORY(interface)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(tests)
+IF(BUILD_PLUGIN)
+ADD_SUBDIRECTORY(plugin/dwm1001)
+ENDIF(BUILD_PLUGIN)
index a9df878..abdf8c9 100644 (file)
@@ -13,6 +13,9 @@ BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(paho-mqtt-c)
+%if 0%{?build_plugin:1}
+BuildRequires:  pkgconfig(dwm1001-host-api)
+%endif
 Source1:       dbus-uwb-manager.conf
 Source2:       org.tizen.uwb.service
 Source3:       uwb-manager.service
@@ -32,6 +35,16 @@ BuildRequires:  pkgconfig(gmock)
 %description -n uwb-manager-tests
 UWB manager test program
 
+%if 0%{?build_plugin:1}
+%package -n uwb-plugin-dwm1001
+Summary:    UWB plugin for decawave dwm1001
+Group:      Network & Connectivity/Wireless
+Requires:   %{name} = %{version}-%{release}
+
+%description -n uwb-plugin-dwm1001
+UWB manager plugin for decawave dwm1001 board
+%endif
+
 %prep
 %setup -q
 
@@ -61,7 +74,7 @@ export LDFLAGS+=" -lgcov"
        -DLIB_DIR=%{_libdir} \
        -DBIN_DIR=%{_bindir} \
        -DTZ_SYS_RO_ETC=%{TZ_SYS_RO_ETC} \
-       -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \
+       -DBUILD_PLUGIN=%{?build_plugin:1}%{!?build_plugin:0}
 
 make %{?_smp_mflags}
 
@@ -99,3 +112,11 @@ cp uwb-manager.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/uwb-manager.conf
 %defattr(-,root,root,-)
 %{_libdir}/mock_plugin.so
 %attr(500,root,root) %{_bindir}/%{name}-gtest
+
+%if 0%{?build_plugin:1}
+%files -n uwb-plugin-dwm1001
+%manifest uwb-plugin-dwm1001.manifest
+%license LICENSE
+%defattr(-,network_fw,network_fw,-)
+%{_libdir}/uwb-plugin-dwm1001.so
+%endif
index fd9964c..e195f9d 100644 (file)
@@ -367,7 +367,7 @@ int uwb_dwm1001_get_configurations(uint16_t node_id, GVariant **configurations)
        return ret;
 }
 
-int uwb_dwm1001_set_position(uint16_t node_id, int x, int y, int z)
+int uwb_dwm1001_set_position(uint64_t node_id, int x, int y, int z)
 {
        retv_if(node_id == 0, -1);
        retv_if(!dwm1001_ctx.is_enable, -1);