deviced: Separate deviced modules for each feature 24/30424/3
authorjy910.yun <jy910.yun@samsung.com>
Tue, 18 Nov 2014 08:23:14 +0000 (17:23 +0900)
committerjy910.yun <jy910.yun@samsung.com>
Tue, 18 Nov 2014 13:44:39 +0000 (22:44 +0900)
Deviced can be defined as below features.
- Common
- Battery
- Camera led
- Display
- Extcon
- Sdcard
- Usb
- Vibrator

Change-Id: Icb36e4f77c3dd9bc32b5697992c3f33574a54845
Signed-off-by: jy910.yun <jy910.yun@samsung.com>
CMakeLists.txt
packaging/deviced.spec

index 3a9bba2..e81c842 100755 (executable)
@@ -22,11 +22,9 @@ SET(CONFDIR "/etc/${PROJECT_NAME}")
 SET(VERSION 0.1.0)
 
 SET(SRCS
-       src/battery/battery-time.c
-       src/battery/config.c
-       src/battery/lowbat-handler.c
        src/core/common.c
        src/core/config-parser.c
+       src/control/control.c
        src/core/device-change-handler.c
        src/core/device-notifier.c
        src/core/devices.c
@@ -37,40 +35,47 @@ SET(SRCS
        src/core/main.c
        src/core/power-supply.c
        src/core/sig-handler.c
-       src/earjack/earjack.c
+       src/gpio/gpio.c
+       src/gpio/buzzer.c
+       src/gpio/hall.c
+       src/gpio/sim.c
+       src/power/power-handler.c
        src/proc/cpu-info.c
        src/proc/proc-handler.c
-       src/ta/ta-handler.c
        src/time/time-handler.c
-       src/usb/usb-handler.c
 )
 
+IF(TIZEN_BATTERY)
 SET(SRCS ${SRCS}
-       src/gpio/gpio.c
-       src/gpio/buzzer.c
-       src/gpio/hall.c
-       src/gpio/sim.c
-)
+       src/battery/battery-time.c
+       src/battery/config.c
+       src/battery/lowbat-handler.c
+   )
+ENDIF(TIZEN_BATTERY)
 
+IF(TIZEN_EXTCON)
 SET(SRCS ${SRCS}
-       src/power/power-handler.c
-)
+       src/earjack/earjack.c
+       src/ta/ta-handler.c
+       src/usb/usb-handler.c
+   )
+ENDIF(TIZEN_EXTCON)
 
+IF(TIZEN_SDCARD)
 SET(SRCS ${SRCS}
        src/mmc/config.c
        src/mmc/mmc-handler.c
        src/mmc/uevent.c
        src/mmc/vfat.c
 )
-
-FIND_PROGRAM(UNAME NAMES uname)
-EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH")
 IF(USE_EMULATOR)
 SET(SRCS ${SRCS}
        src/mmc/ext4.c
        )
 ENDIF(USE_EMULATOR)
+ENDIF(TIZEN_SDCARD)
 
+IF(TIZEN_DISPLAY)
 SET(SRCS ${SRCS}
        src/display/auto-brightness.c
        src/display/brightness.c
@@ -84,21 +89,23 @@ SET(SRCS ${SRCS}
        src/display/poll.c
        src/display/setting.c
 )
+ENDIF(TIZEN_DISPLAY)
 
+IF(TIZEN_CAMERA_LED)
 SET(SRCS ${SRCS}
        src/led/ir.c
        src/led/noti.c
        src/led/torch.c
 )
+ENDIF(TIZEN_CAMERA_LED)
 
-SET(SRCS ${SRCS}
-       src/control/control.c)
-
+IF(TIZEN_VIBRATOR)
 SET(SRCS ${SRCS}
        src/haptic/haptic.c
        src/haptic/external.c
        src/haptic/standard.c
        src/haptic/emulator.c)
+ENDIF(TIZEN_VIBRATOR)
 
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/src)
@@ -139,7 +146,9 @@ ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
 ADD_DEFINITIONS("-DFACTORYFS=\"$ENV{FACTORYFS}\"")
 ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"")
 ADD_DEFINITIONS("-DENABLE_KEY_FILTER")
