sensord: remove unnecessary files in CMakeLists.txt

checking ARM is not necessary because this macro is not used in the
source.

Change-Id: I1ec44abd7670ad61dde1826fbaec023672e6f935
Signed-off-by: Kibak Yoon <kibak.yoon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb4beee38871a8c80ffc8cb47360a572445f7d71..affaa30ca540ddf56fe7a3405345c1c6eabfe857 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,30 +22,12 @@ add_definitions(-DLIBDIR="${CMAKE_INSTALL_LIBDIR}")
 # Internal Debugging Options
 #add_definitions(-Wall -g -D_DEBUG)
 
-# For Emulator
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" MATCHES "^arm.*")
-        ADD_DEFINITIONS("-DTARGET")
-        MESSAGE("add -DTARGET")
-ELSE("${ARCH}" MATCHES "^arm.*")
-        ADD_DEFINITIONS("-DSIMULATOR")
-        MESSAGE("add -DSIMULATOR")
-ENDIF("${ARCH}" MATCHES "^arm.*")
-
 # Installing files
 CONFIGURE_FILE(sensor_plugins.xml.in sensor_plugins.xml @ONLY)
 CONFIGURE_FILE(sensors.xml.in sensors.xml @ONLY)
-CONFIGURE_FILE(virtual_sensors.xml.in virtual_sensors.xml @ONLY)
 
 INSTALL(FILES sensor_plugins.xml sensors.xml DESTINATION etc)
 INSTALL(FILES virtual_sensors.xml virtual_sensors.xml DESTINATION etc)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 DESTINATION share/license RENAME sensord)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 DESTINATION share/license RENAME libsensord)
-
-IF("${TEST_SUITE}" STREQUAL "ON")
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.APLv2 DESTINATION share/license RENAME test)
-ENDIF()
 
 # Sub-directory
 add_subdirectory(systemd)

diff --git a/packaging/sensord.spec b/packaging/sensord.spec
index 4289d7bbb9342b4ba9154dfbf054a834ed74d035..c097f0224ae8a756fa5e20ad15cb6ea880c1ae83 100755 (executable)
--- a/packaging/sensord.spec
+++ b/packaging/sensord.spec
@@ -113,7 +113,6 @@ systemctl daemon-reload
 %{_unitdir}/multi-user.target.wants/sensord.service
 %{_unitdir}/sockets.target.wants/sensord.socket
 %license LICENSE.APLv2
-%{_datadir}/license/sensord
 
 %files -n libsensord
 %defattr(-,root,root,-)
@@ -123,7 +122,6 @@ systemctl daemon-reload
 %{_libdir}/libsensord-share.so
 %{_libdir}/libsensord-server.so
 %license LICENSE.APLv2
-%{_datadir}/license/libsensord
 
 %files -n libsensord-devel
 %defattr(-,root,root,-)
@@ -149,6 +147,5 @@ systemctl daemon-reload
 %{_bindir}/light
 %{_bindir}/rotation_vector
 %license LICENSE.APLv2
-%{_datadir}/license/test
 %endif
 

diff --git a/src/sensor_fusion/CMakeLists.txt b/src/sensor_fusion/CMakeLists.txt
index 2505fe5af8200262d44f561752d7b425bce087b1..c38f410c29e97741bb2b45accdd0545823adad00 100755 (executable)
--- a/src/sensor_fusion/CMakeLists.txt
+++ b/src/sensor_fusion/CMakeLists.txt
@@ -16,16 +16,6 @@ set(PROJECT_MINOR_VERSION "0")
 set(PROJECT_RELEASE_VERSION "1")
 set(CMAKE_VERBOSE_MAKEFILE OFF)
 
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
-IF("${ARCH}" MATCHES "^arm.*")
-       ADD_DEFINITIONS("-DTARGET -DHWREV_CHECK")
-       MESSAGE("add -DTARGET -DHWREV_CHECK")
-ELSE("${ARCH}" MATCHES "^arm.*")
-       ADD_DEFINITIONS("-DSIMULATOR")
-       MESSAGE("add -DSIMULATOR")
-ENDIF("${ARCH}" MATCHES "^arm.*")
-
 add_definitions(-Wall -O3 -omit-frame-pointer)
 #add_definitions(-Wall -g -D_DEBUG)
 add_definitions(-DUSE_DLOG_LOG)

