From dff9f1aeb5e4349facdf6178e003a6d9c7106ef0 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 22 Jul 2022 16:02:28 +0900 Subject: [PATCH 01/16] Reorganize directory for coverage automation Change-Id: I4ef843f52229917f55a28c3431b680af88e31b6a --- CMakeLists.txt | 2 +- client/CMakeLists.txt | 15 ++++++++------- client/{src => }/sticker_consumer.c | 0 client/{inc => }/sticker_consumer_main.h | 0 client/{src => }/sticker_data.c | 0 client/{inc => }/sticker_data_main.h | 0 client/{src => }/sticker_dbus.c | 0 client/{src => }/sticker_dbus.h | 0 client/{inc => }/sticker_defs.h | 0 client/{src => }/sticker_provider.c | 0 client/{inc => }/sticker_provider_main.h | 0 packaging/capi-ui-sticker.spec | 1 + tests/CMakeLists.txt | 2 +- 13 files changed, 11 insertions(+), 9 deletions(-) rename client/{src => }/sticker_consumer.c (100%) rename client/{inc => }/sticker_consumer_main.h (100%) rename client/{src => }/sticker_data.c (100%) rename client/{inc => }/sticker_data_main.h (100%) rename client/{src => }/sticker_dbus.c (100%) rename client/{src => }/sticker_dbus.h (100%) rename client/{inc => }/sticker_defs.h (100%) rename client/{src => }/sticker_provider.c (100%) rename client/{inc => }/sticker_provider_main.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22c7a24..fc4f40e 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ ADD_DEFINITIONS("-Werror") ## Include common directory ## INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") -INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/client/inc") +INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/client") ## Dependent packages ## INCLUDE(FindPkgConfig) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index be848fc..8df7b70 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,16 +1,17 @@ SET(CONSUMER_SRCS - src/sticker_consumer.c - src/sticker_data.c - src/sticker_dbus.c + sticker_consumer.c + sticker_data.c + sticker_dbus.c ) SET(PROVIDER_SRCS - src/sticker_provider.c - src/sticker_data.c - src/sticker_dbus.c + sticker_provider.c + sticker_data.c + sticker_dbus.c ) -INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/client/inc) +INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}) +INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR}/include) FOREACH(flag ${pkgs_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") diff --git a/client/src/sticker_consumer.c b/client/sticker_consumer.c similarity index 100% rename from client/src/sticker_consumer.c rename to client/sticker_consumer.c diff --git a/client/inc/sticker_consumer_main.h b/client/sticker_consumer_main.h similarity index 100% rename from client/inc/sticker_consumer_main.h rename to client/sticker_consumer_main.h diff --git a/client/src/sticker_data.c b/client/sticker_data.c similarity index 100% rename from client/src/sticker_data.c rename to client/sticker_data.c diff --git a/client/inc/sticker_data_main.h b/client/sticker_data_main.h similarity index 100% rename from client/inc/sticker_data_main.h rename to client/sticker_data_main.h diff --git a/client/src/sticker_dbus.c b/client/sticker_dbus.c similarity index 100% rename from client/src/sticker_dbus.c rename to client/sticker_dbus.c diff --git a/client/src/sticker_dbus.h b/client/sticker_dbus.h similarity index 100% rename from client/src/sticker_dbus.h rename to client/sticker_dbus.h diff --git a/client/inc/sticker_defs.h b/client/sticker_defs.h similarity index 100% rename from client/inc/sticker_defs.h rename to client/sticker_defs.h diff --git a/client/src/sticker_provider.c b/client/sticker_provider.c similarity index 100% rename from client/src/sticker_provider.c rename to client/sticker_provider.c diff --git a/client/inc/sticker_provider_main.h b/client/sticker_provider_main.h similarity index 100% rename from client/inc/sticker_provider_main.h rename to client/sticker_provider_main.h diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index d501bd2..9be2ba1 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -128,6 +128,7 @@ rm -rf %{buildroot} builddir=$(basename $PWD) gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir" mkdir -p "$gcno_obj_dir" +find ./server/ -name '*.gcno' -exec rm {} \; find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' %endif diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7e877ef..193ffec 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../include) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/mock) AUX_SOURCE_DIRECTORY(src SOURCES) -AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../client/src STICKER_CLIENT_SOURCES) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/../client STICKER_CLIENT_SOURCES) AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/mock MOCK_SRCS) ADD_DEFINITIONS("-DFULLVER=\"${FULLVER}\"") -- 2.7.4 From 04ca8a2120e60cb90e3dee12d4eb1189d4920c4d Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 22 Jul 2022 16:35:41 +0900 Subject: [PATCH 02/16] Update package version to 1.2.7 Change-Id: I1a3d6bb38ca85ad158b3592299b022a05991b5a5 --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 9be2ba1..98da82b 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.6 +Version: 1.2.7 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index a832bf3..7ba9c98 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From 4d5bc9c34bc1f74c641a0cea00b36987f624a8eb Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 20 Oct 2022 18:48:39 +0900 Subject: [PATCH 03/16] Modified to prevent frequent restart of Sticker daemon Change-Id: I64e1a40c250c4a2efcfc78a6b6a5a22a95b5ba9f --- server/stickerd_data_manager.c | 37 +++++++++++++++++++++++++++++++------ 1 file changed, 31 insertions(+), 6 deletions(-) diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c index 79b65b5..66915b6 100644 --- a/server/stickerd_data_manager.c +++ b/server/stickerd_data_manager.c @@ -27,6 +27,7 @@ #include #include #include +#include #include "stickerd_dbus.h" #include "stickerd_data_manager.h" @@ -40,6 +41,7 @@ #define LOG_TAG "STICKERD_DATA_MANAGER" #define MAX_ERROR_BUFFER 256 +#define TERMINATE_TIMER_INTERVAL 3000 enum { STICKER_URI_TYPE_NONE, @@ -50,17 +52,36 @@ enum { static GHashTable *_monitoring_hash = NULL; static char error_buffer[MAX_ERROR_BUFFER]; static GList *consumer_list = NULL; +static guint _terminate_timer_id = 0; extern GMainLoop *main_loop; +static void _terminate_daemon() +{ + LOGD("Terminate sticker daemon"); + g_hash_table_destroy(_monitoring_hash); + _monitoring_hash = NULL; + g_list_free_full(consumer_list, free); + consumer_list = NULL; + g_main_loop_quit(main_loop); +} + +static gboolean _terminate_timer_handler(gpointer user_data) +{ + _terminate_daemon(); + return TRUE; +} + static void _check_watcher_exist() { if (_monitoring_hash != NULL && g_hash_table_size(_monitoring_hash) == 0) { - LOGD("Terminate sticker daemon"); - g_hash_table_destroy(_monitoring_hash); - _monitoring_hash = NULL; - g_list_free_full(consumer_list, free); - consumer_list = NULL; - g_main_loop_quit(main_loop); + if (_terminate_timer_id != 0) { + g_source_remove(_terminate_timer_id); + _terminate_timer_id = 0; + } + + _terminate_timer_id = g_timeout_add(TERMINATE_TIMER_INTERVAL, _terminate_timer_handler, NULL); + if (_terminate_timer_id <= 0) + _terminate_daemon(); } } @@ -70,6 +91,10 @@ static void _on_name_appeared(GDBusConnection *connection, gpointer user_data) { LOGD("name: %s", name); + if (_terminate_timer_id != 0) { + g_source_remove(_terminate_timer_id); + _terminate_timer_id = 0; + } } static void _on_name_vanished(GDBusConnection *connection, -- 2.7.4 From 609072eab62ecf3836caffe997dd51e7256179a0 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Thu, 20 Oct 2022 18:49:34 +0900 Subject: [PATCH 04/16] Update package version to 1.2.8 Change-Id: If26879b78270b87e1f7ccf56ad7a9505d38e2d02 --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 98da82b..fe8f48b 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.7 +Version: 1.2.8 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index 7ba9c98..51d8074 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From c01af2322b2bd6dbbb72d0b66b1d9ed7ef7c4861 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 10 Nov 2022 10:33:48 +0900 Subject: [PATCH 05/16] Exclude dbus file for coverage Change-Id: Ibf22ab08c31f7d6f68d46c0b346d7f2d7757c79c Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index fe8f48b..f390317 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -129,6 +129,7 @@ builddir=$(basename $PWD) gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir" mkdir -p "$gcno_obj_dir" find ./server/ -name '*.gcno' -exec rm {} \; +find . -name '*_dbus*.gcno' -exec rm {} \; find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' %endif -- 2.7.4 From 2a51ef3d487f5a26325c77b787a02f2e7d1e946b Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 10 Nov 2022 10:34:24 +0900 Subject: [PATCH 06/16] Update package version to 1.2.9 Change-Id: I332e6b0731767fcb26d7dae52c178df0f08f2deb Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index f390317..f4a791a 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.8 +Version: 1.2.9 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From 58c8943072ee676007b1b04ef7e98a3148392805 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Wed, 7 Dec 2022 16:54:17 +0900 Subject: [PATCH 07/16] Exclude tests directory for coverage Change-Id: I72acc327504655def62b69a7f6fde01c2e9b69b7 --- packaging/capi-ui-sticker.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index f4a791a..76c3328 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -129,6 +129,7 @@ builddir=$(basename $PWD) gcno_obj_dir=%{buildroot}%{_datadir}/gcov/obj/%{name}/"$builddir" mkdir -p "$gcno_obj_dir" find ./server/ -name '*.gcno' -exec rm {} \; +find ./tests/ -name '*.gcno' -not -path "*/client/*" -exec rm {} \; find . -name '*_dbus*.gcno' -exec rm {} \; find . -name '*.gcno' -exec cp --parents '{}' "$gcno_obj_dir" ';' %endif -- 2.7.4 From 69553bc6138f4db96df23d96d8d627e34a108fc4 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 9 Dec 2022 17:00:41 +0900 Subject: [PATCH 08/16] Remove unnecessary memory allocation function Change-Id: I26800d69df15e3df89000fe287ea907a36dc09c1 --- server/stickerd_data_manager.c | 11 +++++------ server/stickerd_dbus.c | 9 ++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c index 66915b6..7ab5a7f 100644 --- a/server/stickerd_data_manager.c +++ b/server/stickerd_data_manager.c @@ -60,7 +60,7 @@ static void _terminate_daemon() LOGD("Terminate sticker daemon"); g_hash_table_destroy(_monitoring_hash); _monitoring_hash = NULL; - g_list_free_full(consumer_list, free); + g_list_free(consumer_list); consumer_list = NULL; g_main_loop_quit(main_loop); } @@ -110,8 +110,10 @@ static void _on_name_vanished(GDBusConnection *connection, delete_monitoring_list(&_monitoring_hash, info->bus_name, info->watcher_id); } - if (g_list_find(consumer_list, info->bus_name)) - consumer_list = g_list_remove(consumer_list, info->bus_name); + GList *node = g_list_find_custom(consumer_list, info->bus_name, (GCompareFunc) strcmp); + if (node) { + consumer_list = g_list_delete_link(consumer_list, node); + } if (info->bus_name) free(info->bus_name); @@ -131,9 +133,6 @@ static void _stickerd_client_dbus_method_call_handler(GDBusConnection *conn, con if (_monitoring_hash == NULL) _monitoring_hash = g_hash_table_new(g_direct_hash, g_direct_equal); - if (consumer_list == NULL) - consumer_list = g_list_alloc(); - GVariant *reply_body = NULL; int ret = STICKERD_SERVER_ERROR_OPERATION_FAILED; diff --git a/server/stickerd_dbus.c b/server/stickerd_dbus.c index d125daf..96d22f0 100644 --- a/server/stickerd_dbus.c +++ b/server/stickerd_dbus.c @@ -84,7 +84,7 @@ int stickerd_server_register(GVariant *parameters, GVariant **reply_body, const } if ((CLIENT_LIB)c_lib == STICKER_CLIENT_LIB_CONSUMER) - *consumer_list = g_list_append(*consumer_list, strdup((const char *)sender)); + *consumer_list = g_list_append(*consumer_list, g_strdup((sender))); LOGD("sender: %s, watcher: %d", sender, m_info->watcher_id); monitoring_list = g_list_append(monitoring_list, list_bus_name); @@ -117,8 +117,11 @@ int stickerd_server_unregister(GVariant *parameters, GVariant **reply_body, cons g_variant_get(parameters, "(ii)", &c_lib, &watcher_id); - if ((CLIENT_LIB)c_lib == STICKER_CLIENT_LIB_CONSUMER) - *consumer_list = g_list_remove(*consumer_list, sender); + if ((CLIENT_LIB)c_lib == STICKER_CLIENT_LIB_CONSUMER) { + GList *node = g_list_find_custom(*consumer_list, sender, (GCompareFunc) strcmp); + if (node) + *consumer_list = g_list_delete_link(*consumer_list, node); + } if (g_hash_table_lookup(*monitoring_hash, GUINT_TO_POINTER(watcher_id)) != NULL) { g_bus_unwatch_name(watcher_id); -- 2.7.4 From 10171347828ee6cd8d906f006c323ba1df6b4579 Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 9 Dec 2022 18:13:11 +0900 Subject: [PATCH 09/16] Update package version to 1.2.10 Change-Id: Icf62e304e12195fb4945d1f3b0dcc50c130e68de --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 76c3328..33583b3 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.9 +Version: 1.2.10 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index 51d8074..c6318eb 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From ddab8293a8714ebf78ab7cf525a9e3bd3473f7af Mon Sep 17 00:00:00 2001 From: InHong Han Date: Fri, 23 Dec 2022 11:05:53 +0900 Subject: [PATCH 10/16] Fix issue detected by static analysis tool Change-Id: I5c7132c5aaa0a67fabac50e4fe8463cceaafec5a --- server/stickerd_db_manager.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/stickerd_db_manager.c b/server/stickerd_db_manager.c index 7240d04..5cbe566 100644 --- a/server/stickerd_db_manager.c +++ b/server/stickerd_db_manager.c @@ -504,7 +504,7 @@ int stickerd_db_delete_sticker_info(int record_id) uri = sqlite3_column_text(stmt, 1); thumbnail = sqlite3_column_text(stmt, 2); - if (uri_type == 1 && unlink((const char *)uri) == -1) + if (uri_type == 1 && uri && unlink((const char *)uri) == -1) LOGE("fail to delete sticker file"); if (thumbnail && unlink((const char *)thumbnail) == -1) -- 2.7.4 From 298a37f2cc87fa51aec717226f36f5997036115d Mon Sep 17 00:00:00 2001 From: InHong Han Date: Mon, 26 Dec 2022 14:33:15 +0900 Subject: [PATCH 11/16] Update package version to 1.2.11 Change-Id: Id93615bfc50af9fe8fd9abfd9b75ae190fcd06de --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 33583b3..be2700d 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.10 +Version: 1.2.11 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index c6318eb..a9f2ebc 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From df4753674343dfe78e10fd5d3b79fe253d3e1f02 Mon Sep 17 00:00:00 2001 From: Inhong Han Date: Thu, 22 Feb 2024 10:31:41 +0900 Subject: [PATCH 12/16] Fix build error due to gtest upgrade Change-Id: I30f0544f66f3c3a0cc769a39685a79f0b458d9da --- tests/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 193ffec..4979d05 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,7 +8,7 @@ ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -Wall -Werror -fPIE") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++11") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS} -std=c++14") SET(SOURCES "") -- 2.7.4 From 953c4c0e0e13138d5c1f3d0583fd4d5151cfd012 Mon Sep 17 00:00:00 2001 From: Inhong Han Date: Thu, 22 Feb 2024 14:36:14 +0900 Subject: [PATCH 13/16] Update package version to 1.2.12 Change-Id: Ib34b242cdf8703d16bd03c42535706b01aed2d9c --- packaging/capi-ui-sticker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index be2700d..9dcacf0 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.11 +Version: 1.2.12 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 -- 2.7.4 From 9ab901ab2433cb2159b56f423a748ade626d9fd1 Mon Sep 17 00:00:00 2001 From: Inhong Han Date: Tue, 12 Mar 2024 13:16:44 +0900 Subject: [PATCH 14/16] Fix lcov error Change-Id: I0c1c030ddcdd08a30fb189159a2aa0b80750aade --- packaging/capi-ui-sticker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 9dcacf0..b58ac85 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -184,7 +184,7 @@ install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/dbus-1/system.d/capi-ui-stic %check %if 0%{?gcov:1} ctest --output-on-failure %{?_smp_mflags} -lcov -c --ignore-errors graph --no-external -q -d . -o capi-ui-sticker.info +lcov -c --ignore-errors mismatch,graph,unused --no-external -q -d . -o capi-ui-sticker.info genhtml capi-ui-sticker.info -o capi-ui-sticker.out zip -r capi-ui-sticker.zip capi-ui-sticker.out capi-ui-sticker.info install -m 0644 capi-ui-sticker.zip %{buildroot}%{_datadir}/gcov -- 2.7.4 From 127e2de97c535052feb77a961071f6084f014205 Mon Sep 17 00:00:00 2001 From: Inhong Han Date: Tue, 12 Mar 2024 13:18:46 +0900 Subject: [PATCH 15/16] Update package version to 1.2.13 Change-Id: Ib680bf9f551d8a92709ed9cafad804e870368298 --- packaging/capi-ui-sticker.spec | 2 +- receiver/tizen-manifest.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index b58ac85..99bc0c4 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -1,6 +1,6 @@ Name: capi-ui-sticker Summary: Sticker client library and daemon -Version: 1.2.12 +Version: 1.2.13 Release: 1 Group: Graphics & UI Framework/Input License: Apache-2.0 diff --git a/receiver/tizen-manifest.xml b/receiver/tizen-manifest.xml index a9f2ebc..650e65f 100644 --- a/receiver/tizen-manifest.xml +++ b/receiver/tizen-manifest.xml @@ -1,5 +1,5 @@ - + -- 2.7.4 From 6f4d963e1a2e2a4ac870f8f65a45ff0071fe7cf6 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Tue, 19 Mar 2024 10:55:44 +0900 Subject: [PATCH 16/16] Add option to execute unittest in building package Change-Id: I29c5de4eaeb9abd116a4aa26efa26d9d3bcf60fb Signed-off-by: Jihoon Kim --- packaging/capi-ui-sticker.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec index 99bc0c4..031c8a9 100644 --- a/packaging/capi-ui-sticker.spec +++ b/packaging/capi-ui-sticker.spec @@ -183,12 +183,14 @@ install -m 0644 %SOURCE3 %{buildroot}%{_sysconfdir}/dbus-1/system.d/capi-ui-stic %check %if 0%{?gcov:1} +%if 0%{?run_unittest:1} ctest --output-on-failure %{?_smp_mflags} lcov -c --ignore-errors mismatch,graph,unused --no-external -q -d . -o capi-ui-sticker.info genhtml capi-ui-sticker.info -o capi-ui-sticker.out zip -r capi-ui-sticker.zip capi-ui-sticker.out capi-ui-sticker.info install -m 0644 capi-ui-sticker.zip %{buildroot}%{_datadir}/gcov %endif +%endif %post /sbin/ldconfig -- 2.7.4