From: MyungKi Lee Date: Mon, 10 Feb 2020 00:25:50 +0000 (+0000) Subject: Revert "Add ambient-viewer skeleton" X-Git-Tag: submit/tizen/20200213.013732~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3705d1a4214ba3f3a60246f8cf2d8b3eaed8eaac;p=platform%2Fcore%2Fappfw%2Fwidget-viewer.git Revert "Add ambient-viewer skeleton" This reverts commit 469fb8f70107c5971277391c1bdfb4ccf34895b6. Change-Id: I1e40d4729f3666a447bd0f6747ce94d85fd4e0cb --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 86bbc61e..0731195a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,6 @@ ADD_SUBDIRECTORY(watch-holder) ADD_SUBDIRECTORY(watch-control) ADD_SUBDIRECTORY(frame-broker) ADD_SUBDIRECTORY(frame-provider) -ADD_SUBDIRECTORY(ambient-viewer) ADD_SUBDIRECTORY(tool) ADD_SUBDIRECTORY(unittest) diff --git a/ambient-viewer/CMakeLists.txt b/ambient-viewer/CMakeLists.txt deleted file mode 100644 index 37efc305..00000000 --- a/ambient-viewer/CMakeLists.txt +++ /dev/null @@ -1,42 +0,0 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -PROJECT(ambient-viewer C) - -SET(PREFIX "${CMAKE_INSTALL_PREFIX}") -SET(PROJECT_NAME "${PROJECT_NAME}") -SET(LIBDIR ${LIB_INSTALL_DIR}) -SET(INCLUDEDIR "\${prefix}/include/${PROJECT_NAME}") -SET(VERSION_MAJOR "${MAJORVER}") -SET(VERSION "${FULLVER}") - -AUX_SOURCE_DIRECTORY(src BUILD_SOURCE) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) - -INCLUDE(FindPkgConfig) -PKG_CHECK_MODULES(ambient-viewer REQUIRED - dlog - glib-2.0 - elementary - bundle -) - -FOREACH(flag ${ambient-viewer_CFLAGS}) - SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") -ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -g -Wall -Werror") - -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS}") -SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") -SET(CMAKE_C_FLAGS_RELEASE "-O2") - -ADD_LIBRARY(${PROJECT_NAME} SHARED ${BUILD_SOURCE}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR}) -SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES VERSION ${VERSION}) - -TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${ambient-viewer_LDFLAGS}) - -CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) -SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}.pc") - -INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR}) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/ambient_viewer.h DESTINATION include/${PROJECT_NAME}) diff --git a/ambient-viewer/ambient-viewer.pc.in b/ambient-viewer/ambient-viewer.pc.in deleted file mode 100644 index 72a973df..00000000 --- a/ambient-viewer/ambient-viewer.pc.in +++ /dev/null @@ -1,12 +0,0 @@ -prefix=@PREFIX@ -exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ -includedir=@INCLUDEDIR@ - -Name: ui_app_ambient_viewer -Description: Support development of the ambient viewer -Version: @VERSION@ -Libs: -L${libdir} -lui_app_ambient_viewer -Cflags: -I${includedir} -cppflags: -I${includedir} - diff --git a/ambient-viewer/include/ambient_viewer.h b/ambient-viewer/include/ambient_viewer.h deleted file mode 100644 index 8859bbd6..00000000 --- a/ambient-viewer/include/ambient_viewer.h +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include -#include - -typedef void *ambient_viewer_h; - -typedef enum { - AMBIENT_EVENT_CHANGE_READY, -} ambient_event_type_e; - -typedef void (*ambient_viewer_lifecycle_added_cb)(const char *appid, - const char *inst_id, bool is_watch, void *user_data); - -typedef void (*ambient_viewer_lifecycle_removed_cb)(const char *appid, - const char *inst_id, bool is_watch, void *user_data); - -typedef void (*ambient_viewer_lifecycle_updated_cb)(const char *appid, - const char *inst_id, Evas_Object *image, bool is_watch, - void *user_data); - - -typedef struct { - ambient_viewer_lifecycle_added_cb added; - ambient_viewer_lifecycle_removed_cb deleted; - ambient_viewer_lifecycle_updated_cb updated; -} ambient_viewer_lifecycle_s; - -int ambient_viewer_create(Evas_Object *win, ambient_viewer_h *handle); - -int ambient_viewer_destroy(ambient_viewer_h handle); - -int ambient_viewer_notify_ambient_changed_event(ambient_viewer_h handle, - const char *appid, const char *instance_id, bool enter, - bundle *extra); - -int ambient_viewer_monitor(ambient_viewer_h handle, - ambient_viewer_lifecycle_s lifecycle, void *user_data); - -int ambient_viewer_unmonitor(ambient_viewer_h handle); - -typedef void (*ambient_viewer_event_cb)(ambient_event_type_e event, - const char *sender, bundle *extra, void *user_data); - -int ambient_viewer_set_event_listener(ambient_viewer_h handle, - ambient_viewer_event_cb callback, void *user_data); - -int ambient_viewer_unset_event_listener(ambient_viewer_h handle); - diff --git a/ambient-viewer/src/ambient_viewer.c b/ambient-viewer/src/ambient_viewer.c deleted file mode 100644 index f22f941f..00000000 --- a/ambient-viewer/src/ambient_viewer.c +++ /dev/null @@ -1,41 +0,0 @@ -#include - - -int ambient_viewer_create(Evas_Object *win, ambient_viewer_h *handle) -{ - return 0; -} - -int ambient_viewer_destroy(ambient_viewer_h handle) -{ - return 0; -} - -int ambient_viewer_notify_ambient_changed_event(ambient_viewer_h handle, - const char *appid, const char *instance_id, bool enter, - bundle *extra) -{ - return 0; -} - -int ambient_viewer_monitor(ambient_viewer_h handle, - ambient_viewer_lifecycle_s lifecycle, void *user_data) -{ - return 0; -} - -int ambient_viewer_unmonitor(ambient_viewer_h handle) -{ - return 0; -} - -int ambient_viewer_set_event_listener(ambient_viewer_h handle, - ambient_viewer_event_cb callback, void *user_data) -{ - return 0; -} - -int ambient_viewer_unset_event_listener(ambient_viewer_h handle) -{ - return 0; -} diff --git a/packaging/ambient-viewer.manifest b/packaging/ambient-viewer.manifest deleted file mode 100644 index a76fdbae..00000000 --- a/packaging/ambient-viewer.manifest +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/packaging/libwidget_viewer.spec b/packaging/libwidget_viewer.spec index ec3004db..194eb9ad 100644 --- a/packaging/libwidget_viewer.spec +++ b/packaging/libwidget_viewer.spec @@ -13,7 +13,6 @@ Source1004: watch-control.manifest Source1005: frame-broker.manifest Source1006: frame-provider.manifest Source1007: watch-holder.manifest -Source1008: ambient-viewer.manifest BuildRequires: cmake, gettext-tools, coreutils, edje-bin BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(aul) @@ -57,7 +56,6 @@ cp %{SOURCE1004} . cp %{SOURCE1005} . cp %{SOURCE1006} . cp %{SOURCE1007} . -cp %{SOURCE1008} . %build %if 0%{?gcov:1} @@ -192,7 +190,6 @@ Header & package configuration of watch-control ################################################ # libwatch_holder -################################################ %package -n watch-holder Summary: APIs to control watch applications Version: 0.0.1 @@ -260,29 +257,6 @@ Header & package configuration for the callee (devel) %post -n frame-provider -p /sbin/ldconfig %postun -n frame-provider -p /sbin/ldconfig -################################################ -# libambient-viewer -################################################ -%package -n ambient-viewer -Summary: APIs to control ambient viewer -Version: 0.0.1 -License: apache-2.0 -Group: Applications/Core Applications - -%description -n ambient-viewer -A set of APIs to control viewer applications - -%package -n ambient-viewer-devel -Summary: APIs to control watch applications -Group: Development/Libraries -Requires: ambient-viewer - -%description -n ambient-viewer-devel -Header & package configuration of ambient-viewer - -%post -n ambient-viewer -p /sbin/ldconfig -%postun -n ambient-viewer -p /sbin/ldconfig - ################################################ # files ################################################ @@ -347,12 +321,4 @@ Header & package configuration of ambient-viewer %{_libdir}/pkgconfig/frame-provider.pc %{_libdir}/libframe-provider.so -%files -n ambient-viewer -%manifest ambient-viewer.manifest -%{_libdir}/libambient-viewer.so.* - -%files -n ambient-viewer-devel -%{_includedir}/ambient-viewer/*.h -%{_libdir}/pkgconfig/ambient-viewer.pc -%{_libdir}/libambient-viewer.so # End of a file