projects / platform / core / dotnet / launcher.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: f0318b9)
Remove the commented code
authorj-h.choi <j-h.choi@samsung.com>
Thu, 18 Jul 2019 00:23:11 +0000 (09:23 +0900)
committer이형주/Common Platform Lab(SR)/Staff Engineer/삼성전자 <leee.lee@samsung.com>
Thu, 18 Jul 2019 11:32:49 +0000 (20:32 +0900)
NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc patch | blob | history

diff --git a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
index 63de5ed..9879683 100644 (file)
--- a/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
+++ b/NativeLauncher/installer-plugin/prefer_nuget_cache_plugin.cc
@@ -46,7 +46,7 @@ typedef struct Metadata {
        const char *value;
 } Metadata;
 
-std::vector<std::string> nugetPackagesAssembliesShaR2R;
+std::vector<std::string> nugetPackagesAssembliesSha;
 std::vector<std::string> tacDB;
 std::vector<std::string> createDirectories;
 std::vector<std::string> updateTac;
@@ -172,23 +172,23 @@ int depsJsonParser()
                                        const Json::Value assemblies = nugetPackages[nuget.c_str()]["runtime"];
                                        if (assemblies != Json::nullValue) {
                                                const Json::Value dependencies = nugetPackages[nuget.c_str()]["dependencies"];
-                                               std::string r2r = "";
+                                               bool isDependency = false;
                                                for (auto& dependency : dependencies.getMemberNames()) {
                                                        if (strstr(dependency.c_str(), TIZEN_DOTNET_NUGET) != NULL ||
                                                                strstr(dependency.c_str(), NET_STANDARD_LIBRARY_NUGET) != NULL) {
                                                                continue;
                                                        } else {
-                                                               r2r = "--r2r";
+                                                               isDependency = true;
                                                        }
                                                }
-                                               if (strcmp(r2r.c_str(), "--r2r") != 0) {
+                                               if (!isDependency) {
                                                        tacDB.push_back(nuget);
                                                        _INFO("Nuget package : %s", nuget.c_str());
                                                        for (auto& assembly : assemblies.getMemberNames()) {
                                                                std::string assembly_name = assembly.substr(assembly.rfind('/') + 1);
                                                                char buffer[65] = {0};
                                                                SHA256(concatPath(binPath, assembly_name), buffer);
-                                                               nugetPackagesAssembliesShaR2R.push_back(nuget + "/" + assembly_name + "/" + buffer + "/" + r2r);
+                                                               nugetPackagesAssembliesSha.push_back(nuget + "/" + assembly_name + "/" + buffer);
                                                                _INFO("Assembly / SHA256 : %s / %s", assembly_name.c_str(), buffer);
                                                        }
                                                }
@@ -210,12 +210,10 @@ int createSymlink(std::string tac_version_dir, std::string np)
                return -1;
        }
 
-       for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-               std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-               std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+       for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+               std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-               //std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
                if (!strcmp(nuget_package.c_str(), np.c_str())) {
                        if (bf::exists(concatPath(binPath, assembly))) {
                                if (isCreateDirectory) {
@@ -302,13 +300,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                        createDirectories.push_back(tac_version_dir);
                        std::ofstream ofs(sha256_info, std::ios::app);
                        int assembly_count = 0;
-                       for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                               std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                               std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                               std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                       for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                               std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                               //std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                               std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                        ofs << assembly << ";" << sha << std::endl;
                                        assembly_count++;
@@ -329,13 +325,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_INSTALL(const char *pkgId, const char *app
                        int compare_count = 0;
                        int assembly_count = 0;
                        std::string sha256_count = "0";
-                       for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                               std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                               std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                               std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                       for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                               std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                               //std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                               std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                        assembly_count++;
                                        std::ifstream ifs(sha256_info);
@@ -483,13 +477,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                createDirectories.push_back(tac_version_dir);
                                std::ofstream ofs2(sha256_info, std::ios::app);
                                int assembly_count = 0;
-                               for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                                       std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                                       std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                                       std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                               for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                                       std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                        std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                        std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                                       //std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                                       std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                        if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                                ofs2 << assembly << ";" << sha << std::endl;
                                                assembly_count++;
@@ -522,13 +514,11 @@ extern "C" int PKGMGR_MDPARSER_PLUGIN_UPGRADE(const char *pkgId, const char *app
                                int compare_count = 0;
                                int assembly_count = 0;
                                std::string sha256_count = "0";
-                               for (auto& npAssemblyShaR2R : nugetPackagesAssembliesShaR2R) {
-                                       std::string nuget_package_assembly_sha = npAssemblyShaR2R.substr(0, npAssemblyShaR2R.rfind('/'));
-                                       std::string sha = nuget_package_assembly_sha.substr(nuget_package_assembly_sha.rfind('/') + 1);
-                                       std::string nuget_package_assembly = nuget_package_assembly_sha.substr(0, nuget_package_assembly_sha.rfind('/'));
+                               for (auto& npAssemblySha : nugetPackagesAssembliesSha) {
+                                       std::string nuget_package_assembly = npAssemblySha.substr(0, npAssemblySha.rfind('/'));
                                        std::string nuget_package = nuget_package_assembly.substr(0, nuget_package_assembly.rfind('/'));
                                        std::string assembly = nuget_package_assembly.substr(nuget_package_assembly.rfind('/') + 1);
-                                       //std::string r2r = npAssemblyShaR2R.substr(npAssemblyShaR2R.rfind('/') + 1);
+                                       std::string sha = npAssemblySha.substr(npAssemblySha.rfind('/') + 1);
                                        if (!strcmp(nuget_package.c_str(), np.c_str())) {
                                                assembly_count++;
                                                std::ifstream ifs2(sha256_info);
Domain: Dotnet / ApplicationLauncher; Licenses: Apache-2.0;