[Build] remove unnecessary script

Code clean, remove unnecessary code and update script related with ml-agent.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/meson.build b/meson.build
index 902a1da..d5d2948 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -166,9 +166,6 @@ api_install_libdir = join_paths(api_install_prefix, get_option('libdir'))
 api_install_bindir = join_paths(api_install_prefix, get_option('bindir'))
 api_install_includedir = join_paths(api_install_prefix, get_option('includedir'))
 api_install_inidir = get_option('sysconfdir')
-dbus_policy_dir = join_paths(get_option('sysconfdir'), 'dbus-1', 'system.d')
-dbus_system_service_dir = join_paths(api_install_prefix, 'share', 'dbus-1', 'system-services')
-systemd_service_dir = join_paths(api_install_prefix, 'lib', 'systemd', 'system')
 
 # Set default configuration
 api_conf = configuration_data()

diff --git a/packaging/machine-learning-api.spec b/packaging/machine-learning-api.spec
index adf8bf6..b324071 100644 (file)
--- a/packaging/machine-learning-api.spec
+++ b/packaging/machine-learning-api.spec
@@ -163,13 +163,16 @@ BuildRequires:    nnstreamer-onnxruntime
 BuildRequires: ncnn-devel
 BuildRequires: nnstreamer-ncnn
 %endif
+
 %if 0%{?enable_ml_service}
 BuildRequires: mlops-agent-test
 %endif
 %endif # unit_test
 
 %if 0%{?enable_ml_service}
+%if %{with tizen}
 BuildRequires: pkgconfig(capi-appfw-app-common)
+%endif
 BuildRequires: pkgconfig(json-glib-1.0)
 BuildRequires: pkgconfig(mlops-agent)
 
@@ -368,7 +371,7 @@ meson --buildtype=plain --prefix=%{_prefix} --sysconfdir=%{_sysconfdir} --libdir
        --bindir=%{_bindir} --includedir=%{_includedir} \
        %{enable_test} %{install_test} %{enable_test_coverage} \
        %{enable_tizen} %{enable_tizen_privilege_check} %{enable_tizen_feature_check} \
-       %{enable_ml_service_check}  %{enable_gcov} \
+       %{enable_ml_service_check} %{enable_gcov} \
        build
 
 ninja -C build %{?_smp_mflags}
@@ -509,7 +512,6 @@ install -m 0755 packaging/run-unittest.sh %{buildroot}%{_bindir}/tizen-unittests
 %files -n capi-machine-learning-unittests
 %manifest capi-machine-learning.manifest
 %{_bindir}/unittest-ml
-%{_libdir}/libunittest_mock.so*
 %if 0%{?gcov:1}
 %{_bindir}/tizen-unittests/%{name}/run-unittest.sh
 %endif

diff --git a/tests/meson.build b/tests/meson.build
index 8aeaabc..c7e9f49 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -10,14 +10,14 @@ testenv.set('MLAPI_BUILD_ROOT_PATH', meson.build_root())
 unittest_util_static = static_library('unittest_util',
   files('capi/unittest_util.c'),
   dependencies: [glib_dep],
-  install: false,
+  install: false
 )
 
 unittest_common_dep = declare_dependency(
   link_with: [unittest_util_static],
   dependencies: [nns_capi_dep, gtest_dep],
   compile_args: ['-DFAKEDLOG=1'],
-  include_directories: nns_capi_include,
+  include_directories: nns_capi_include
 )
 
 subdir('capi')

diff --git a/tests/mock/meson.build b/tests/mock/meson.build
deleted file mode 100644 (file)
index 05e992c..0000000
--- a/tests/mock/meson.build
+++ /dev/null
@@ -1,7 +0,0 @@
-lib_unittest_mock = shared_library('unittest_mock',
-    files('mock_package_manager.c'),
-    dependencies: glib_dep,
-    install: get_option('install-test'),
-    install_dir: api_install_libdir,
-    include_directories: nns_capi_include
-)

