From 64c594072fdc32a5d1bdcd0730459942eaba1770 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Wed, 14 May 2014 14:17:32 +0900 Subject: [PATCH] Prepare configuration files for various project. Change-Id: Ib53296040efba2b7025c117f7872d6fb519dc182 --- CMakeLists.txt | 8 ++++- data/baltic.conf.ini | 34 -------------------- data/{wayland.conf.ini => wayland.mobile.conf.ini} | 0 ...esolution.ini => wayland.mobile.resolution.ini} | 0 data/wayland.wearable.conf.ini | 37 ++++++++++++++++++++++ data/wayland.wearable.resolution.ini | 14 ++++++++ data/{private.conf.ini => x11.mobile.conf.ini} | 0 data/x11.mobile.resolution.ini | 13 ++++++++ data/x11.wearable.conf.ini | 37 ++++++++++++++++++++++ data/x11.wearable.resolution.ini | 14 ++++++++ include/conf.h | 0 packaging/data-provider-master.spec | 18 ++++++++--- src/notification_service.c | 0 13 files changed, 136 insertions(+), 39 deletions(-) delete mode 100644 data/baltic.conf.ini rename data/{wayland.conf.ini => wayland.mobile.conf.ini} (100%) rename data/{resolution.ini => wayland.mobile.resolution.ini} (100%) create mode 100644 data/wayland.wearable.conf.ini create mode 100644 data/wayland.wearable.resolution.ini rename data/{private.conf.ini => x11.mobile.conf.ini} (100%) create mode 100644 data/x11.mobile.resolution.ini create mode 100644 data/x11.wearable.conf.ini create mode 100644 data/x11.wearable.resolution.ini mode change 100755 => 100644 include/conf.h mode change 100755 => 100644 src/notification_service.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c8b517..193191b 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,6 +79,12 @@ ADD_DEFINITIONS("-DNDEBUG") ADD_DEFINITIONS("-D_USE_ECORE_TIME_GET") +IF (MOBILE) + ADD_DEFINITIONS("-DMOBILE") +ELSEIF (WEARABLE) + ADD_DEFINITIONS("-DWEARABLE") +ENDIF (MOBILE) + SET(BUILD_SOURCE src/main.c src/util.c @@ -144,7 +150,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/abi.ini DESTINATION /usr/share/data-provi INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PRODUCT}.conf.ini DESTINATION /usr/share/data-provider-master RENAME "conf.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/resolution.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/${PRODUCT}.resolution.ini DESTINATION /usr/share/data-provider-master RENAME "resolution.ini" PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME "${PROJECT_NAME}") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) diff --git a/data/baltic.conf.ini b/data/baltic.conf.ini deleted file mode 100644 index 644b940..0000000 --- a/data/baltic.conf.ini +++ /dev/null @@ -1,34 +0,0 @@ -base_width=720 -base_height=1280 -minimum_period=1.0 -script=edje -default_abi=c -default_group=disclosure -default_period=-1.0 -default_packet_time=0.0001 -default_content=default -minimum_space=104857600 -replace_tag=/APPID/ -slave_ttl=30.0 -slave_activate_time=30.0 -slave_relaunch_time=3.0 -slave_relaunch_count=3 -max_log_line=1000 -max_log_file=3 -sqilte_flush_max=1048576 -db_path=/opt/dbspace/.livebox.db -share_path=/opt/usr/share/live_magazine/ -log_path=/tmp/.dbox.service -always_path=/opt/usr/share/live_magazine/always -reader_path=/opt/usr/share/live_magazine/reader -script_port_path=/usr/share/data-provider-master/plugin-script/ -ping_interval=240.0 -slave_max_load=30 -use_sw_backend=false -provider_method=shm -debug_mode=false -overwrite_content=false -com_core_thread=true -use_xmonitor=false -input=/dev/input/event1 -pd_request_timeout=5.0 diff --git a/data/wayland.conf.ini b/data/wayland.mobile.conf.ini similarity index 100% rename from data/wayland.conf.ini rename to data/wayland.mobile.conf.ini diff --git a/data/resolution.ini b/data/wayland.mobile.resolution.ini similarity index 100% rename from data/resolution.ini rename to data/wayland.mobile.resolution.ini diff --git a/data/wayland.wearable.conf.ini b/data/wayland.wearable.conf.ini new file mode 100644 index 0000000..2866b74 --- /dev/null +++ b/data/wayland.wearable.conf.ini @@ -0,0 +1,37 @@ +base_width=320 +base_height=320 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.livebox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=shm +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +#input=/dev/input/event2 +pd_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +services=[livebox],[shortcut],[badge] diff --git a/data/wayland.wearable.resolution.ini b/data/wayland.wearable.resolution.ini new file mode 100644 index 0000000..b9e7561 --- /dev/null +++ b/data/wayland.wearable.resolution.ini @@ -0,0 +1,14 @@ +1x1=320x320 +2x1=0x0 +2x2=320x320 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=320x320 +base=320x320 diff --git a/data/private.conf.ini b/data/x11.mobile.conf.ini similarity index 100% rename from data/private.conf.ini rename to data/x11.mobile.conf.ini diff --git a/data/x11.mobile.resolution.ini b/data/x11.mobile.resolution.ini new file mode 100644 index 0000000..e2b5a17 --- /dev/null +++ b/data/x11.mobile.resolution.ini @@ -0,0 +1,13 @@ +1x1=175x175 +2x1=354x175 +2x2=354x354 +4x1=712x175 +4x2=712x354 +4x3=712x533 +4x4=712x712 +4x5=712x891 +4x6=712x1070 +21x21=224x215 +23x21=680x215 +23x23=680x653 +0x0=720x1280 diff --git a/data/x11.wearable.conf.ini b/data/x11.wearable.conf.ini new file mode 100644 index 0000000..260dadb --- /dev/null +++ b/data/x11.wearable.conf.ini @@ -0,0 +1,37 @@ +base_width=320 +base_height=320 +minimum_period=1.0 +#script=edje +#default_abi=c +#default_group=disclosure +default_period=-1.0 +default_packet_time=0.0001 +#default_content=default +minimum_space=104857600 +#replace_tag=/APPID/ +slave_ttl=0.0 +slave_activate_time=30.0 +slave_relaunch_time=3.0 +slave_relaunch_count=3 +max_log_line=1000 +max_log_file=3 +sqilte_flush_max=1048576 +#db_path=/opt/dbspace/.livebox.db +#share_path=/opt/usr/share/live_magazine/ +log_path=/tmp/.dbox.service +#always_path=/opt/usr/share/live_magazine/always +#reader_path=/opt/usr/share/live_magazine/reader +#script_port_path=/usr/share/data-provider-master/plugin-script/ +ping_interval=240.0 +slave_max_load=30 +use_sw_backend=false +provider_method=pixmap +debug_mode=false +overwrite_content=false +com_core_thread=true +use_xmonitor=false +#input=/dev/input/event2 +pd_request_timeout=5.0 +premultiplied=0 +#emergency_disk=source=tmpfs;type=tmpfs;option=size=6M +services=[livebox],[shortcut],[badge] diff --git a/data/x11.wearable.resolution.ini b/data/x11.wearable.resolution.ini new file mode 100644 index 0000000..b9e7561 --- /dev/null +++ b/data/x11.wearable.resolution.ini @@ -0,0 +1,14 @@ +1x1=320x320 +2x1=0x0 +2x2=320x320 +4x1=0x0 +4x2=0x0 +4x3=0x0 +4x4=0x0 +4x5=0x0 +4x6=0x0 +21x21=0x0 +23x21=0x0 +23x23=0x0 +0x0=320x320 +base=320x320 diff --git a/include/conf.h b/include/conf.h old mode 100755 new mode 100644 diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index e7e1656..b3c81d5 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -79,10 +79,20 @@ export LIVEBOX_SHM=wayland %else export WAYLAND_SUPPORT=Off export X11_SUPPORT=On -export LIVEBOX_SHM=private +export LIVEBOX_SHM=x11 %endif -%cmake . -DPRODUCT=${LIVEBOX_SHM} -DENGINEER_BINARY=${ENGINEER} -DWAYLAND_SUPPORT=${WAYLAND_SUPPORT} -DX11_SUPPORT=${X11_SUPPORT} +%if "%{_repository}" == "wearable" +export LIVEBOX_SHM="${LIVEBOX_SHM}.wearable" +export MOBILE=Off +export WEARABLE=On +%else +export LIVEBOX_SHM="${LIVEBOX_SHM}.mobile" +export MOBILE=On +export WEARABLE=Off +%endif + +%cmake . -DPRODUCT=${LIVEBOX_SHM} -DENGINEER_BINARY=${ENGINEER} -DWAYLAND_SUPPORT=${WAYLAND_SUPPORT} -DX11_SUPPORT=${X11_SUPPORT} -DMOBILE=${MOBILE} -DWEARABLE=${WEARABLE} CFLAGS="${CFLAGS} -Wall -Winline -Werror" LDFLAGS="${LDFLAGS}" make %{?jobs:-j%jobs} @@ -104,8 +114,8 @@ if [ ! -s %{buildroot}/opt/dbspace/.livebox.db ]; then echo "LiveBox DB file is not exists, initiate it" sqlite3 %{buildroot}/opt/dbspace/.livebox.db <