Remove profile build dependencies

Change-Id: I021909ada2d5e46b29de449d9a5e484f1ea70754
Signed-off-by: Mu-Woong Lee <muwoong.lee@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30b5e50..86b7e75 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,14 +24,6 @@ SET(DEPS
        context
 )
 
-IF("${PROFILE}" STREQUAL "mobile")
-       ADD_DEFINITIONS("-D_MOBILE_")
-ENDIF("${PROFILE}" STREQUAL "mobile")
-
-IF("${PROFILE}" STREQUAL "wearable")
-       ADD_DEFINITIONS("-D_WEARABLE_")
-ENDIF("${PROFILE}" STREQUAL "wearable")
-
 # Common Options
 INCLUDE(FindPkgConfig)
 INCLUDE_DIRECTORIES(

diff --git a/packaging/context-service.spec b/packaging/context-service.spec
index 32b7574..8907001 100644 (file)
--- a/packaging/context-service.spec
+++ b/packaging/context-service.spec
@@ -1,18 +1,12 @@
 Name:       context-service
 Summary:    Context-Service
-Version:    0.9.9
+Version:    0.9.10
 Release:    1
 Group:      Service/Context
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:       context-service.service
 
-%define BUILD_PROFILE %{?profile}%{!?profile:%{?tizen_profile_name}}
-
-%if "%{?BUILD_PROFILE}" == "tv"
-ExcludeArch: %{arm} aarch64 %ix86 x86_64
-%endif
-
 %define SERVICE_UNIT_DIR %{_unitdir_user}
 %define upgrade_script_path /usr/share/upgrade/scripts
 
@@ -46,58 +40,33 @@ Context-Service
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 
-export   CFLAGS+=" -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-parameter"
 export CXXFLAGS+=" -Wextra -Wcast-align -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-parameter"
-
-export   CFLAGS+=" -Wno-empty-body -fomit-frame-pointer -fno-optimize-sibling-calls"
 export CXXFLAGS+=" -Wno-empty-body -fomit-frame-pointer -fno-optimize-sibling-calls"
-
-export   CFLAGS+=" -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow"
 export CXXFLAGS+=" -fno-strict-aliasing -fno-unroll-loops -fsigned-char -fstrict-overflow"
+export CXXFLAGS+=" -Wnon-virtual-dtor -std=c++0x"
 
-export   CFLAGS+=" -fno-common"
-export CXXFLAGS+=" -Wnon-virtual-dtor"
-export CXXFLAGS+=" -std=c++0x"
-
-#export   CFLAGS+=" -Wcast-qual"
-#export CXXFLAGS+=" -Wcast-qual"
-
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?BUILD_PROFILE}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIBDIR=%{_libdir} -DMAJORVER=${MAJORVER} -DFULLVER=%{version}
 make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-mkdir -p %{buildroot}%{SERVICE_UNIT_DIR}
-mkdir -p %{buildroot}%{_datadir}/packages
-mkdir -p %{buildroot}/opt/data/context-service
+mkdir -p %{buildroot}%{SERVICE_UNIT_DIR}/default.target.wants
 install -m 0644 %{SOURCE1} %{buildroot}%{SERVICE_UNIT_DIR}
+ln -s ../context-service.service %{buildroot}%{SERVICE_UNIT_DIR}/default.target.wants/context-service.service
+
 mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/session.d
 install -m 0644 packaging/org.tizen.context.conf %{buildroot}%{_sysconfdir}/dbus-1/session.d/
+
 mkdir -p %{buildroot}%{upgrade_script_path}
 cp -f scripts/500.context-service.sh %{buildroot}%{upgrade_script_path}
 
-%post
-mkdir -p %{SERVICE_UNIT_DIR}/default.target.wants
-ln -s ../context-service.service %{SERVICE_UNIT_DIR}/default.target.wants/
-/sbin/ldconfig
-#systemctl daemon-reload
-
-%preun
-#if [ $1 == 0 ]; then
-#    systemctl stop context-service
-#fi
-
-%postun
-rm -f %{SERVICE_UNIT_DIR}/default.target.wants/context-service.service
-#systemctl daemon-reload
-/sbin/ldconfig
-
 %files
 %manifest packaging/%{name}.manifest
 %config %{_sysconfdir}/dbus-1/session.d/*
 %{_bindir}/*
 %{SERVICE_UNIT_DIR}/context-service.service
+%{SERVICE_UNIT_DIR}/default.target.wants/context-service.service
 %{upgrade_script_path}/500.context-service.sh
 %license LICENSE

diff --git a/src/ProviderLoader.cpp b/src/ProviderLoader.cpp
index 275f67d..8a7d6a6 100644 (file)
--- a/src/ProviderLoader.cpp
+++ b/src/ProviderLoader.cpp
@@ -62,7 +62,7 @@ ContextProvider* ProviderLoader::__load(const char *soPath, const char *subject)
        gpointer symbol;
 
        if (!g_module_symbol(__soHandle, "CreateProvider", &symbol) || symbol == NULL) {
-               _E("%s", g_module_error());
+               _W("%s", g_module_error());
                g_module_close(__soHandle);
                __soHandle = NULL;
                return NULL;

diff --git a/src/policy/PolicyManager.cpp b/src/policy/PolicyManager.cpp
index 8544d29..3f97344 100644 (file)
--- a/src/policy/PolicyManager.cpp
+++ b/src/policy/PolicyManager.cpp
@@ -27,28 +27,18 @@ using namespace ctx;
 PolicyManager::PolicyManager(ContextManager *contextMgr) :
        __contextMgr(contextMgr)
 {
-#ifdef _MOBILE_
-       __subscribe(SUBJ_STATE_WIFI);
+       __subscribe(SUBJ_CUSTOM);
+
        __subscribe(SUBJ_APP_LOGGER);
+       __subscribe(SUBJ_BATTERY_LOGGER);
        __subscribe(SUBJ_MEDIA_LOGGER);
-
-       __subscribe(SUBJ_SENSOR_PEDOMETER);
-       __subscribe(SUBJ_SENSOR_PRESSURE);
-       __subscribe(SUBJ_SENSOR_SLEEP_MONITOR);
-       __subscribe(SUBJ_SENSOR_HEART_RATE);
-
        __subscribe(SUBJ_PLACE_DETECTION);
-       __subscribe(SUBJ_BATTERY_LOGGER);
-#endif
+       __subscribe(SUBJ_STATE_WIFI);
 
-#ifdef _WEARABLE_
        __subscribe(SUBJ_SENSOR_PEDOMETER);
        __subscribe(SUBJ_SENSOR_PRESSURE);
        __subscribe(SUBJ_SENSOR_SLEEP_MONITOR);
        __subscribe(SUBJ_SENSOR_HEART_RATE);
-#endif
-
-       __subscribe(SUBJ_CUSTOM);
 }
 
 PolicyManager::~PolicyManager()