diff --git a/tests/mock/mock_package_manager.c b/tests/mock/mock_package_manager.c
deleted file mode 100644 (file)
index 12bf7e1..0000000
--- a/tests/mock/mock_package_manager.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-/**
- * Copyright (C) 2023 Samsung Electronics Co., Ltd. All Rights Reserved.
- *
- * @file    mock_package_manager.c
- * @date    18 Apr 2023
- * @brief   A set of helper functions for emulation of Tizen's Package Manager APIs
- * @see     https://github.com/nnstreamer/api
- * @author  Wook Song <wook16.song@samsung.com>
- * @bug     No known bugs except for NYI items
- *
- * @details
- *  This provides helper functions for the emulation of Tizen's Package Manager APIs
- *  and utilities for unit test cases of ML Agent Service APIs.
- */
-
-#include <glib-2.0/glib.h>
-
-#include "mock_package_manager.h"
-
-/**
- * @brief A mock implementation of the package_manager_create function
- * @see https://docs.tizen.org/application/native/guides/app-management/package-manager/
- */
-int
-package_manager_create (package_manager_h * manager)
-{
-  struct mock_package_manager *_manager;
-
-  if (manager == NULL) {
-    return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER;
-  }
-
-  _manager = g_try_new0 (struct mock_package_manager, 1);
-  if (_manager == NULL) {
-    return PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY;
-  }
-
-  _manager->events = -1;
-  _manager->event_cb = NULL;
-  *manager = _manager;
-
-  return PACKAGE_MANAGER_ERROR_NONE;
-}
-
-/**
- * @brief A mock implementation of the package_manager_destroy function
- * @see https://docs.tizen.org/application/native/guides/app-management/package-manager/
- */
-int
-package_manager_destroy (package_manager_h manager)
-{
-  if (manager == NULL)
-    return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER;
-
-  g_free(manager);
-  return PACKAGE_MANAGER_ERROR_NONE;
-}
-
-/**
- * @brief A mock implementation of the package_manager_set_event_status function
- * @see https://docs.tizen.org/application/native/guides/app-management/package-manager/
- */
-int
-package_manager_set_event_status (package_manager_h manager, int status_type)
-{
-  if (!manager || status_type > 0x7FF || status_type < 0) {
-    return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER;
-  }
-
-  manager->events = status_type;
-  return PACKAGE_MANAGER_ERROR_NONE;
-}
-
-/**
- * @brief A mock implementation of the package_manager_set_event_cb function
- * @see https://docs.tizen.org/application/native/guides/app-management/package-manager/
- */
-int
-package_manager_set_event_cb (package_manager_h manager,
-    package_manager_event_cb callback, void *user_data)
-{
-  if (!callback)
-    return PACKAGE_MANAGER_ERROR_INVALID_PARAMETER;
-
-  manager->event_cb = callback;
-
-  return PACKAGE_MANAGER_ERROR_NONE;
-}