diff --git a/virtual_sensors.xml b/virtual_sensors.xml
new file mode 100755 (executable)
index 0000000..1c20c0d
--- /dev/null
+++ b/virtual_sensors.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VIRTUAL_SENSOR>
+       <DEVICE type="Mobile-Emulator">
+               <ORIENTATION>
+                       <NAME value="ORIENTATION_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <GYRO_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
+                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
+                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
+                       <ACCEL_SCALE value="1" />
+                       <GYRO_SCALE value="1146" />
+                       <GEOMAGNETIC_SCALE value="1" />
+                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
+                       <AZIMUTH_ROTATION_COMPENSATION value="-1" />
+                       <PITCH_ROTATION_COMPENSATION value="-1" />
+                       <ROLL_ROTATION_COMPENSATION value="-1" />
+               </ORIENTATION>
+
+               <GRAVITY>
+                       <NAME value="GRAVITY_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="M/S^2" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <GRAVITY_SIGN_COMPENSATION value1="-1" value2="-1" value3="-1" />
+               </GRAVITY>
+
+               <LINEAR_ACCEL>
+                       <NAME value="LINEAR_ACCEL_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="M/S^2" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
+                       <ACCEL_SCALE value="1" />
+                       <LINEAR_ACCEL_SIGN_COMPENSATION value1="1" value2="1" value3="1" />
+               </LINEAR_ACCEL>
+
+               <ROTATION_VECTOR>
+                       <NAME value="RV_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <GYRO_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
+                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
+                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
+                       <ACCEL_SCALE value="1" />
+                       <GYRO_SCALE value="1146" />
+                       <GEOMAGNETIC_SCALE value="1" />
+                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
+               </ROTATION_VECTOR>
+       </DEVICE>
+       <DEVICE type="Mobile-RD-PQ">
+               <ORIENTATION>
+                       <NAME value="ORIENTATION_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="DEGREES" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <ACCEL_STATIC_BIAS value1="0.098586" value2="0.18385" value3="0.274" />
+                       <GYRO_STATIC_BIAS value1="-5.3539" value2="0.24325" value3="2.3391" />
+                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="-37.6" value3="37.6" />
+                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
+                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
+                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
+                       <ACCEL_SCALE value="1" />
+                       <GYRO_SCALE value="1160" />
+                       <GEOMAGNETIC_SCALE value="1" />
+                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
+                       <AZIMUTH_ROTATION_COMPENSATION value="1" />
+                       <PITCH_ROTATION_COMPENSATION value="1" />
+                       <ROLL_ROTATION_COMPENSATION value="1" />
+               </ORIENTATION>
+
+               <GRAVITY>
+                       <NAME value="GRAVITY_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="M/S^2" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <GRAVITY_SIGN_COMPENSATION value1="1" value2="1" value3="1" />
+               </GRAVITY>
+
+               <LINEAR_ACCEL>
+                       <NAME value="LINEAR_ACCEL_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <RAW_DATA_UNIT value="M/S^2" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
+                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
+                       <ACCEL_SCALE value="1" />
+                       <LINEAR_ACCEL_SIGN_COMPENSATION value1="1" value2="1" value3="1" />
+               </LINEAR_ACCEL>
+
+               <ROTATION_VECTOR>
+                       <NAME value="RV_SENSOR" />
+                       <VENDOR value="SAMSUNG" />
+                       <DEFAULT_SAMPLING_TIME value="100" />
+                       <ACCEL_STATIC_BIAS value1="0.098586" value2="0.18385" value3="0.274" />
+                       <GYRO_STATIC_BIAS value1="-5.3539" value2="0.24325" value3="2.3391" />
+                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="-37.6" value3="37.6" />
+                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
+                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
+                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
+                       <ACCEL_SCALE value="1" />
+                       <GYRO_SCALE value="1160" />
+                       <GEOMAGNETIC_SCALE value="1" />
+                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
+               </ROTATION_VECTOR>
+       </DEVICE>
+</VIRTUAL_SENSOR>

