align with tizen 3.0

diff --git a/.gitignore b/.gitignore
index 4309772..21e0bb2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -55,6 +55,8 @@ service/things-manager/sdk/build/linux/
 
 # Ignore Eclipse workspace files
 *.settings/
+*.cproject
+*.project
 
 # Ignore CTags default data
 tags

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

diff --git a/packaging/iotivity.spec b/packaging/iotivity.spec
new file mode 100644 (file)
index 0000000..52366c4
--- /dev/null
+++ b/packaging/iotivity.spec
@@ -0,0 +1,207 @@
+Name: iotivity
+Version: 0.9.1
+Release: 0
+Summary: IoTivity Base Stack & IoTivity Services
+Group: System Environment/Libraries
+License: Apache-2.0
+URL: https://www.iotivity.org/
+Source0: %{name}-%{version}.tar.bz2
+Source1001: %{name}.manifest
+BuildRequires: gettext, expat-devel
+BuildRequires: python, libcurl-devel
+BuildRequires: scons
+BuildRequires: openssl-devel
+BuildRequires:  boost-devel
+BuildRequires:  boost-thread
+BuildRequires:  boost-system
+BuildRequires:  boost-filesystem
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(uuid)
+BuildRequires:  pkgconfig(capi-network-wifi)
+BuildRequires:  pkgconfig(capi-network-bluetooth)
+BuildRequires:  pkgconfig(capi-appfw-app-common)
+Requires(postun): /sbin/ldconfig
+Requires(post): /sbin/ldconfig
+
+%define release_mode true
+
+%description
+IoTivity Base (RICH & LITE) Stack & IoTivity Services
+
+%package service
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description service
+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
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
+%prep
+%setup -q -n %{name}-%{version}
+cp %{SOURCE1001} .
+
+%build
+%define RPM_ARCH %{_arch}
+
+%ifarch armv7l armv7l armv7hl armv7nhl armv7tnhl armv7thl
+%define RPM_ARCH "armeabi-v7a"
+%endif
+
+%ifarch aarch64
+%define RPM_ARCH "arm64"
+%endif
+
+%ifarch x86_64
+%define RPM_ARCH "x86_64"
+%endif
+
+%ifarch %{ix86}
+%define RPM_ARCH "x86"
+%endif
+
+
+scons -j 4 TARGET_OS=tizen TARGET_ARCH=%{RPM_ARCH} TARGET_TRANSPORT=IP RELEASE=%{release_mode}
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_includedir}
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_bindir}
+
+%if %{release_mode} == "true"
+
+cp out/tizen/*/release/resource/examples/devicediscoveryclient %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/devicediscoveryserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/fridgeclient %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/fridgeserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/garageclient %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/garageserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/groupclient %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/groupserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/lightserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/presenceclient %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/presenceserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/roomclient %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/roomserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/simpleclient %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/simpleclientHQ %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/simpleclientserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/simpleserver %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/simpleserverHQ %{buildroot}%{_bindir}
+cp out/tizen/*/release/resource/examples/threadingsample %{buildroot}%{_bindir}
+cp out/tizen/*/release/lib*.so %{buildroot}%{_libdir}
+cp out/tizen/*/release/libSSMSDK.a %{buildroot}%{_libdir}
+cp out/tizen/*/release/libppm.a %{buildroot}%{_libdir}
+cp out/tizen/*/release/service/protocol-plugin/plugins/mqtt-fan/*.so %{buildroot}%{_libdir}
+cp out/tizen/*/release/service/protocol-plugin/plugins/mqtt-light/*.so %{buildroot}%{_libdir}
+
+%else
+
+cp out/tizen/*/debug/resource/examples/devicediscoveryclient %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/devicediscoveryserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/fridgeclient %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/fridgeserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/garageclient %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/garageserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/groupclient %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/groupserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/lightserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/presenceclient %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/presenceserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/roomclient %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/roomserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/simpleclient %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/simpleclientHQ %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/simpleclientserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/simpleserver %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/simpleserverHQ %{buildroot}%{_bindir}
+cp out/tizen/*/debug/resource/examples/threadingsample %{buildroot}%{_bindir}
+cp out/tizen/*/debug/lib*.so %{buildroot}%{_libdir}
+cp out/tizen/*/debug/libSSMSDK.a %{buildroot}%{_libdir}
+cp out/tizen/*/debug/libppm.a %{buildroot}%{_libdir}
+cp out/tizen/*/debug/service/protocol-plugin/plugins/mqtt-fan/*.so %{buildroot}%{_libdir}
+cp out/tizen/*/debug/service/protocol-plugin/plugins/mqtt-light/*.so %{buildroot}%{_libdir}
+
+%endif
+
+cp resource/csdk/stack/include/*.h %{buildroot}%{_includedir}
+cp -r resource/oc_logger/include/* %{buildroot}%{_includedir}
+cp resource/include/*.h %{buildroot}%{_includedir}
+
+cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
+cp service/soft-sensor-manager/SDK/cpp/include/*.h %{buildroot}%{_includedir}
+cp service/notification-manager/NotificationManager/include/*.h %{buildroot}%{_includedir}
+cp service/protocol-plugin/plugin-manager/src/*.h %{buildroot}%{_includedir}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/liboc.so
+%{_libdir}/liboc_logger.so
+%{_libdir}/liboc_logger_core.so
+%{_libdir}/liboctbstack.so
+%{_libdir}/libconnectivity_abstraction.so
+
+%files service
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/libBMISensor.so
+%{_libdir}/libDiscomfortIndexSensor.so
+%{_libdir}/libmosquittopp.so
+%{_libdir}/libNotificationManager.so
+%{_libdir}/libpmimpl.so
+%{_libdir}/libSSMCore.so
+%{_libdir}/libTGMSDKLibrary.so
+%{_libdir}/fanserver*.so
+%{_libdir}/lightserver*.so
+
+%files test
+%manifest %{name}.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
+%{_includedir}/*

diff --git a/tools/tizen/.gbs.conf b/tools/tizen/.gbs.conf
deleted file mode 100644 (file)
index 37128eb..0000000
--- a/tools/tizen/.gbs.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-[general]
-#Current profile name which should match a profile section name
-profile = profile.tizen
-
-[profile.tizen]
-#Common authentication info for whole profile
-#user =
-#CAUTION: please use the key name "passwd" to reset plaintext password
-#passwd =
-obs = obs.tizen
-#Comma separated list of repositories
-repos = repo.tizen_latest
-#repos = repo.tizen_main, repo.tizen_base
-#Build config for gbs build
-#buildconf = <patch/to/build-config-file>
-#Comma separated list of additional packages be excluded building
-#exclude_packages = libtool,gettext
-
-
-[obs.tizen]
-#OBS API URL pointing to a remote OBS.
-url = https://api.tizen.org
-#Optional user and password, set if differ from profile's user and password
-#user =
-#passwd =
-
-#Repo section example
-[repo.tizen_latest]
-#Build against repo's URL
-url = http://download.tizen.org/releases/2.3/2.3-mobile/tizen-2.3-mobile_20150206.1/repos/target/packages/
-#Optional user and password, set if differ from profile's user and password
-#user =
-#passwd =
-
-#Individual repo is also supported
-#[repo.tizen_base]
-#url = http://download.tizen.org/releases/daily/trunk/ivi/latest/repos/base/ia32/packages/
-#[repo.tizen_main]
-#url = http://download.tizen.org/releases/daily/trunk/ivi/latest/repos/ivi/ia32/packages/

diff --git a/tools/tizen/iotivity.spec b/tools/tizen/iotivity.spec
deleted file mode 100644 (file)
index e23930f..0000000
--- a/tools/tizen/iotivity.spec
+++ /dev/null
@@ -1,108 +0,0 @@
-Name: iotivity
-Version: 0.9.1
-Release: 0
-Summary: IoTivity Base Stack & IoTivity Services
-Group: System Environment/Libraries
-License: Apache-2.0
-URL: https://www.iotivity.org/
-Source0: %{name}-%{version}.tar.bz2
-
-BuildRequires: gettext, expat-devel
-BuildRequires: python, libcurl-devel
-BuildRequires: scons
-BuildRequires: openssl-devel
-BuildRequires:  boost-devel
-BuildRequires:  boost-thread
-BuildRequires:  boost-system
-BuildRequires:  boost-filesystem
-BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(uuid)
-BuildRequires:  pkgconfig(capi-network-wifi)
-BuildRequires:  pkgconfig(capi-network-bluetooth)
-BuildRequires:  pkgconfig(capi-appfw-app-common)
-Requires(postun): /sbin/ldconfig
-Requires(post): /sbin/ldconfig
-
-%description
-IoTivity Base (RICH & LITE) Stack & IoTivity Services
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
-%prep
-%setup -q -n %{name}-%{version}
-
-%build
-%ifarch armv7l
-export RPM_ARCH=armeabi-v7a
-%else
-%ifarch %arm
-export RPM_ARCH=arm
-%else
-%ifarch aarch64
-export RPM_ARCH=arm64
-%else
-%ifarch i586 i686 %{ix86}
-export RPM_ARCH=x86
-%else
-export RPM_ARCH=%{_arch}
-%endif
-%endif
-%endif
-%endif
-
-
-scons -j 4 TARGET_OS=tizen TARGET_ARCH=$RPM_ARCH TARGET_TRANSPORT=IP
-
-%install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_includedir}
-mkdir -p %{buildroot}%{_includedir}/targets
-mkdir -p %{buildroot}%{_libdir}
-mkdir -p %{buildroot}%{_sbindir}
-
-cp out/tizen/*/release/lib*.so %{buildroot}%{_libdir}
-cp out/tizen/*/release/libSSMSDK.a %{buildroot}%{_libdir}
-cp out/tizen/*/release/libppm.a %{buildroot}%{_libdir}
-cp out/tizen/*/release/service/protocol-plugin/plugins/mqtt-fan/*.so %{buildroot}%{_libdir}
-cp out/tizen/*/release/service/protocol-plugin/plugins/mqtt-light/*.so %{buildroot}%{_libdir}
-cp /usr/lib/libuuid.so %{buildroot}%{_libdir}
-
-cp resource/csdk/stack/include/ocstack.h %{buildroot}%{_includedir}
-cp resource/csdk/stack/include/ocstackconfig.h %{buildroot}%{_includedir}
-cp resource/oc_logger/include/oc_logger.hpp %{buildroot}%{_includedir}
-cp resource/oc_logger/include/oc_log_stream.hpp %{buildroot}%{_includedir}
-cp resource/oc_logger/include/oc_logger.h %{buildroot}%{_includedir}
-cp resource/oc_logger/include/oc_logger_types.h %{buildroot}%{_includedir}
-cp resource/oc_logger/include/targets/oc_console_logger.h %{buildroot}%{_includedir}/targets
-cp resource/oc_logger/include/targets/oc_ostream_logger.h %{buildroot}%{_includedir}/targets
-cp resource/include/*.h %{buildroot}%{_includedir}
-
-cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
-cp service/soft-sensor-manager/SDK/cpp/include/*.h %{buildroot}%{_includedir}
-
-
-%clean
-rm -rf %{buildroot}
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-%files
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so
-%{_libdir}/lib*.a
-%{_libdir}/fanserver*.so
-%{_libdir}/lightserver*.so
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*

diff --git a/tools/tizen/scons-2.1.0-3.1.slp.noarch.rpm b/tools/tizen/scons-2.1.0-3.1.slp.noarch.rpm
deleted file mode 100644 (file)
index 4c2d8a0..0000000
Binary files a/tools/tizen/scons-2.1.0-3.1.slp.noarch.rpm and /dev/null differ