Combine Plugin Steps

StepRunParserPlugin combines below steps
 - StepRegisterPluginInfo
 - StepUpdatePluginInfo
 - StepUnregisterPluginInfo

Related changes
    [app-installers] https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/204652/
    [tpk-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/tpk-backend/+/204757/
    [wgt-backend] https://review.tizen.org/gerrit/#/c/platform/core/appfw/wgt-backend/+/205385/

Change-Id: I4a4730f20ab09c98e6040eda901258f94e050e21
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc
index fa5991509a0503e4a1f7298d9815551f503671fe..8ebef6e1e97006af9cc9d0e3531dc23de64f63ff 100644 (file)
--- a/src/tpk/tpk_installer.cc
+++ b/src/tpk/tpk_installer.cc
@@ -63,14 +63,11 @@
 #include <common/step/pkgmgr/step_recover_application.h>
 #include <common/step/pkgmgr/step_recover_parser_plugins.h>
 #include <common/step/pkgmgr/step_register_app.h>
-#include <common/step/pkgmgr/step_register_plugin_info.h>
 #include <common/step/pkgmgr/step_remove_manifest.h>
 #include <common/step/pkgmgr/step_run_parser_plugins.h>
 #include <common/step/pkgmgr/step_unregister_app.h>
-#include <common/step/pkgmgr/step_unregister_plugin_info.h>
 #include <common/step/pkgmgr/step_update_app.h>
 #include <common/step/pkgmgr/step_update_pkg_disable_info.h>
-#include <common/step/pkgmgr/step_update_plugin_info.h>
 #include <common/step/rds/step_rds_modify.h>
 #include <common/step/rds/step_rds_parse.h>
 #include <common/step/recovery/step_open_recovery_file.h>
@@ -162,7 +159,6 @@ void TpkInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -212,7 +208,6 @@ void TpkInstaller::UpdateSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -244,7 +239,6 @@ void TpkInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -289,7 +283,6 @@ void TpkInstaller::ReinstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -341,7 +334,6 @@ void TpkInstaller::DeltaSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -421,7 +413,6 @@ void TpkInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -470,7 +461,6 @@ void TpkInstaller::MountUpdateSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -504,7 +494,6 @@ void TpkInstaller::ManifestDirectInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -538,7 +527,6 @@ void TpkInstaller::ManifestDirectUpdateSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -562,7 +550,6 @@ void TpkInstaller::ManifestPartialInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Install);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -586,7 +573,6 @@ void TpkInstaller::ManifestPartialUpdateSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -598,8 +584,6 @@ void TpkInstaller::PartialUninstallSteps() {
   AddStep<ci::configuration::StepParseManifest>(
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
-  AddStep<ci::pkgmgr::StepRunParserPlugin>(
-      ci::Plugin::ActionType::Uninstall);
   AddStep<ci::filesystem::StepRemoveGlobalAppSymlinks>();
   AddStep<ci::filesystem::StepOptionalAcquireExternalStorage>();
   AddStep<ci::filesystem::StepRemovePerUserStorageDirectories>();
@@ -608,8 +592,9 @@ void TpkInstaller::PartialUninstallSteps() {
   AddStep<ci::security::StepUnregisterTrustAnchor>();
   AddStep<ci::security::StepPrivacyPrivilege>(
       ci::security::StepPrivacyPrivilege::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::security::StepRevokeSecurity>();
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Uninstall);
 }
 
 void TpkInstaller::ReadonlyUpdateInstallSteps() {
@@ -651,7 +636,6 @@ void TpkInstaller::ReadonlyUpdateInstallSteps() {
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -690,7 +674,6 @@ void TpkInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
 }
 
 void TpkInstaller::DisablePkgSteps() {
@@ -700,10 +683,9 @@ void TpkInstaller::DisablePkgSteps() {
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepKillApps>();
   AddStep<ci::pkgmgr::StepUpdatePkgDisableInfo>(
-    ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
+      ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
-    ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
+      ci::Plugin::ActionType::Uninstall);
 }
 
 void TpkInstaller::EnablePkgSteps() {
@@ -712,9 +694,9 @@ void TpkInstaller::EnablePkgSteps() {
       ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
       ci::configuration::StepParseManifest::StoreLocation::NORMAL);
   AddStep<ci::pkgmgr::StepUpdatePkgDisableInfo>(
-    ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
+      ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
-    ci::Plugin::ActionType::Install);
+      ci::Plugin::ActionType::Install);
 }
 
 void TpkInstaller::MigrateExtImgSteps() {