+IF(X11_SUPPORT)
 ADD_DEFINITIONS("-DENABLE_X_LCD_ONOFF")
+ENDIF(X11_SUPPORT)
 ADD_DEFINITIONS("-DENABLE_DEVICED_DLOG")
 ADD_DEFINITIONS("-DENABLE_LIBDEVICED_DLOG")
 ADD_DEFINITIONS("-DENABLE_PM_LOG")
@@ -165,8 +174,10 @@ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkg
 INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/deviced-pre.sh DESTINATION bin)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/deviced.conf DESTINATION /etc/dbus-1/system.d)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/movi_format.sh DESTINATION bin)
-INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/mmc-smack-label DESTINATION bin)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/fsck-msdos/LICENSE DESTINATION share/license RENAME fsck_msdosfs)
+IF(TIZEN_SDCARD)
+       INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/mmc-smack-label DESTINATION bin)
+       INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/fsck-msdos/LICENSE DESTINATION share/license RENAME fsck_msdosfs)
+ENDIF(TIZEN_SDCARD)
 
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/systemd/ DESTINATION lib/systemd/system
                FILES_MATCHING
@@ -175,8 +186,10 @@ INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/systemd/ DESTINATION lib/systemd/s
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(src/libdeviced)
-ADD_SUBDIRECTORY(src/fsck-msdos)
-ADD_SUBDIRECTORY(src/newfs-msdos)
+IF(TIZEN_SDCARD)
+       ADD_SUBDIRECTORY(src/fsck-msdos)
+       ADD_SUBDIRECTORY(src/newfs-msdos)
+ENDIF(TIZEN_SDCARD)
 ADD_SUBDIRECTORY(src/devicectl)
 ADD_SUBDIRECTORY(src/libsysman)
 ADD_SUBDIRECTORY(src/libslp-pm)
index 2aec247..eb5cc81 100755 (executable)
@@ -1,4 +1,15 @@
+
+#These options are ACTIVATED by default.
+%bcond_without battery
+%bcond_without display
+
+#These options are DEACTIVATED by default.
 %bcond_with x
+%bcond_with camera_led
+%bcond_with extcon
+%bcond_with sdcard
+%bcond_with usb
+%bcond_with vibrator
 
 Name:       deviced
 Summary:    deviced
@@ -173,6 +184,27 @@ cmake . \
        -DTZ_SYS_ETC=%TZ_SYS_ETC \
        -DCMAKE_INSTALL_PREFIX=%{_prefix} \
        -DARCH=%{ARCH} \
+%if %{with battery}
+       -DTIZEN_BATTERY:BOOL=ON \
+%endif
+%if %{with camera_led}
+       -DTIZEN_CAMERA_LED:BOOL=ON \
+%endif
+%if %{with display}
+       -DTIZEN_DISPLAY:BOOL=ON \
+%endif
+%if %{with extcon}
+       -DTIZEN_EXTCON:BOOL=ON \
+%endif
+%if %{with sdcard}
+       -DTIZEN_SDCARD:BOOL=ON \
+%endif
+%if %{with usb}
+       -DTIZEN_USB:BOOL=ON \
+%endif
+%if %{with vibrator}
+       -DTIZEN_VIBRATOR:BOOL=ON \
+%endif
        #eol
 
 %build
@@ -276,11 +308,13 @@ systemctl daemon-reload
 %{_bindir}/deviced
 %{_bindir}/devicectl
 %{_bindir}/movi_format.sh
+%if %{with sdcard}
 %{_bindir}/mmc-smack-label
 %{_bindir}/fsck_msdosfs
 %{_bindir}/newfs_msdos
 %{_datadir}/license/fsck_msdosfs
 %{_datadir}/license/newfs_msdos
+%endif
 %{_unitdir}/multi-user.target.wants/deviced.service
 %{_unitdir}/sockets.target.wants/deviced.socket
 %{_unitdir}/graphical.target.wants/zbooting-done.service