Merge pull request #72 from j-h-choi/tac_env accepted/tizen/unified/20190709.113105 submit/tizen/20190709.054508
author조웅석/Common Platform Lab(SR)/Principal Engineer/삼성전자 <ws77.cho@samsung.com>
Fri, 5 Jul 2019 06:13:36 +0000 (15:13 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Fri, 5 Jul 2019 06:13:36 +0000 (15:13 +0900)
Add define for TAC in launcher_env.h

1  2 
NativeLauncher/launcher/dotnet/dotnet_launcher.cc
packaging/dotnet-launcher.spec

@@@ -382,12 -389,11 +382,12 @@@ int CoreRuntime::initialize(bool standa
        std::string appRoot = std::string("/proc/self/fd/") + std::to_string(fd);
        std::string appBin = concatPath(appRoot, "bin");
        std::string appLib = concatPath(appRoot, "lib");
-       std::string appTAC = concatPath(appBin, ".TAC.Release");
-       std::string probePath = appBin + ":" + appLib + ":" + appTAC;
-       std::string NIprobePath = concatPath(appBin, APP_NI_SUB_DIR) + ":" + concatPath(appLib, APP_NI_SUB_DIR) + ":" + appTAC;
+       std::string appTac = concatPath(appBin, TAC_SYMLINK_SUB_DIR);
+       std::string probePath = appBin + ":" + appLib + ":" + appTac;
+       std::string NIprobePath = concatPath(appBin, APP_NI_SUB_DIR) + ":" + concatPath(appLib, APP_NI_SUB_DIR) + ":" + appTac;
        std::string tpa = getTPA();
 -      std::string nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appBin + ":" + appLib + ":" + __nativeLibDirectory;
 +      std::string runtimeDir = getRuntimeDir();
 +      std::string nativeLibPath = getExtraNativeLibDirs(appRoot) + ":" + appBin + ":" + appLib + ":" + __nativeLibDirectory + ":" + runtimeDir;
        std::string appName = std::string("dotnet-launcher-") + std::to_string(getpid());
  
        if (!initializeCoreClr(appName.c_str(), probePath.c_str(), NIprobePath.c_str(), nativeLibPath.c_str(), tpa.c_str())) {
@@@ -119,9 -115,7 +119,8 @@@ rm -rf %{buildroot
  %make_install
  mkdir -p %{buildroot}%{_framework_dir}
  mv Init/bin/Release/Tizen.Init.dll %{buildroot}%{_framework_dir}
 +mv Managed/bin/Release/Dotnet.Launcher.dll %{buildroot}%{_framework_dir}
  
  mkdir -p %{buildroot}%{_tac_dir}
  mkdir -p %{buildroot}%{_native_lib_dir}
  ln -sf %{_libdir}/libsqlite3.so.0 %{buildroot}%{_native_lib_dir}/libsqlite3.so