Merge branch 'devel/tizen_3.0' into tizen

* devel/tizen_3.0:
  capi-sensor: add a space between parameters
  capi-system-sensor: update api version for HRM sensor types
  sensord: delete the duplicated manifest file and clean up spec file
  capi-system-sensor: clean up CMakeLists.txt and package config file

Change-Id: Ia4c2b3f3edd6408df82099fd9258836ebc73b46a
Signed-off-by: kibak.yoon <kibak.yoon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 611b4c7..baae2b3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,18 +1,25 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 PROJECT(capi-system-sensor)
+INCLUDE(GNUInstallDirs)
 
-# Setup for pkgconfig File
-SET(fw_name "capi-system-sensor")
+SET(DEPENDENTS "dlog sensor capi-base-common")
+SET(VERSION ${FULLVER})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(VERSION 1.0)
+
+SET(PC_NAME ${PROJECT_NAME})
+SET(PC_DESCRIPTION "Sensor C-API library")
+SET(PC_INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/sensor")
+SET(PC_DEPENDENTS "${DEPENDENTS}")
+SET(PC_LIBDIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+SET(PC_LDFLAGS "-l${PROJECT_NAME}")
 
 INCLUDE_DIRECTORIES(include)
 
 # Build options
 INCLUDE(FindPkgConfig)
-pkg_check_modules(${fw_name} REQUIRED dlog sensor capi-base-common)
+PKG_CHECK_MODULES(${PROJECT_NAME} REQUIRED ${DEPENDENTS})
 
-FOREACH(flag ${${fw_name}_CFLAGS})
+FOREACH(flag ${${PROJECT_NAME}_CFLAGS})
     SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
 ENDFOREACH(flag)
 
@@ -26,14 +33,14 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl, --rpath=${LIB_INSTALL_DIR}")
 
 # Complile Source files
 AUX_SOURCE_DIRECTORY(src SOURCES)
-ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
+ADD_LIBRARY(${PROJECT_NAME} SHARED ${SOURCES})
 
-TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
-SET_TARGET_PROPERTIES(${fw_name} PROPERTIES VERSION ${FULLVER} SOVERSION ${MAJORVER} CLEAN_DIRECT_OUTPUT 1)
-CONFIGURE_FILE(${fw_name}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc @ONLY)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
-INSTALL(FILES include/sensor.h DESTINATION ${INCLUDE_INSTALL_DIR}/sensor)
+TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${${PROJECT_NAME}_LDFLAGS})
+SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${FULLVER} SOVERSION ${MAJORVER} CLEAN_DIRECT_OUTPUT 1)
+CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc @ONLY)
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PROJECT_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT RuntimeLibraries)
+INSTALL(FILES include/sensor.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/sensor)
 
 # ###
 IF(UNIX)

diff --git a/capi-system-sensor.manifest b/capi-system-sensor.manifest
deleted file mode 100644 (file)
index 41a9320..0000000
--- a/capi-system-sensor.manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-<manifest>
-    <request>
-        <domain name="_"/>
-    </request>
-</manifest>
-

diff --git a/capi-system-sensor.pc.in b/capi-system-sensor.pc.in
index 2382fc8..c7ebed2 100644 (file)
--- a/capi-system-sensor.pc.in
+++ b/capi-system-sensor.pc.in
@@ -2,13 +2,13 @@
 
 prefix=@PREFIX@
 exec_prefix=@PREFIX@/bin
-libdir=@LIB_INSTALL_DIR@
-includedir=@INCLUDE_INSTALL_DIR@/sensor
+libdir=@PC_LIBDIR@
+includedir=@PC_INCLUDEDIR@
 
-Name: capi-system-sensor
-Description: A sensor library
+Name: @PC_NAME@
+Description: @PC_DESCRIPTION@
 Version: @VERSION@
-Requires: capi-base-common
-Libs: -L${libdir} -lcapi-system-sensor
+Requires: @PC_DEPENDENTS@
+Libs: -L${libdir} @PC_LDFLAGS@
 Cflags: -I${includedir}
 

