Do not need to check if the Tizen.Runtime.dll exists

Change-Id: Id645fec023398e52d8caadde300c3f057d2ad66d

diff --git a/NativeLauncher/CMakeLists.txt b/NativeLauncher/CMakeLists.txt
index 73af4929c077cca1fd7abcfcef392629360ffe4a..37d1e3f145dcd6240d8ad3a4d72153491dae35cb 100644 (file)
--- 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/Dotnet.Launcher.preload b/NativeLauncher/Dotnet.Launcher.preload
deleted file mode 100644 (file)
index a7fe2d2..0000000
--- a/NativeLauncher/Dotnet.Launcher.preload
+++ /dev/null
@@ -1,38 +0,0 @@
-###########################################
-## AssemblyName.dll TypeName             ##
-## AssemblyName.dll TypeName.Preload()   ##
-## The methods must not have parameters. ##
-###########################################
-System.IO.FileSystem.dll Interop
-System.IO.FileSystem.dll <PrivateImplementationDetails>
-System.IO.FileSystem.dll System.IO.File
-System.Security.Cryptography.Algorithms.dll Interop
-System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.MD5
-System.Collections.dll <PrivateImplementationDetails>
-System.Collections.dll System.Collections.Generic.HashSet`1
-System.Collections.dll System.Collections.Generic.Queue`1
-System.Private.Uri.dll <PrivateImplementationDetails>
-System.Private.Uri.dll System.Uri
-System.Private.Xml.dll <PrivateImplementationDetails>
-System.Private.Xml.dll System.Xml.IXmlLineInfo
-System.Private.Xml.dll System.Xml.IXmlNamespaceResolver
-System.Runtime.dll System.Collections.Generic.ISet`1
-System.Runtime.dll System.Reflection.RuntimeReflectionExtensions
-System.ObjectModel.dll System.Collections.ObjectModel.ObservableCollection`1
-System.ObjectModel.dll System.Collections.Specialized.INotifyCollectionChanged
-System.ObjectModel.dll System.Collections.Specialized.NotifyCollectionChangedAction
-System.ObjectModel.dll System.Collections.Specialized.NotifyCollectionChangedEventArgs
-System.ObjectModel.dll System.Collections.Specialized.NotifyCollectionChangedEventHandler
-System.ObjectModel.dll System.ComponentModel.INotifyPropertyChanged
-System.ObjectModel.dll System.ComponentModel.PropertyChangedEventArgs
-System.ObjectModel.dll System.ComponentModel.PropertyChangedEventHandler
-System.ObjectModel.dll System.Windows.Input.ICommand
-System.ComponentModel.dll System.IServiceProvider
-System.Linq.dll System.Linq.Enumerable
-System.Linq.dll System.Linq.EnumerableSorter`1
-System.Linq.dll System.Linq.IIListProvider`1
-System.Linq.dll System.Linq.IOrderedEnumerable`1
-System.Linq.dll System.Linq.IPartition`1
-System.Linq.dll System.Linq.OrderedEnumerable`1
-System.Linq.Expressions.dll System.Linq.Expressions.ExpressionVisitor
-System.Security.Cryptography.Primitives.dll System.Security.Cryptography.HashAlgorithm

diff --git a/NativeLauncher/launcher/lib/dotnet_launcher.cc b/NativeLauncher/launcher/lib/dotnet_launcher.cc
index 80ce717578f012834d99ad626c82791cc4af5103..02c077905fc5e5100940f86f462574a27711dcc0 100644 (file)
--- 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/packaging/Dotnet.Launcher.preload b/packaging/Dotnet.Launcher.preload
new file mode 100644 (file)
index 0000000..a7fe2d2
--- /dev/null
+++ b/packaging/Dotnet.Launcher.preload
@@ -0,0 +1,38 @@
+###########################################
+## AssemblyName.dll TypeName             ##
+## AssemblyName.dll TypeName.Preload()   ##
+## The methods must not have parameters. ##
+###########################################
+System.IO.FileSystem.dll Interop
+System.IO.FileSystem.dll <PrivateImplementationDetails>
+System.IO.FileSystem.dll System.IO.File
+System.Security.Cryptography.Algorithms.dll Interop
+System.Security.Cryptography.Algorithms.dll System.Security.Cryptography.MD5
+System.Collections.dll <PrivateImplementationDetails>
+System.Collections.dll System.Collections.Generic.HashSet`1
+System.Collections.dll System.Collections.Generic.Queue`1
+System.Private.Uri.dll <PrivateImplementationDetails>
+System.Private.Uri.dll System.Uri
+System.Private.Xml.dll <PrivateImplementationDetails>
+System.Private.Xml.dll System.Xml.IXmlLineInfo
+System.Private.Xml.dll System.Xml.IXmlNamespaceResolver
+System.Runtime.dll System.Collections.Generic.ISet`1
+System.Runtime.dll System.Reflection.RuntimeReflectionExtensions
+System.ObjectModel.dll System.Collections.ObjectModel.ObservableCollection`1
+System.ObjectModel.dll System.Collections.Specialized.INotifyCollectionChanged
+System.ObjectModel.dll System.Collections.Specialized.NotifyCollectionChangedAction
+System.ObjectModel.dll System.Collections.Specialized.NotifyCollectionChangedEventArgs
+System.ObjectModel.dll System.Collections.Specialized.NotifyCollectionChangedEventHandler
+System.ObjectModel.dll System.ComponentModel.INotifyPropertyChanged
+System.ObjectModel.dll System.ComponentModel.PropertyChangedEventArgs
+System.ObjectModel.dll System.ComponentModel.PropertyChangedEventHandler
+System.ObjectModel.dll System.Windows.Input.ICommand
+System.ComponentModel.dll System.IServiceProvider
+System.Linq.dll System.Linq.Enumerable
+System.Linq.dll System.Linq.EnumerableSorter`1
+System.Linq.dll System.Linq.IIListProvider`1
+System.Linq.dll System.Linq.IOrderedEnumerable`1
+System.Linq.dll System.Linq.IPartition`1
+System.Linq.dll System.Linq.OrderedEnumerable`1
+System.Linq.Expressions.dll System.Linq.Expressions.ExpressionVisitor
+System.Security.Cryptography.Primitives.dll System.Security.Cryptography.HashAlgorithm

diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec
index 3e08edb99086b91b147f89729023237d74d6432a..2d975f3aa38feef1f884bdecaf7163f48a3a27ee 100644 (file)
--- 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