[Release] wrt-installer_0.1.114

[framework/web/wrt-installer.git] / src / jobs / widget_install / task_manifest_file.cpp

diff --git a/src/jobs/widget_install/task_manifest_file.cpp b/src/jobs/widget_install/task_manifest_file.cpp
index 6133536..37d856e 100644 (file)
--- a/src/jobs/widget_install/task_manifest_file.cpp
+++ b/src/jobs/widget_install/task_manifest_file.cpp
@@ -117,7 +117,6 @@ TaskManifestFile::TaskManifestFile(InstallerContext &inCont) :
         AddStep(&TaskManifestFile::stepCopyLiveboxFiles);
         AddStep(&TaskManifestFile::stepCreateExecFile);
         AddStep(&TaskManifestFile::stepGenerateManifest);
-        AddStep(&TaskManifestFile::stepParseManifest);
 
         AddAbortStep(&TaskManifestFile::stepAbortIconFiles);
     } else {
@@ -125,9 +124,6 @@ TaskManifestFile::TaskManifestFile(InstallerContext &inCont) :
         AddStep(&TaskManifestFile::stepCopyLiveboxFiles);
         AddStep(&TaskManifestFile::stepCreateExecFile);
         AddStep(&TaskManifestFile::stepGenerateManifest);
-        AddStep(&TaskManifestFile::stepParseManifest);
-
-        AddAbortStep(&TaskManifestFile::stepAbortParseManifest);
     }
 }
 
@@ -599,53 +595,11 @@ void TaskManifestFile::stepGenerateManifest()
     commit_manifest = destFile.str();
     LogDebug("Commiting manifest file : " << commit_manifest);
 
-    m_context.job->UpdateProgress(
-        InstallerContext::INSTALL_CREATE_MANIFEST,
-        "Widget Manifest Creation Finished");
-}
-
-void TaskManifestFile::stepParseManifest()
-{
-    int code = 0;
-    char* updateTags[3] = {NULL, };
-
-    if (!m_context.mode.removable) {
-        updateTags[0] = "preload=false";
-        updateTags[1] = "removable=false";
-        updateTags[2] = NULL;
-
-    }
-
     commitManifest();
 
-    if (m_context.isUpdateMode || (
-                m_context.mode.rootPath == InstallMode::RootPath::RO
-                && m_context.mode.installTime == InstallMode::InstallTime::PRELOAD
-                && m_context.mode.extension == InstallMode::ExtensionType::DIR)) {
-
-        if (m_context.widgetConfig.packagingType != PKG_TYPE_HYBRID_WEB_APP) {
-            code = pkgmgr_parser_parse_manifest_for_upgrade(
-                    commit_manifest.c_str(), (updateTags[0] == NULL) ? NULL : updateTags);
-
-            if (code != 0) {
-                LogError("Manifest parser error: " << code);
-                ThrowMsg(Exceptions::ManifestInvalid, "Parser returncode: " << code);
-            }
-        }
-    } else {
-        code = pkgmgr_parser_parse_manifest_for_installation(
-                commit_manifest.c_str(), (updateTags[0] == NULL) ? NULL : updateTags);
-
-        if (code != 0) {
-            LogError("Manifest parser error: " << code);
-            ThrowMsg(Exceptions::ManifestInvalid, "Parser returncode: " << code);
-        }
-    }
-
     m_context.job->UpdateProgress(
-            InstallerContext::INSTALL_CREATE_MANIFEST,
-            "Widget Manifest Parsing Finished");
-    LogDebug("Manifest parsed");
+        InstallerContext::INSTALL_CREATE_MANIFEST,
+        "Widget Manifest Creation Finished");
 }
 
 void TaskManifestFile::commitManifest()
@@ -1051,23 +1005,6 @@ void TaskManifestFile::setMetadata(UiApplication &uiApp)
     }
 }
 
-void TaskManifestFile::stepAbortParseManifest()
-{
-    LogError("[Parse Manifest] Abroting....");
-
-    int code = pkgmgr_parser_parse_manifest_for_uninstallation(
-            DPL::ToUTF8String(manifest_file).c_str(), NULL);
-
-    if (0 != code) {
-        LogWarning("Manifest parser error: " << code);
-        ThrowMsg(Exceptions::ManifestInvalid, "Parser returncode: " << code);
-    }
-    int ret = unlink(DPL::ToUTF8String(manifest_file).c_str());
-    if (0 != ret) {
-        LogWarning("No manifest file found: " << manifest_file);
-    }
-}
-
 void TaskManifestFile::setLiveBoxInfo(Manifest& manifest)
 {
     FOREACH(it, m_context.widgetConfig.configInfo.m_livebox) {
@@ -1220,7 +1157,7 @@ void TaskManifestFile::setAccount(Manifest& manifest)
         return;
     }
     if (account.m_multiAccountSupport) {
-        provider.multiAccount = L"ture";
+        provider.multiAccount = L"true";
     } else {
         provider.multiAccount = L"false";
     }
@@ -1267,5 +1204,14 @@ void TaskManifestFile::setPrivilege(Manifest& manifest)
     manifest.addPrivileges(privilege);
 }
 
+void TaskManifestFile::StartStep()
+{
+
+}
+
+void TaskManifestFile::EndStep()
+{
+
+}
 } //namespace WidgetInstall
 } //namespace Jobs