diff --git a/virtual_sensors.xml.in b/virtual_sensors.xml.in
deleted file mode 100755 (executable)
index 1c20c0d..0000000
--- a/virtual_sensors.xml.in
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<VIRTUAL_SENSOR>
-       <DEVICE type="Mobile-Emulator">
-               <ORIENTATION>
-                       <NAME value="ORIENTATION_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <RAW_DATA_UNIT value="DEGREES" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GYRO_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1146" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
-                       <AZIMUTH_ROTATION_COMPENSATION value="-1" />
-                       <PITCH_ROTATION_COMPENSATION value="-1" />
-                       <ROLL_ROTATION_COMPENSATION value="-1" />
-               </ORIENTATION>
-
-               <GRAVITY>
-                       <NAME value="GRAVITY_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <RAW_DATA_UNIT value="M/S^2" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <GRAVITY_SIGN_COMPENSATION value1="-1" value2="-1" value3="-1" />
-               </GRAVITY>
-
-               <LINEAR_ACCEL>
-                       <NAME value="LINEAR_ACCEL_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <RAW_DATA_UNIT value="M/S^2" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <ACCEL_SCALE value="1" />
-                       <LINEAR_ACCEL_SIGN_COMPENSATION value1="1" value2="1" value3="1" />
-               </LINEAR_ACCEL>
-
-               <ROTATION_VECTOR>
-                       <NAME value="RV_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GYRO_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="-1" value2="-1" value3="-1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1146" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
-               </ROTATION_VECTOR>
-       </DEVICE>
-       <DEVICE type="Mobile-RD-PQ">
-               <ORIENTATION>
-                       <NAME value="ORIENTATION_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <RAW_DATA_UNIT value="DEGREES" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.098586" value2="0.18385" value3="0.274" />
-                       <GYRO_STATIC_BIAS value1="-5.3539" value2="0.24325" value3="2.3391" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="-37.6" value3="37.6" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1160" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
-                       <AZIMUTH_ROTATION_COMPENSATION value="1" />
-                       <PITCH_ROTATION_COMPENSATION value="1" />
-                       <ROLL_ROTATION_COMPENSATION value="1" />
-               </ORIENTATION>
-
-               <GRAVITY>
-                       <NAME value="GRAVITY_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <RAW_DATA_UNIT value="M/S^2" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <GRAVITY_SIGN_COMPENSATION value1="1" value2="1" value3="1" />
-               </GRAVITY>
-
-               <LINEAR_ACCEL>
-                       <NAME value="LINEAR_ACCEL_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <RAW_DATA_UNIT value="M/S^2" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0" value2="0" value3="0" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <LINEAR_ACCEL_SIGN_COMPENSATION value1="1" value2="1" value3="1" />
-               </LINEAR_ACCEL>
-
-               <ROTATION_VECTOR>
-                       <NAME value="RV_SENSOR" />
-                       <VENDOR value="SAMSUNG" />
-                       <DEFAULT_SAMPLING_TIME value="100" />
-                       <ACCEL_STATIC_BIAS value1="0.098586" value2="0.18385" value3="0.274" />
-                       <GYRO_STATIC_BIAS value1="-5.3539" value2="0.24325" value3="2.3391" />
-                       <GEOMAGNETIC_STATIC_BIAS value1="0" value2="-37.6" value3="37.6" />
-                       <ACCEL_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GYRO_ROTATION_DIRECTION_COMPENSATION value1="1" value2="1" value3="1" />
-                       <GEOMAGNETIC_ROTATION_DIRECTION_COMPENSATION value1="1" value2="-1" value3="1" />
-                       <ACCEL_SCALE value="1" />
-                       <GYRO_SCALE value="1160" />
-                       <GEOMAGNETIC_SCALE value="1" />
-                       <MAGNETIC_ALIGNMENT_FACTOR value="1" />
-               </ROTATION_VECTOR>
-       </DEVICE>
-</VIRTUAL_SENSOR>