From ef6e54c71c1840ec817691e94c95bc88260aa843 Mon Sep 17 00:00:00 2001 From: Sunghyun Kim Date: Thu, 3 Sep 2020 19:00:02 +0900 Subject: [PATCH] Delete gcov widget_viewer_dali don't use gcov. it need to add when uniitest is ready. so now i delete it Change-Id: Ib1c0e4486e19d1320f003d621ca42c9ed34e6817 --- build/tizen/CMakeLists.txt | 2 +- build/tizen/watch-viewer-dali/CMakeLists.txt | 2 +- packaging/widget-viewer-dali.spec | 42 -------------------- 3 files changed, 2 insertions(+), 44 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 7892235..fbdc54d 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -65,7 +65,7 @@ FOREACH(flag ${viewer_dali_CFLAGS}) ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -DHIDE_DALI_INTERNALS -Wall -Werror -Winline -g") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fprofile-arcs -ftest-coverage") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") diff --git a/build/tizen/watch-viewer-dali/CMakeLists.txt b/build/tizen/watch-viewer-dali/CMakeLists.txt index c7337e5..94eb4b4 100644 --- a/build/tizen/watch-viewer-dali/CMakeLists.txt +++ b/build/tizen/watch-viewer-dali/CMakeLists.txt @@ -64,7 +64,7 @@ FOREACH(flag ${watch_viewer_dali_CFLAGS}) ENDFOREACH(flag) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden -DHIDE_DALI_INTERNALS -Wall -Werror -Winline -g") -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fprofile-arcs -ftest-coverage") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") diff --git a/packaging/widget-viewer-dali.spec b/packaging/widget-viewer-dali.spec index 99a28b1..bc9971c 100644 --- a/packaging/widget-viewer-dali.spec +++ b/packaging/widget-viewer-dali.spec @@ -23,9 +23,6 @@ BuildRequires: pkgconfig(cynara-client) BuildRequires: pkgconfig(wayland-tbm-client) BuildRequires: pkgconfig(screen_connector_watcher) BuildRequires: pkgconfig(watch-holder-base) -%if 0%{?gcov:1} -BuildRequires: lcov -%endif %if 0%{?tizen_version_major} >= 5 BuildRequires: pkgconfig(ecore-wl2) @@ -47,24 +44,6 @@ Requires: %{name} = %{version}-%{release} %description devel Header and package configuration files for the widget viewer development - -################################################# -# widget-viewer-gcov -################################################# -%if 0%{?gcov:1} -%package gcov -Summary: Simple string key-val dictionary ADT (gcov) -Group: Application Framework/Testing - -%description gcov -Simple string key-val dictionary ADT gcov objects -%endif - -%if 0%{?gcov:1} -%files gcov -%{_datadir}/gcov/* -%endif - ############################## # Preparation ############################## @@ -75,12 +54,6 @@ Simple string key-val dictionary ADT gcov objects # Build ############################## %build -%if 0%{?gcov:1} -export CFLAGS+=" -fprofile-arcs -ftest-coverage" -export CXXFLAGS+=" -fprofile-arcs -ftest-coverage" -export FFLAGS+=" -fprofile-arcs -ftest-coverage" -export LDFLAGS+=" -lgcov" -%endif PREFIX="/usr" CXXFLAGS+=" -Wall -g -O2 -fPIE -Wl,-z,relro,-z,now -fstack-protector-strong -D_FORTIFY_SOURCE=2" @@ -110,11 +83,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` make %{?jobs:-j%jobs} -%if 0%{?gcov:1} -mkdir -p gcov-obj -find . -name '*.gcno' -exec cp '{}' gcov-obj ';' -%endif - ############################## # Installation ############################## @@ -124,11 +92,6 @@ rm -rf %{buildroot} pushd build/tizen %make_install -%if 0%{?gcov:1} -mkdir -p %{buildroot}%{_datadir}/gcov/obj -install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj -%endif - ############################## # Post Install ############################## @@ -196,9 +159,4 @@ Header & package configuration of watch_viewer_dali %{_includedir}/watch_viewer_dali/* %{_libdir}/pkgconfig/watch_viewer_dali.pc -%if 0%{?gcov:1} -%files gcov -%{_datadir}/gcov/obj/* -%endif - # End of a file -- 2.34.1