Remove ecore-wayland legacy.

Remove ecore-wayland legacy and the related.

Change-Id: Id194d1d630e6328d8e735c67a8b897cc86951361

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 3956c8d8b3f37b7199551dcebc61c62f36cf579c..ebc01a48a00bc2fbd305b4c0fa875be10d83eda5 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -14,17 +14,10 @@ SET(IMAGE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/images")
 SET(LOCALE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/locale")
 SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
 
-IF("${ENABLE_ECOREWL2}" STREQUAL "On")
-        OPTION(USE_ECOREWL2 "Use ecorewl2" ON)
-ENDIF()
-
-IF(USE_ECOREWL2)
-        ADD_DEFINITIONS("-DECORE_WL2")
-        ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT")
-ENDIF()
+ADD_DEFINITIONS("-DECORE_WL2")
+ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT")
 
 INCLUDE(FindPkgConfig)
-IF(USE_ECOREWL2)
 pkg_check_modules(viewer_dali REQUIRED
        dlog
        widget_service
@@ -39,22 +32,6 @@ pkg_check_modules(viewer_dali REQUIRED
        tizen-remote-surface-client
        screen_connector_watcher
 )
-ELSE()
-pkg_check_modules(viewer_dali REQUIRED
-        dlog
-        widget_service
-        capi-system-info
-        dali2-core
-        dali2-adaptor
-        dali2-toolkit
-        cynara-client
-        cynara-creds-self
-        ecore-wayland
-        ecore-input
-        tizen-remote-surface-client
-        screen_connector_watcher
-)
-ENDIF()
 
 SET(BUILD_SOURCE
        ${ROOT_SRC_DIR}/widget_viewer_dali/public_api/widget_view/widget_view.cpp

diff --git a/build/tizen/watch-viewer-dali/CMakeLists.txt b/build/tizen/watch-viewer-dali/CMakeLists.txt
index ab6ade10b5ee7d8fd30d5875353d4898f098686c..34ff80fbb391d2ff4f70f83cb7861f7a4c90fc96 100644 (file)
--- a/build/tizen/watch-viewer-dali/CMakeLists.txt
+++ b/build/tizen/watch-viewer-dali/CMakeLists.txt
@@ -14,17 +14,10 @@ SET(IMAGE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/images")
 SET(LOCALE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/locale")
 SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
 
-IF("${ENABLE_ECOREWL2}" STREQUAL "On")
-        OPTION(USE_ECOREWL2 "Use ecorewl2" ON)
-ENDIF()
-
-IF(USE_ECOREWL2)
-        ADD_DEFINITIONS("-DECORE_WL2")
-        ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT")
-ENDIF()
+ADD_DEFINITIONS("-DECORE_WL2")
+ADD_DEFINITIONS("-DEFL_BETA_API_SUPPORT")
 
 INCLUDE(FindPkgConfig)
-IF(USE_ECOREWL2)
 pkg_check_modules(watch_viewer_dali REQUIRED
        dlog
        capi-system-info
@@ -38,21 +31,6 @@ pkg_check_modules(watch_viewer_dali REQUIRED
        screen_connector_watcher
         watch-holder-base
 )
-ELSE()
-pkg_check_modules(watch_viewer_dali REQUIRED
-        dlog
-        capi-system-info
-        dali2-core
-        dali2-adaptor
-        dali2-toolkit
-        cynara-client
-        ecore-wayland
-        ecore-input
-        tizen-remote-surface-client
-        screen_connector_watcher
-        watch-holder-base
-)
-ENDIF()
 
 SET(BUILD_SOURCE
         ${ROOT_SRC_DIR}/watch_viewer_dali/public_api/watch_view/watch_view.cpp

diff --git a/packaging/widget-viewer-dali.spec b/packaging/widget-viewer-dali.spec
index bba8e2a309d97146d9e4663baadfc70417d17240..087931408215843e87430a0dcdc5de294349bdfe 100644 (file)
--- a/packaging/widget-viewer-dali.spec
+++ b/packaging/widget-viewer-dali.spec
@@ -24,12 +24,7 @@ BuildRequires: pkgconfig(cynara-creds-self)
 BuildRequires: pkgconfig(wayland-tbm-client)
 BuildRequires: pkgconfig(screen_connector_watcher)
 BuildRequires: pkgconfig(watch-holder-base)
-
-%if 0%{?tizen_version_major} >= 5
-BuildRequires:  pkgconfig(ecore-wl2)
-%else
-BuildRequires:  pkgconfig(ecore-wayland)
-%endif
+BuildRequires: pkgconfig(ecore-wl2)
 
 # For ASAN test
 %if "%{vd_asan}" == "1" || "%{asan}" == "1"
@@ -71,13 +66,8 @@ LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -pie -Wl,-z,relro,-z,now"
 CXXFLAGS+=" -D_ARCH_ARM_"
 %endif
 
-%if 0%{?tizen_version_major} >= 5
-    export CFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT "
-    export CXXFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT "
-    %define ENABLE_ECOREWL2 On
-%else
-    %define ENABLE_ECOREWL2 Off
-%endif
+export CFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT "
+export CXXFLAGS+=" -DECORE_WL2 -DEFL_BETA_API_SUPPORT "
 
 %if 0%{?tizen_version_major} >= 7
 CXXFLAGS+=" -DOVER_TIZEN_VERSION_7"
@@ -94,7 +84,6 @@ cd %{_builddir}/%{name}-%{version}/build/tizen
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %cmake -DWIDGET_ENABLED=On \
           -DTZ_SYS_SHARE=/usr/share \
-       -DENABLE_ECOREWL2=%{ENABLE_ECOREWL2} \
        -DFULLVER=%{version} \
        -DMAJORVER=${MAJORVER} \
 %if 0%{?enable_debug}