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: Ib430c9b0c71c82fc2ccf73e4af8bd1f3db66a470
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 520fada..0e6841c 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -60,14 +60,11 @@
 #include <common/step/pkgmgr/step_kill_apps.h>
 #include <common/step/pkgmgr/step_recover_application.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/recovery/step_open_recovery_file.h>
 #include <common/step/recovery/step_create_recovery_file.h>
 #include <common/step/security/step_get_privilege_level.h>
@@ -171,7 +168,6 @@ void HybridInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -233,7 +229,6 @@ void HybridInstaller::UpdateSteps() {
   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>();
@@ -264,7 +259,6 @@ void HybridInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -332,7 +326,6 @@ void HybridInstaller::DeltaSteps() {
   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>();
@@ -409,7 +402,6 @@ void HybridInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
@@ -470,7 +462,6 @@ void HybridInstaller::MountUpdateSteps() {
   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>();
@@ -510,7 +501,6 @@ void HybridInstaller::ManifestDirectInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -554,7 +544,6 @@ void HybridInstaller::ManifestDirectUpdateSteps() {
   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>();
@@ -581,7 +570,6 @@ void HybridInstaller::ManifestPartialInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::HybridAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -612,7 +600,6 @@ void HybridInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -690,7 +677,6 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   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>();
@@ -730,7 +716,6 @@ void HybridInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
 }
 
 void HybridInstaller::EnablePkgSteps() {
@@ -743,7 +728,6 @@ void HybridInstaller::EnablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Enable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
 }
 
 void HybridInstaller::DisablePkgSteps() {
@@ -756,7 +740,6 @@ void HybridInstaller::DisablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
 }
 
 void HybridInstaller::MigrateExtImgSteps() {

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 885353a..2ea02b0 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -67,14 +67,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>
@@ -172,7 +169,6 @@ void WgtInstaller::InstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -228,7 +224,6 @@ void WgtInstaller::UpdateSteps() {
   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>();
@@ -260,7 +255,6 @@ void WgtInstaller::UninstallSteps() {
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
 
@@ -286,7 +280,8 @@ void WgtInstaller::ReinstallSteps() {
   AddStep<wgt::security::StepCheckExtensionPrivileges>();
   AddStep<ci::security::StepRegisterTrustAnchor>(
       ci::security::StepRegisterTrustAnchor::RegisterType::UPDATE);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
+  AddStep<ci::pkgmgr::StepRunParserPlugin>(
+      ci::Plugin::ActionType::Upgrade);
   AddStep<ci::security::StepPrivacyPrivilege>(
       ci::security::StepPrivacyPrivilege::ActionType::Update);
   AddStep<ci::security::StepUpdateSecurity>();
@@ -348,7 +343,6 @@ void WgtInstaller::DeltaSteps() {
   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>();
@@ -419,7 +413,6 @@ void WgtInstaller::MountInstallSteps() {
   AddStep<ci::security::StepRegisterSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Install);
-  AddStep<ci::pkgmgr::StepRegisterPluginInfo>();
   AddStep<ci::filesystem::StepCreatePerUserStorageDirectories>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>(true);
@@ -472,7 +465,6 @@ void WgtInstaller::MountUpdateSteps() {
   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 +496,6 @@ void WgtInstaller::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>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepChangeOwnershipAndPermission>();
@@ -542,7 +533,6 @@ void WgtInstaller::ManifestDirectUpdateSteps() {
   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>();
@@ -591,7 +581,6 @@ void WgtInstaller::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>();
 }
@@ -630,7 +619,6 @@ void WgtInstaller::ReadonlyUpdateUninstallSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRemoveManifest>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
 }
 
 void WgtInstaller::ManifestPartialInstallSteps() {
@@ -650,7 +638,6 @@ void WgtInstaller::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>(
       wgt::filesystem::WgtAdditionalSharedDirs);
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
@@ -678,7 +665,6 @@ void WgtInstaller::ManifestPartialUpdateSteps() {
   AddStep<ci::security::StepUpdateSecurity>();
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Upgrade);
-  AddStep<ci::pkgmgr::StepUpdatePluginInfo>();
   AddStep<ci::filesystem::StepUpdatePerUserStorageDirectories>();
   AddStep<ci::filesystem::StepCreateGlobalAppSymlinks>();
 }
@@ -737,7 +723,6 @@ void WgtInstaller::DisablePkgSteps() {
       ci::pkgmgr::StepUpdatePkgDisableInfo::ActionType::Disable);
   AddStep<ci::pkgmgr::StepRunParserPlugin>(
       ci::Plugin::ActionType::Uninstall);
-  AddStep<ci::pkgmgr::StepUnregisterPluginInfo>();
 }
 
 void WgtInstaller::MigrateExtImgSteps() {