From 532bd9548a70a7222674ae09b002817301ca6cb1 Mon Sep 17 00:00:00 2001 From: "j-h.choi" Date: Fri, 24 Apr 2020 14:12:41 +0900 Subject: [PATCH] Do not need to check if the Tizen.Runtime.dll exists Change-Id: Id645fec023398e52d8caadde300c3f057d2ad66d --- NativeLauncher/CMakeLists.txt | 5 ----- NativeLauncher/launcher/lib/dotnet_launcher.cc | 12 ------------ {NativeLauncher => packaging}/Dotnet.Launcher.preload | 0 packaging/dotnet-launcher.spec | 2 +- 4 files changed, 1 insertion(+), 18 deletions(-) rename {NativeLauncher => packaging}/Dotnet.Launcher.preload (100%) diff --git a/NativeLauncher/CMakeLists.txt b/NativeLauncher/CMakeLists.txt index 73af492..37d1e3f 100644 --- a/NativeLauncher/CMakeLists.txt +++ b/NativeLauncher/CMakeLists.txt @@ -51,10 +51,6 @@ IF(DEFINED DOTNET_DIR) SET(EXTRA_CFLAGS_COMMON "${EXTRA_CFLAGS_COMMON} -DDOTNET_DIR=${DOTNET_DIR}") ENDIF(DEFINED DOTNET_DIR) -IF(DEFINED TIZEN_PRELOAD_DIR) - SET(EXTRA_CFLAGS_COMMON "${EXTRA_CFLAGS_COMMON} -DTIZEN_PRELOAD_DIR=${TIZEN_PRELOAD_DIR}") -ENDIF(DEFINED TIZEN_PRELOAD_DIR) - IF(DEFINED USE_DEFAULT_BASE_ADDR) SET(EXTRA_CFLAGS_COMMON "${EXTRA_CFLAGS_COMMON} -DUSE_DEFAULT_BASE_ADDR") ENDIF(DEFINED USE_DEFAULT_BASE_ADDR) @@ -259,4 +255,3 @@ INSTALL(FILES inc/tac_common.h DESTINATION ${INCLUDEDIR}) INSTALL(FILES ../dotnet-launcher.pc DESTINATION ${LIBDIR}/pkgconfig) INSTALL(FILES dotnet-launcher.info DESTINATION /usr/share/parser-plugins) INSTALL(FILES dotnet.preload.list DESTINATION ${LOADERDIR}) -INSTALL(FILES Dotnet.Launcher.preload DESTINATION ${TIZEN_PRELOAD_DIR}) diff --git a/NativeLauncher/launcher/lib/dotnet_launcher.cc b/NativeLauncher/launcher/lib/dotnet_launcher.cc index 80ce717..02c0779 100644 --- a/NativeLauncher/launcher/lib/dotnet_launcher.cc +++ b/NativeLauncher/launcher/lib/dotnet_launcher.cc @@ -47,12 +47,6 @@ #include "path_manager.h" #include "log_manager.h" -#define __XSTR(x) #x -#define __STR(x) __XSTR(x) -static const char* __FRAMEWORK_DIR = __STR(FRAMEWORK_DIR); -#undef __STR -#undef __XSTR - namespace tizen { namespace runtime { namespace dotnetcore { @@ -274,12 +268,6 @@ static void setLang() void CoreRuntime::preload() { - const static std::string dllPath = concatPath(__FRAMEWORK_DIR, "Tizen.Runtime.dll"); - if (!isFileExist(dllPath)) { - _ERR("Failed to locate Tizen.Runtime.dll"); - return; - } - typedef void (*PreloadDelegate)(); PreloadDelegate preloadDelegate; diff --git a/NativeLauncher/Dotnet.Launcher.preload b/packaging/Dotnet.Launcher.preload similarity index 100% rename from NativeLauncher/Dotnet.Launcher.preload rename to packaging/Dotnet.Launcher.preload diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec index 3e08edb..2d975f3 100644 --- a/packaging/dotnet-launcher.spec +++ b/packaging/dotnet-launcher.spec @@ -110,7 +110,6 @@ cmake \ -DCROSSGEN_PATH=%{_runtime_dir}/crossgen \ -DINSTALL_MDPLUGIN_DIR=%{_install_mdplugin_dir} \ -DDOTNET_DIR=%{_dotnet_dir} \ - -DTIZEN_PRELOAD_DIR=%{_tizen_preload_dir} \ -DVERSION=%{version} \ -DNATIVE_LIB_DIR=%{_native_lib_dir} \ %ifarch %{arm} @@ -140,6 +139,7 @@ mkdir -p %{buildroot}/etc/tmpfiles.d install -m 0644 %{name}.conf %{buildroot}/etc/tmpfiles.d/%{name}.conf mkdir -p %{buildroot}%{_tizen_preload_dir} +mv packaging/Dotnet.Launcher.preload %{buildroot}%{_tizen_preload_dir} %post mkdir -p /opt/etc/skel/.dotnet -- 2.7.4