From bc8c7abe6e3a85e4876b61d59c6b3ccec328064c Mon Sep 17 00:00:00 2001 From: Tomasz Iwanek Date: Thu, 17 Dec 2015 09:37:47 +0100 Subject: [PATCH] Move StepGenerateXml to wgt/ Following to changes in: https://review.tizen.org/gerrit/#/c/54607/ StepGenerateXml will be used only for wgt. Change-Id: I689b6a1f39fde81fe4214acec4f2bd5f3648d251 --- src/common/CMakeLists.txt | 1 - src/tpk/tpk_installer.cc | 1 - src/wgt/CMakeLists.txt | 1 + src/{common => wgt}/step/step_generate_xml.cc | 6 +++--- src/{common => wgt}/step/step_generate_xml.h | 10 +++++----- src/wgt/wgt_installer.cc | 8 ++++---- 6 files changed, 13 insertions(+), 14 deletions(-) rename src/{common => wgt}/step/step_generate_xml.cc (99%) rename src/{common => wgt}/step/step_generate_xml.h (83%) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 5e15d15..ee47b7f 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -25,7 +25,6 @@ SET(SRCS step/step_delta_patch.cc step/step_fail.cc step/step_kill_apps.cc - step/step_generate_xml.cc step/step_recover_application.cc step/step_recover_files.cc step/step_recover_icons.cc diff --git a/src/tpk/tpk_installer.cc b/src/tpk/tpk_installer.cc index 34779b3..65cb108 100644 --- a/src/tpk/tpk_installer.cc +++ b/src/tpk/tpk_installer.cc @@ -13,7 +13,6 @@ #include "common/step/step_delta_patch.h" #include "common/step/step_fail.h" #include "common/step/step_kill_apps.h" -#include "common/step/step_generate_xml.h" #include "common/step/step_old_manifest.h" #include "common/step/step_open_recovery_file.h" #include "common/step/step_parse.h" diff --git a/src/wgt/CMakeLists.txt b/src/wgt/CMakeLists.txt index feb29c0..2640375 100644 --- a/src/wgt/CMakeLists.txt +++ b/src/wgt/CMakeLists.txt @@ -5,6 +5,7 @@ SET(SRCS step/step_check_wgt_background_category.cc step/step_create_symbolic_link.cc step/step_encrypt_resources.cc + step/step_generate_xml.cc step/step_parse.cc step/step_remove_encryption_data.cc step/step_parse_recovery.cc diff --git a/src/common/step/step_generate_xml.cc b/src/wgt/step/step_generate_xml.cc similarity index 99% rename from src/common/step/step_generate_xml.cc rename to src/wgt/step/step_generate_xml.cc index d8f58d1..fbb5d14 100644 --- a/src/common/step/step_generate_xml.cc +++ b/src/wgt/step/step_generate_xml.cc @@ -3,7 +3,7 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#include "common/step/step_generate_xml.h" +#include "wgt/step/step_generate_xml.h" #include #include @@ -87,7 +87,7 @@ void WriteWidgetApplicationAttributes( } // namespace -namespace common_installer { +namespace wgt { namespace pkgmgr { common_installer::Step::Status StepGenerateXml::GenerateApplicationCommonXml( @@ -489,4 +489,4 @@ common_installer::Step::Status StepGenerateXml::undo() { } } // namespace pkgmgr -} // namespace common_installer +} // namespace wgt diff --git a/src/common/step/step_generate_xml.h b/src/wgt/step/step_generate_xml.h similarity index 83% rename from src/common/step/step_generate_xml.h rename to src/wgt/step/step_generate_xml.h index 2a5d622..e0c369d 100644 --- a/src/common/step/step_generate_xml.h +++ b/src/wgt/step/step_generate_xml.h @@ -3,8 +3,8 @@ // Use of this source code is governed by a apache 2.0 license that can be // found in the LICENSE file. -#ifndef COMMON_STEP_STEP_GENERATE_XML_H_ -#define COMMON_STEP_STEP_GENERATE_XML_H_ +#ifndef WGT_STEP_STEP_GENERATE_XML_H_ +#define WGT_STEP_STEP_GENERATE_XML_H_ #include @@ -13,7 +13,7 @@ #include "common/installer_context.h" #include "common/step/step.h" -namespace common_installer { +namespace wgt { namespace pkgmgr { class StepGenerateXml : public common_installer::Step { @@ -40,6 +40,6 @@ class StepGenerateXml : public common_installer::Step { }; } // namespace pkgmgr -} // namespace common_installer +} // namespace wgt -#endif // COMMON_STEP_STEP_GENERATE_XML_H_ +#endif // WGT_STEP_STEP_GENERATE_XML_H_ diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc index 70253be..00a0c21 100644 --- a/src/wgt/wgt_installer.cc +++ b/src/wgt/wgt_installer.cc @@ -16,7 +16,6 @@ #include "common/step/step_delta_patch.h" #include "common/step/step_fail.h" #include "common/step/step_kill_apps.h" -#include "common/step/step_generate_xml.h" #include "common/step/step_open_recovery_file.h" #include "common/step/step_parse.h" #include "common/step/step_privilege_compatibility.h" @@ -47,6 +46,7 @@ #include "wgt/step/step_check_wgt_background_category.h" #include "wgt/step/step_create_symbolic_link.h" #include "wgt/step/step_encrypt_resources.h" +#include "wgt/step/step_generate_xml.h" #include "wgt/step/step_parse.h" #include "wgt/step/step_parse_recovery.h" #include "wgt/step/step_rds_modify.h" @@ -80,7 +80,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep(); AddStep(); AddStep(); break; @@ -104,7 +104,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep(); AddStep(); break; } @@ -153,7 +153,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr) AddStep(); AddStep(); AddStep(); - AddStep(); + AddStep(); AddStep(); break; } -- 2.7.4