From 75fb35d649f42b77050b5d9e9f93258e838d34c7 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Mon, 18 Feb 2013 13:18:54 +0000 Subject: [PATCH] Separated build for baltic device. using shm instead of pixmap Change-Id: I446f2ca5c93233367995cd7e8d77a309c77104d6 --- CMakeLists.txt | 5 +++-- data/baltic.conf.ini | 29 +++++++++++++++++++++++++ data/{conf.ini => private.conf.ini} | 0 packaging/com.samsung.data-provider-master.spec | 10 +++++++-- 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 data/baltic.conf.ini rename data/{conf.ini => private.conf.ini} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0114704..e607144 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,6 @@ ADD_DEFINITIONS("-DNDEBUG") ADD_DEFINITIONS(${pkg_CFLAGS}) ADD_DEFINITIONS(${pkg_LDFLAGS}) - ADD_EXECUTABLE(${PROJECT_NAME} src/main.c src/util.c @@ -84,7 +83,9 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkg_LDFLAGS} "-ldl") #INSTALL(FILES ${CMAKE_SOURCE_DIR}/com.samsung.data-provider-master.desktop DESTINATION /opt/share/applications) #INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /opt/apps/com.samsung.${PROJECT_NAME}/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/abi.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) -INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/conf.ini DESTINATION /usr/share/data-provider-master PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) + +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}/LICENSE DESTINATION /usr/share/license RENAME "com.samsung.${PROJECT_NAME}") INSTALL(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE SETUID) diff --git a/data/baltic.conf.ini b/data/baltic.conf.ini new file mode 100644 index 0000000..2a0f195 --- /dev/null +++ b/data/baltic.conf.ini @@ -0,0 +1,29 @@ +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=5242880 +replace_tag=/APPID/ +slave_ttl=30.0 +slave_activate_time=30.0 +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=/opt/usr/share/live_magazine/log +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 diff --git a/data/conf.ini b/data/private.conf.ini similarity index 100% rename from data/conf.ini rename to data/private.conf.ini diff --git a/packaging/com.samsung.data-provider-master.spec b/packaging/com.samsung.data-provider-master.spec index 9c2a18f..fb877fc 100644 --- a/packaging/com.samsung.data-provider-master.spec +++ b/packaging/com.samsung.data-provider-master.spec @@ -1,6 +1,6 @@ Name: com.samsung.data-provider-master Summary: Master service provider for liveboxes. -Version: 0.16.7 +Version: 0.16.8 Release: 1 Group: framework/livebox License: Flora License @@ -32,6 +32,7 @@ BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xdamage) BuildRequires: pkgconfig(pkgmgr) BuildRequires: pkgconfig(livebox-service) +BuildRequires: sec-product-features %description Manage the 2nd stage livebox service provider and communicate with the viewer application. @@ -41,7 +42,12 @@ Keep trace on the life-cycle of the livebox and status of the service providers, %setup -q %build -cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} +%if 0%(test "%{?sec_build_conf_tizen_product_group}" == "baltic" && echo 1) +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DPRODUCT=baltic +%else +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DPRODUCT=private +%endif + CFLAGS="${CFLAGS} -Wall -Winline -Werror" LDFLAGS="${LDFLAGS}" make %{?jobs:-j%jobs} %install -- 2.7.4