diff --git a/tests/mock/mock_package_manager.h b/tests/mock/mock_package_manager.h
deleted file mode 100644 (file)
index 37e275b..0000000
--- a/tests/mock/mock_package_manager.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-/**
- * Copyright (C) 2023 Samsung Electronics Co., Ltd. All Rights Reserved.
- *
- * @file    mock_package_manager.h
- * @date    18 Apr 2023
- * @brief   A set of helper functions for emulation of Tizen's Package Manager APIs
- * @see     https://github.com/nnstreamer/api
- * @author  Wook Song <wook16.song@samsung.com>
- * @bug     No known bugs except for NYI items
- *
- * @details
- *  This provides helper functions for the emulation of Tizen's Package Manager APIs
- *  and utilities for unit test cases of ML Agent Service APIs.
- */
-#ifndef __MOCK_PACKAGE_MANAGER_H__
-#define __MOCK_PACKAGE_MANAGER_H__
-
-#include <tizen_error.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum mock_package_manager_error_e
-{
-  PACKAGE_MANAGER_ERROR_NONE = TIZEN_ERROR_NONE,
-  PACKAGE_MANAGER_ERROR_INVALID_PARAMETER = TIZEN_ERROR_INVALID_PARAMETER,
-  PACKAGE_MANAGER_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY,
-  PACKAGE_MANAGER_ERROR_IO_ERROR = TIZEN_ERROR_IO_ERROR,
-  PACKAGE_MANAGER_ERROR_NO_SUCH_PACKAGE = TIZEN_ERROR_PACKAGE_MANAGER | 0x71,
-  PACKAGE_MANAGER_ERROR_SYSTEM_ERROR = TIZEN_ERROR_PACKAGE_MANAGER | 0x72,
-  PACKAGE_MANAGER_ERROR_PERMISSION_DENIED = TIZEN_ERROR_PERMISSION_DENIED,
-} package_manager_error_e;
-
-typedef enum mock_package_manager_event_type_e
-{
-  PACKAGE_MANAGER_EVENT_TYPE_INSTALL = 0,
-  PACKAGE_MANAGER_EVENT_TYPE_UNINSTALL,
-  PACKAGE_MANAGER_EVENT_TYPE_UPDATE,
-  PACKAGE_MANAGER_EVENT_TYPE_MOVE,
-  PACKAGE_MANAGER_EVENT_TYPE_CLEAR,
-  PACKAGE_MANAGER_EVENT_TYPE_RES_COPY,
-  PACKAGE_MANAGER_EVENT_TYPE_RES_CREATE_DIR,
-  PACKAGE_MANAGER_EVENT_TYPE_RES_REMOVE,
-  PACKAGE_MANAGER_EVENT_TYPE_RES_UNINSTALL,
-} package_manager_event_type_e;
-
-typedef enum mock_package_manager_event_state_e
-{
-  PACKAGE_MANAGER_EVENT_STATE_STARTED = 0,
-  PACKAGE_MANAGER_EVENT_STATE_PROCESSING,
-  PACKAGE_MANAGER_EVENT_STATE_COMPLETED,
-  PACKAGE_MANAGER_EVENT_STATE_FAILED,
-} package_manager_event_state_e;
-
-typedef enum mock_package_manager_status_type_e
-{
-  PACKAGE_MANAGER_STATUS_TYPE_ALL = 0x00,
-  PACKAGE_MANAGER_STATUS_TYPE_INSTALL = 0x01,
-  PACKAGE_MANAGER_STATUS_TYPE_UNINSTALL = 0x02,
-  PACKAGE_MANAGER_STATUS_TYPE_UPGRADE = 0x04,
-  PACKAGE_MANAGER_STATUS_TYPE_MOVE = 0x08,
-  PACKAGE_MANAGER_STATUS_TYPE_CLEAR_DATA = 0x10,
-  PACKAGE_MANAGER_STATUS_TYPE_INSTALL_PROGRESS = 0x20,
-  PACKAGE_MANAGER_STATUS_TYPE_GET_SIZE = 0x40,
-  PACKAGE_MANAGER_STATUS_TYPE_RES_COPY = 0x80,
-  PACKAGE_MANAGER_STATUS_TYPE_RES_CREATE_DIR = 0x100,
-  PACKAGE_MANAGER_STATUS_TYPE_RES_REMOVE = 0x200,
-  PACKAGE_MANAGER_STATUS_TYPE_RES_UNINSTALL = 0x400,
-} package_manager_status_type_e;
-
-typedef void (*mock_event_cb) (const char *,
-    const char *,
-    package_manager_event_type_e,
-    package_manager_event_state_e, int, package_manager_error_e, void *);
-
-/**
- * @brief A fake package manager handle for the mock Package Manager APIs
- */
-struct mock_package_manager
-{
-  guint events;
-  mock_event_cb event_cb;
-};
-typedef mock_event_cb package_manager_event_cb;
-typedef struct mock_package_manager *package_manager_h;
-
-int package_manager_create (package_manager_h * manager);
-int package_manager_destroy (package_manager_h manager);
-int package_manager_set_event_status (package_manager_h manager,
-    int status_type);
-int package_manager_set_event_cb (package_manager_h manager,
-    package_manager_event_cb callback, void *user_data);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __MOCK_PACKAGE_MANAGER_H__ */