From 96d2a245c9f4e006a94b4f85738b798573027aab Mon Sep 17 00:00:00 2001 From: ByungWoo Lee Date: Tue, 5 Jul 2016 15:05:25 +0900 Subject: [PATCH] Remove capi-maps-service-plugin Change-Id: I73419d7d1b45d16230ea7a738f0767c06bf028f6 --- error_messages/capi-maps-service-plugin-rs.xml | 12 ------------ include/private/tizen_error_private.h | 2 -- packaging/capi-base-common.spec | 6 +++--- tool/CMakeLists.txt_coverage | 3 +-- 4 files changed, 4 insertions(+), 19 deletions(-) delete mode 100644 error_messages/capi-maps-service-plugin-rs.xml diff --git a/error_messages/capi-maps-service-plugin-rs.xml b/error_messages/capi-maps-service-plugin-rs.xml deleted file mode 100644 index 73ff475..0000000 --- a/error_messages/capi-maps-service-plugin-rs.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - TIZEN_ERROR_MAPS_SERVICE | 0x01 - Service unavailable - - - TIZEN_ERROR_MAPS_SERVICE | 0x02 - Result not found - - - diff --git a/include/private/tizen_error_private.h b/include/private/tizen_error_private.h index f182591..bf9a87c 100644 --- a/include/private/tizen_error_private.h +++ b/include/private/tizen_error_private.h @@ -336,8 +336,6 @@ static err_info err_list[] = { ERR_ENTRY("MEDIA_STREAMER_ERROR_CONNECTION_FAILED", TIZEN_ERROR_MEDIA_STREAMER | 0x02, "Connection failed"), ERR_ENTRY("MEDIA_STREAMER_ERROR_RESOURCE_CONFLICT", TIZEN_ERROR_MEDIA_STREAMER | 0x03, "Resource conflict"), ERR_ENTRY("MEDIA_STREAMER_ERROR_SEEK_FAILED", TIZEN_ERROR_MEDIA_STREAMER | 0x04, "Seek operation failure"), - ERR_ENTRY("MAPS_ERROR_SERVICE_NOT_AVAILABLE", TIZEN_ERROR_MAPS_SERVICE | 0x01, "Service unavailable"), - ERR_ENTRY("MAPS_ERROR_NOT_FOUND", TIZEN_ERROR_MAPS_SERVICE | 0x02, "Result not found"), ERR_ENTRY("WIDGET_ERROR_FAULT", TIZEN_ERROR_WIDGET | 0x0001, "Fault - Unable to recover from the error"), ERR_ENTRY("WIDGET_ERROR_ALREADY_EXIST", TIZEN_ERROR_WIDGET | 0x0002, "Already exists"), ERR_ENTRY("WIDGET_ERROR_ALREADY_STARTED", TIZEN_ERROR_WIDGET | 0x0004, "Operation is already started"), diff --git a/packaging/capi-base-common.spec b/packaging/capi-base-common.spec index c9b0dd1..4f01663 100644 --- a/packaging/capi-base-common.spec +++ b/packaging/capi-base-common.spec @@ -1,6 +1,6 @@ Name: capi-base-common Summary: Common header files of Tizen Native API -Version: 0.4.9 +Version: 0.4.10 Release: 1 Group: Base License: Apache-2.0 @@ -48,9 +48,9 @@ cp LICENSE %{buildroot}/usr/share/license/%{name} %files %manifest %{name}.manifest /usr/share/license/%{name} -%{_libdir}/libcapi-base-common.so* +%{_libdir}/libcapi-base-common.so.* %files devel -%manifest %{name}.manifest %{_includedir}/*.h %{_libdir}/pkgconfig/capi-base-common.pc +%{_libdir}/libcapi-base-common.so diff --git a/tool/CMakeLists.txt_coverage b/tool/CMakeLists.txt_coverage index fac53ae..8ae6e76 100644 --- a/tool/CMakeLists.txt_coverage +++ b/tool/CMakeLists.txt_coverage @@ -6,6 +6,7 @@ SET(CMAKE_INSTALL_PREFIX "/usr") SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(VERSION ${FULLVER}) SET(PC_LDFLAGS -l${fw_name}) +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror -fprofile-arcs -ftest-coverage") SET(INC_DIR "include") @@ -14,8 +15,6 @@ INSTALL(FILES ${INC_DIR}/tizen_type.h DESTINATION ${INCLUDE_INSTALL_DIR}) INSTALL(FILES ${INC_DIR}/tizen_error.h DESTINATION ${INCLUDE_INSTALL_DIR}) INCLUDE_DIRECTORIES(${INC_DIR}) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fprofile-arcs -ftest-coverage") - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/capi-base-common.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) SET(SOURCES -- 2.7.4