apply smack rule and make resource samples package

Change-Id: Ib98fa2130700ce8dc33c9216c0c9a82147ff8dde
Signed-off-by: Minchul Lee <slotus.lee@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/2442
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Ossama Othman <ossama.othman@intel.com>
Reviewed-by: Patrick Lankswert <patrick.lankswert@intel.com>

diff --git a/resource/SConscript b/resource/SConscript
index 7d34a3d..6a189b2 100644 (file)
--- a/resource/SConscript
+++ b/resource/SConscript
@@ -55,7 +55,7 @@ if target_os not in ['arduino','darwin','ios']:
        # Build liboc
        SConscript('src/SConscript')
 
-if target_os not in ['arduino','darwin','ios','android','tizen']:
+if target_os not in ['arduino','darwin','ios','android']:
        # Build examples
        SConscript('examples/SConscript')
 

diff --git a/tools/tizen/iotivity-test.manifest b/tools/tizen/iotivity-test.manifest
new file mode 100644 (file)
index 0000000..4030dc1
--- /dev/null
+++ b/tools/tizen/iotivity-test.manifest
@@ -0,0 +1,15 @@
+<manifest>
+       <define>
+               <domain name="iotivity-test" />
+               <permit>
+                       <smack permit="system::use_internet" type="w" />
+               </permit>
+               <request>
+                       <smack request="system::use_internet" type="w" />
+                       <smack request="connman::get" type="w" />
+               </request>
+       </define>
+       <request>
+               <domain name="iotivity-test" />
+       </request>
+</manifest>

diff --git a/tools/tizen/iotivity.manifest b/tools/tizen/iotivity.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/tools/tizen/iotivity.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
index c1bccd4..a5ee51b 100644 (file)
--- a/tools/tizen/iotivity.spec
+++ b/tools/tizen/iotivity.spec
@@ -6,7 +6,8 @@ Group: System Environment/Libraries
 License: Apache-2.0
 URL: https://www.iotivity.org/
 Source0: %{name}-%{version}.tar.bz2
-
+Source1001: %{name}.manifest
+Source1002: %{name}-test.manifest
 BuildRequires: gettext, expat-devel
 BuildRequires: python, libcurl-devel
 BuildRequires: scons
@@ -38,6 +39,15 @@ Requires: %{name} = %{version}-%{release}
 The %{name}-service package contains service libraries files for
 developing applications that use %{name}-service.
 
+%package test
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description test
+The %{name}-test package contains example files to show
+how the iotivity works using %{name}-test
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -50,6 +60,12 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
+%if 0%{?tizen_version_major} < 3
+cp %{SOURCE1002} .
+%else
+cp %{SOURCE1001} ./%{name}-test.manifest
+%endif
 
 %build
 %define RPM_ARCH %{_arch}
@@ -86,6 +102,26 @@ mkdir -p %{buildroot}%{_bindir}
 %define build_mode debug
 %endif
 
+cp out/tizen/*/%{build_mode}/resource/examples/devicediscoveryclient %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/devicediscoveryserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/fridgeclient %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/fridgeserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/garageclient %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/garageserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/groupclient %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/groupserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/lightserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/presenceclient %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/presenceserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/roomclient %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/roomserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/simpleclient %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/simpleclientHQ %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/simpleclientserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/simpleserver %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/simpleserverHQ %{buildroot}%{_bindir}
+cp out/tizen/*/%{build_mode}/resource/examples/threadingsample %{buildroot}%{_bindir}
+
 cp out/tizen/*/%{build_mode}/lib*.so %{buildroot}%{_libdir}
 cp out/tizen/*/%{build_mode}/libSSMSDK.a %{buildroot}%{_libdir}
 cp out/tizen/*/%{build_mode}/libppm.a %{buildroot}%{_libdir}
@@ -106,6 +142,7 @@ cp service/protocol-plugin/plugin-manager/src/*.h %{buildroot}%{_includedir}
 %postun -p /sbin/ldconfig
 
 %files
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/liboc.so
 %{_libdir}/liboc_logger.so
@@ -114,13 +151,13 @@ cp service/protocol-plugin/plugin-manager/src/*.h %{buildroot}%{_includedir}
 %{_libdir}/libconnectivity_abstraction.so
 
 %files service
+%manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{_libdir}/libBMISensor.so
 %{_libdir}/libDiscomfortIndexSensor.so
 %{_libdir}/libmosquittopp.so
 %{_libdir}/libpmimpl.so
 %{_libdir}/libSSMCore.so
-%{_libdir}/libTGMSDKLibrary.so
 %{_libdir}/libNotificationManager.so
 %{_libdir}/libHueBundle.so
 %{_libdir}/librcs_client.so
@@ -128,6 +165,29 @@ cp service/protocol-plugin/plugin-manager/src/*.h %{buildroot}%{_includedir}
 %{_libdir}/librcs_container.so
 %{_libdir}/librcs_server.so
 
+%files test
+%manifest %{name}-test.manifest
+%defattr(-,root,root,-)
+%{_bindir}/devicediscoveryclient
+%{_bindir}/devicediscoveryserver
+%{_bindir}/fridgeclient
+%{_bindir}/fridgeserver
+%{_bindir}/garageclient
+%{_bindir}/garageserver
+%{_bindir}/groupclient
+%{_bindir}/groupserver
+%{_bindir}/lightserver
+%{_bindir}/presenceclient
+%{_bindir}/presenceserver
+%{_bindir}/roomclient
+%{_bindir}/roomserver
+%{_bindir}/simpleclient
+%{_bindir}/simpleclientHQ
+%{_bindir}/simpleclientserver
+%{_bindir}/simpleserver
+%{_bindir}/simpleserverHQ
+%{_bindir}/threadingsample
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/lib*.a