diff --git a/include/sensor.h b/include/sensor.h
index 748c014..688d10c 100644 (file)
--- a/include/sensor.h
+++ b/include/sensor.h
@@ -175,13 +175,13 @@ typedef enum
        SENSOR_ULTRAVIOLET,                     /**< Ultraviolet sensor */
        SENSOR_TEMPERATURE,                     /**< Temperature sensor */
        SENSOR_HUMIDITY,                        /**< Humidity sensor */
-       SENSOR_HRM,                             /**< Heart-rate monitor (Since 2.3.1)
+       SENSOR_HRM,                             /**< Heart-rate monitor @if MOBILE (Since 2.3.1) @endif
                                                     @n Privilege : http://tizen.org/privilege/healthinfo */
-       SENSOR_HRM_LED_GREEN,                   /**< Green LED sensor of HRM (Since 2.3.1)
+       SENSOR_HRM_LED_GREEN,                   /**< Green LED sensor of HRM @if MOBILE (Since 2.3.1) @endif
                                                     @n Privilege : http://tizen.org/privilege/healthinfo */
-       SENSOR_HRM_LED_IR,                      /**< Infra-Red LED sensor of HRM (Since 2.3.1)
+       SENSOR_HRM_LED_IR,                      /**< Infra-Red LED sensor of HRM @if MOBILE (Since 2.3.1) @endif
                                                     @n Privilege : http://tizen.org/privilege/healthinfo */
-       SENSOR_HRM_LED_RED,                     /**< Red LED sensor of HRM (Since 2.3.1)
+       SENSOR_HRM_LED_RED,                     /**< Red LED sensor of HRM @if MOBILE (Since 2.3.1) @endif
                                                     @n Privilege : http://tizen.org/privilege/healthinfo */
        SENSOR_GYROSCOPE_UNCALIBRATED,          /**< Uncalibrated Gyroscope sensor
                                                     @if MOBILE (Since 2.4) @elseif WEARABLE (Since 3.0) @endif */

diff --git a/packaging/capi-system-sensor.spec b/packaging/capi-system-sensor.spec
index 4817eab..3720474 100644 (file)
--- a/packaging/capi-system-sensor.spec
+++ b/packaging/capi-system-sensor.spec
@@ -5,7 +5,6 @@ Release:    0
 Group:      System/API
 License:    Apache-2.0 and PD
 Source0:    %{name}-%{version}.tar.gz
-Source1:    capi-system-sensor.manifest
 
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
@@ -30,7 +29,6 @@ A Sensor library in TIZEN C API package (Development).
 %setup -q
 
 %build
-cp %{SOURCE1} .
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %__make %{?_smp_mflags}
@@ -44,14 +42,13 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
-%manifest capi-system-sensor.manifest
+%manifest packaging/capi-system-sensor.manifest
 %{_libdir}/libcapi-system-sensor.so.*
 %license LICENSE.APLv2
 
 %files devel
-%manifest capi-system-sensor.manifest
-%license LICENSE.APLv2
+%manifest packaging/capi-system-sensor.manifest
 %{_libdir}/libcapi-system-sensor.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/sensor/*.h
-
+%license LICENSE.APLv2

diff --git a/src/sensor.cpp b/src/sensor.cpp
index 2dc1aef..4f676b2 100644 (file)
--- a/src/sensor.cpp
+++ b/src/sensor.cpp
@@ -832,7 +832,7 @@ int sensor_util_get_rotation_matrix_from_vector(float Vx, float Vy, float Vz, fl
        return SENSOR_ERROR_NONE;
 }
 
-int sensor_util_get_rotation_matrix(float Gx, float Gy, float Gz,float Mx, float My, float Mz, float R[], float I[])
+int sensor_util_get_rotation_matrix(float Gx, float Gy, float Gz, float Mx, float My, float Mz, float R[], float I[])
 {
        float G[3] = {Gx, Gy, Gz};
        float M[3] = {Mx, My, Mz};