X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=NativeLauncher%2Ftool%2Ftac_installer.cc;h=6bf9b571ca46a0424d4d0d9cd9375c2d4a23ff38;hb=33b4aa2fcbb716d081fc13ac6855fc53bd343532;hp=b425bbb251f21cdf31d77ef250b3782611e718c6;hpb=8686d422de085db55e4336377940386902c1fa65;p=platform%2Fcore%2Fdotnet%2Flauncher.git diff --git a/NativeLauncher/tool/tac_installer.cc b/NativeLauncher/tool/tac_installer.cc index b425bbb..6bf9b57 100644 --- a/NativeLauncher/tool/tac_installer.cc +++ b/NativeLauncher/tool/tac_installer.cc @@ -40,16 +40,16 @@ static const char* __DOTNET_DIR = __STR(DOTNET_DIR); #undef __STR #undef __XSTR -std::vector nugetPackagesAssembliesSha; -std::vector tacDB; -std::vector createDirectories; -std::vector createLibraries; -std::vector updateTac; -tac_state tacState = TAC_STATE_NONE; +static std::vector nugetPackagesAssembliesSha; +static std::vector tacDB; +static std::vector createDirectories; +static std::vector createLibraries; +static std::vector updateTac; +static tac_state tacState = TAC_STATE_NONE; static sqlite3 *tac_db = NULL; static sqlite3 *tlc_db = NULL; -bool tacPluginInstalled = false; -bool tacPluginFinished = false; +static bool tacPluginInstalled = false; +static bool tacPluginFinished = false; static void createSHA256Info(std::string sha256Info, std::string nugetPackage) { @@ -121,7 +121,7 @@ static bool copyAssemblyCreateSymlink(std::string binPath, std::string tacDir, s nuget_restoration = true; break; } - if (!copyFile(concatPath(binNiPath, niFile), concatPath(tac_version_dir, niFile)) && exist(binNiPath)) { + if (exist(binNiPath) && !copyFile(concatPath(binNiPath, niFile), concatPath(tac_version_dir, niFile))) { _ERR("Failed to copy of %s", niFile.c_str()); } } @@ -997,7 +997,7 @@ void install_Clean() } for (auto& cl : createLibraries) { - changeOwnershipTAC(cl); + copySmackAndOwnership(__DOTNET_DIR, cl); } }