Revert Added new CAPI to get Tizen .NET api version

Change-Id: I7ed1d460e2d090ac66186a389432080551914399
(cherry picked from commit 1f12cc6e5e30d3d04d99a89f11d802647444ec07)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b6f8dbc..de67a14 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,28 +9,20 @@ SET(PC_LDFLAGS -l${fw_name})
 
 SET(INC_DIR "include")
 
-INCLUDE(FindPkgConfig)
-PKG_CHECK_MODULES(${fw_name} REQUIRED vconf)
-
 INSTALL(FILES ${INC_DIR}/tizen.h DESTINATION ${INCLUDE_INSTALL_DIR})
 INSTALL(FILES ${INC_DIR}/tizen_type.h DESTINATION ${INCLUDE_INSTALL_DIR})
 INSTALL(FILES ${INC_DIR}/tizen_error.h DESTINATION ${INCLUDE_INSTALL_DIR})
-INSTALL(FILES ${INC_DIR}/tizen_dotnet.h DESTINATION ${INCLUDE_INSTALL_DIR})
-
-INCLUDE_DIRECTORIES(${INC_DIR} ${${fw_name}_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES(${INC_DIR})
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/capi-base-common.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 SET(SOURCES
         src/tizen_error.c
-        src/tizen_dotnet.c
 )
 
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})
 SET_TARGET_PROPERTIES(${fw_name} PROPERTIES VERSION ${FULLVER})
 SET_TARGET_PROPERTIES(${fw_name} PROPERTIES SOVERSION 0)
-TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS})
-
 INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR})
 CONFIGURE_FILE(${fw_name}.pc.in ${fw_name}.pc @ONLY)
 

diff --git a/doc/tizen_doc.h b/doc/tizen_doc.h
old mode 100755 (executable)
new mode 100644 (file)
index 236eae6..eb25593
--- a/doc/tizen_doc.h
+++ b/doc/tizen_doc.h
@@ -26,13 +26,5 @@
  * This file declares common errors and provides following features for handling the error.
  * - Getting/Setting the error value.
  * - Retrieving the error messages with error value.
- *
- * @defgroup CAPI_COMMON_DOTNET_UTIL .NET util
- * @brief The .NET util API provides functions to get proper information of Tizen .NET.
- * @section CAPI_COMMON_DOTNET_UTIL_HEADER Required Header
- *  \#include <tizen_dotnet.h>
- * @ingroup CAPI_BASE_FRAMEWORK
- * @section CAPI_COMMON_DOTNET_OVERVIEW Overview
- * You can get information regarding Tizen .NET via .Net util API.
  */
 

diff --git a/include/tizen_dotnet.h b/include/tizen_dotnet.h
deleted file mode 100644 (file)
index 334999e..0000000
--- a/include/tizen_dotnet.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2011 - 2016 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef __TIZEN_DOTNET_UTIL_H__
-#define __TIZEN_DOTNET_UTIL_H__
-
-
-#include <tizen.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * @addtogroup CAPI_COMMON_DOTNET_UTIL
- * @{
- */
-
-
-/**
- * @brief Enumeration for dotnet util error code.
- * @since_tizen 4.0
- */
-typedef enum {
-       DOTNET_UTIL_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */
-       DOTNET_UTIL_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
-       DOTNET_UTIL_ERROR_OPERATION_FAILED = TIZEN_ERROR_NOT_PERMITTED /**< Operation not permitted */
-} dotnet_util_error_e;
-
-
-/**
- * @brief Gets the version of Tizen .NET API.
- * @details The returned value means available version in the device.
- * @since_tizen 4.0
- * @param[out] version The Tizen .NET API version
- * @return @c 0 on success,
- *         otherwise a negative error value
- * @retval #DOTNET_UTIL_ERROR_NONE                 Successful
- * @retval #DOTNET_UTIL_ERROR_INVALID_PARAMETER    Invalid parameter
- * @retval #DOTNET_UTIL_ERROR_OPERATION_FAILED     Operation failed
-*/
-int dotnet_util_get_tizen_api_version(int *version);
-
-
-/**
- * @}
- */
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /**<__TIZEN_DOTNET_UTIL_H__ */

diff --git a/packaging/capi-base-common.spec b/packaging/capi-base-common.spec
index 54bffc5..f7ebe90 100644 (file)
--- a/packaging/capi-base-common.spec
+++ b/packaging/capi-base-common.spec
@@ -1,14 +1,12 @@
 Name:       capi-base-common
 Summary:    Common header files of Tizen Native API
-Version:    0.4.18
+Version:    0.4.19
 Release:    1
 Group:      Base
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 
 BuildRequires: cmake
-BuildRequires: pkgconfig(vconf)
-
 Requires(post):   /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 

diff --git a/src/tizen_dotnet.c b/src/tizen_dotnet.c
deleted file mode 100644 (file)
index f5a3602..0000000
--- a/src/tizen_dotnet.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
- *
- * Licensed under the Apache License, Version 2.0 (the License);
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#include <tizen_dotnet.h>
-#include <vconf.h>
-
-int dotnet_util_get_tizen_api_version(int *version)
-{
-       int ret, val = 0;
-
-       if (!version)
-               return DOTNET_UTIL_ERROR_INVALID_PARAMETER;
-
-       ret = vconf_get_int("db/dotnet/tizen_api_version", &val);
-       if (ret < 0)
-               return DOTNET_UTIL_ERROR_OPERATION_FAILED;
-
-       *version = val;
-       return DOTNET_UTIL_ERROR_NONE;
-}
-

diff --git a/tool/CMakeLists.txt_coverage b/tool/CMakeLists.txt_coverage
index f36cb74..8ae6e76 100644 (file)
--- a/tool/CMakeLists.txt_coverage
+++ b/tool/CMakeLists.txt_coverage
@@ -13,14 +13,12 @@ SET(INC_DIR "include")
 INSTALL(FILES ${INC_DIR}/tizen.h DESTINATION ${INCLUDE_INSTALL_DIR})
 INSTALL(FILES ${INC_DIR}/tizen_type.h DESTINATION ${INCLUDE_INSTALL_DIR})
 INSTALL(FILES ${INC_DIR}/tizen_error.h DESTINATION ${INCLUDE_INSTALL_DIR})
-INSTALL(FILES ${INC_DIR}/tizen_dotnet.h DESTINATION ${INCLUDE_INSTALL_DIR})
 INCLUDE_DIRECTORIES(${INC_DIR})
 
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/capi-base-common.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 SET(SOURCES
         src/tizen_error.c
-        src/tizen_dotnet.c
 )
 
 ADD_LIBRARY(${fw_name} SHARED ${SOURCES})