From 7349d64e9bbcac23cc00ea5e1c75ed83a4ef2a32 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Tue, 24 Mar 2020 15:20:40 +0900
Subject: [PATCH 01/16] Make smoke utils as a library

This wgt-smoke-utils library is used at smoke test of unified-installer.

Requires:
 - https://review.tizen.org/gerrit/c/platform/core/appfw/app-installers/+/228720

Change-Id: I7689f92e3699073fbd4c1836e917d06f7470784a
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 CMakeLists.txt                                        |  1 +
 packaging/wgt-backend.spec                            |  2 ++
 src/unit_tests/CMakeLists.txt                         | 16 ++++++++--------
 src/unit_tests/extensive_smoke_test.cc                |  2 +-
 src/unit_tests/smoke_test.cc                          |  2 +-
 src/unit_tests/{smoke_utils.cc => wgt_smoke_utils.cc} |  4 ++--
 src/unit_tests/{smoke_utils.h => wgt_smoke_utils.h}   | 12 +++++++-----
 7 files changed, 22 insertions(+), 17 deletions(-)
 rename src/unit_tests/{smoke_utils.cc => wgt_smoke_utils.cc} (98%)
 rename src/unit_tests/{smoke_utils.h => wgt_smoke_utils.h} (96%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86b3f98..ff9ec02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(TARGET_SMOKE_TEST "smoke-test")
 SET(TARGET_SMOKE_TEST_EXTENSIVE "extensive-smoke-test")
 SET(TARGET_SMOKE_TEST_HELPER "smoke-test-helper")
 SET(TARGET_MANIFEST_TEST "manifest-test")
+SET(TARGET_WGT_SMOKE_UTILS "wgt-smoke-utils")
 
 ADD_DEFINITIONS("-DPROJECT_TAG=\"WGT_BACKEND\"")
 
diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index 18a431e..e83df85 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -95,6 +95,8 @@ ln -s %{_bindir}/wgt-backend %{buildroot}%{_sysconfdir}/package-manager/backend/
 %manifest wgt-installer-tests.manifest
 %{_bindir}/wgt-installer-ut/*
 %{_datadir}/wgt-installer-ut/*
+%{_libdir}/libwgt-smoke-utils.so*
+%{_includedir}/app-installers/unit_tests/wgt_smoke_utils.h
 
 %changelog
 * Thu Dec 18 2015 Pawel Sikorski <p.sikorski@samsung.com> 0.1-1
diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
index 380ad2d..203e3d7 100644
--- a/src/unit_tests/CMakeLists.txt
+++ b/src/unit_tests/CMakeLists.txt
@@ -4,13 +4,9 @@ SET(TARGET_SMOKE_UTILS smoke-utils)
 # Executables
 ADD_EXECUTABLE(${TARGET_SMOKE_TEST}
   smoke_test.cc
-  smoke_utils.h
-  smoke_utils.cc
 )
 ADD_EXECUTABLE(${TARGET_SMOKE_TEST_EXTENSIVE}
   extensive_smoke_test.cc
-  smoke_utils.h
-  smoke_utils.cc
 )
 ADD_EXECUTABLE(${TARGET_SMOKE_TEST_HELPER}
   smoke_test_helper.cc
@@ -18,6 +14,9 @@ ADD_EXECUTABLE(${TARGET_SMOKE_TEST_HELPER}
 ADD_EXECUTABLE(${TARGET_MANIFEST_TEST}
   manifest_test.cc
 )
+ADD_LIBRARY(${TARGET_WGT_SMOKE_UTILS} SHARED
+  wgt_smoke_utils.cc
+)
 
 TARGET_INCLUDE_DIRECTORIES(${TARGET_SMOKE_TEST} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
 TARGET_INCLUDE_DIRECTORIES(${TARGET_SMOKE_TEST_EXTENSIVE} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../)
@@ -30,13 +29,11 @@ APPLY_PKG_CONFIG(${TARGET_SMOKE_TEST} PUBLIC
   Boost
   GTEST
   GUM_DEPS
-  VCONF_DEPS
 )
 APPLY_PKG_CONFIG(${TARGET_SMOKE_TEST_EXTENSIVE} PUBLIC
   Boost
   GTEST
   GUM_DEPS
-  VCONF_DEPS
 )
 APPLY_PKG_CONFIG(${TARGET_MANIFEST_TEST} PUBLIC
   Boost
@@ -46,12 +43,15 @@ APPLY_PKG_CONFIG(${TARGET_MANIFEST_TEST} PUBLIC
 # FindGTest module do not sets all needed libraries in GTEST_LIBRARIES and
 # GTest main libraries is still missing, so additional linking of
 # GTEST_MAIN_LIBRARIES is needed.
-TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS})
-TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_EXTENSIVE} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS})
+TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS} ${TARGET_WGT_SMOKE_UTILS})
+TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_EXTENSIVE} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS} ${TARGET_WGT_SMOKE_UTILS})
 TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_HELPER} PRIVATE ${TARGET_LIBNAME_WGT})
 TARGET_LINK_LIBRARIES(${TARGET_MANIFEST_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${GTEST_MAIN_LIBRARIES})
+TARGET_LINK_LIBRARIES(${TARGET_WGT_SMOKE_UTILS} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${TARGET_SMOKE_UTILS})
 
 INSTALL(TARGETS ${TARGET_SMOKE_TEST} DESTINATION ${BINDIR}/${DESTINATION_DIR})
 INSTALL(TARGETS ${TARGET_SMOKE_TEST_EXTENSIVE} DESTINATION ${BINDIR}/${DESTINATION_DIR})
 INSTALL(TARGETS ${TARGET_SMOKE_TEST_HELPER} DESTINATION ${BINDIR}/${DESTINATION_DIR})
 INSTALL(TARGETS ${TARGET_MANIFEST_TEST} DESTINATION ${BINDIR}/${DESTINATION_DIR})
+INSTALL(TARGETS ${TARGET_WGT_SMOKE_UTILS} DESTINATION ${LIB_INSTALL_DIR})
+INSTALL(FILES wgt_smoke_utils.h DESTINATION ${INCLUDEDIR}/app-installers/unit_tests/)
diff --git a/src/unit_tests/extensive_smoke_test.cc b/src/unit_tests/extensive_smoke_test.cc
index 92abb49..bc4ef46 100644
--- a/src/unit_tests/extensive_smoke_test.cc
+++ b/src/unit_tests/extensive_smoke_test.cc
@@ -10,7 +10,7 @@
 #include <gtest/gtest.h>
 #include <gtest/gtest-death-test.h>
 
-#include "unit_tests/smoke_utils.h"
+#include "unit_tests/wgt_smoke_utils.h"
 
 namespace ci = common_installer;
 
diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 53fc9eb..40a1304 100644
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -11,7 +11,7 @@
 
 #include <memory>
 
-#include "unit_tests/smoke_utils.h"
+#include "unit_tests/wgt_smoke_utils.h"
 
 namespace st = smoke_test;
 namespace bf = boost::filesystem;
diff --git a/src/unit_tests/smoke_utils.cc b/src/unit_tests/wgt_smoke_utils.cc
similarity index 98%
rename from src/unit_tests/smoke_utils.cc
rename to src/unit_tests/wgt_smoke_utils.cc
index 44c8158..d467315 100644
--- a/src/unit_tests/smoke_utils.cc
+++ b/src/unit_tests/wgt_smoke_utils.cc
@@ -2,6 +2,8 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
+#include "unit_tests/wgt_smoke_utils.h"
+
 #include <unit_tests/common/smoke_utils.h>
 
 #include <string>
@@ -11,8 +13,6 @@
 #include "wgt/wgt_installer.h"
 #include "hybrid/hybrid_installer.h"
 
-#include "unit_tests/smoke_utils.h"
-
 namespace ci = common_installer;
 namespace st = smoke_test;
 
diff --git a/src/unit_tests/smoke_utils.h b/src/unit_tests/wgt_smoke_utils.h
similarity index 96%
rename from src/unit_tests/smoke_utils.h
rename to src/unit_tests/wgt_smoke_utils.h
index 14e0994..6de6b32 100644
--- a/src/unit_tests/smoke_utils.h
+++ b/src/unit_tests/wgt_smoke_utils.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by an apache-2.0 license that can be
 // found in the LICENSE file.
 
-#ifndef UNIT_TESTS_SMOKE_UTILS_H_
-#define UNIT_TESTS_SMOKE_UTILS_H_
+#ifndef UNIT_TESTS_WGT_SMOKE_UTILS_H_
+#define UNIT_TESTS_WGT_SMOKE_UTILS_H_
 
 #include <common/app_installer.h>
 #include <common/pkgmgr_interface.h>
@@ -38,7 +38,7 @@ class WgtBackendInterface: public BackendInterface {
  public:
   using BackendInterface::BackendInterface;
 
- private:
+// private:
   AppQueryInterfacePtr CreateQueryInterface() const override;
   AppInstallerPtr CreateInstaller(
       common_installer::PkgMgrPtr pkgmgr) const override;
@@ -50,7 +50,6 @@ class HybridBackendInterface: public BackendInterface {
  public:
   using BackendInterface::BackendInterface;
 
- private:
   AppQueryInterfacePtr CreateQueryInterface() const override;
   AppInstallerPtr CreateInstaller(
       common_installer::PkgMgrPtr pkgmgr) const override;
@@ -58,6 +57,9 @@ class HybridBackendInterface: public BackendInterface {
       common_installer::PkgMgrPtr pkgmgr, int fail_at) const override;
 };
 
+#ifdef OVERRIDE_STEPS_BLOCK
+#undef OVERRIDE_STEPS_BLOCK
+#endif
 #define OVERRIDE_STEPS_BLOCK(TYPE, STEPS)                                      \
   void STEPS() override {                                                      \
     TYPE::STEPS();                                                             \
@@ -132,4 +134,4 @@ class FailExpectedHybridInstaller : public hybrid::HybridInstaller {
 }  // namespace smoke_test
 
 
-#endif  // UNIT_TESTS_SMOKE_UTILS_H_
+#endif  // UNIT_TESTS_WGT_SMOKE_UTILS_H_
-- 
2.7.4


From e19b3a98b0211c9aaba1e7084a306ec5556647e8 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Tue, 24 Mar 2020 20:08:04 +0900
Subject: [PATCH 02/16] Move CrashWgtInstaller class to wgt-smoke-utils

This class can be used at other test, such as smoke test of unified-installer.

Change-Id: Iaaed178a2a5c29a3cf213f29b2f1e025e3c1e886
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/unit_tests/CMakeLists.txt       |  2 +-
 src/unit_tests/smoke_test_helper.cc | 89 +++----------------------------------
 src/unit_tests/wgt_smoke_utils.h    | 48 ++++++++++++++++++++
 3 files changed, 54 insertions(+), 85 deletions(-)

diff --git a/src/unit_tests/CMakeLists.txt b/src/unit_tests/CMakeLists.txt
index 203e3d7..4523d05 100644
--- a/src/unit_tests/CMakeLists.txt
+++ b/src/unit_tests/CMakeLists.txt
@@ -45,7 +45,7 @@ APPLY_PKG_CONFIG(${TARGET_MANIFEST_TEST} PUBLIC
 # GTEST_MAIN_LIBRARIES is needed.
 TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS} ${TARGET_WGT_SMOKE_UTILS})
 TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_EXTENSIVE} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${GTEST_MAIN_LIBRARIES} ${TARGET_SMOKE_UTILS} ${TARGET_WGT_SMOKE_UTILS})
-TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_HELPER} PRIVATE ${TARGET_LIBNAME_WGT})
+TARGET_LINK_LIBRARIES(${TARGET_SMOKE_TEST_HELPER} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_WGT_SMOKE_UTILS})
 TARGET_LINK_LIBRARIES(${TARGET_MANIFEST_TEST} PRIVATE ${TARGET_LIBNAME_WGT} ${GTEST_MAIN_LIBRARIES})
 TARGET_LINK_LIBRARIES(${TARGET_WGT_SMOKE_UTILS} PRIVATE ${TARGET_LIBNAME_WGT} ${TARGET_LIBNAME_HYBRID} ${TARGET_SMOKE_UTILS})
 
diff --git a/src/unit_tests/smoke_test_helper.cc b/src/unit_tests/smoke_test_helper.cc
index 6e8643c..0c0e6f4 100644
--- a/src/unit_tests/smoke_test_helper.cc
+++ b/src/unit_tests/smoke_test_helper.cc
@@ -3,99 +3,20 @@
 // found in the LICENSE file.
 
 #include <common/pkgmgr_interface.h>
-#include <cerrno>
+#include <manifest_parser/utils/logging.h>
 
+#include "unit_tests/wgt_smoke_utils.h"
 #include "wgt/utils/wgt_app_query_interface.h"
 #include "wgt/wgt_installer.h"
 
 namespace ci = common_installer;
 
-namespace {
-
-enum class CrashStepType {
-  PROCESS,
-  CLEAN
-};
-
-class StepCrash : public ci::Step {
- public:
-  using Step::Step;
-
-  explicit StepCrash(ci::InstallerContext* context, CrashStepType type) :
-      ci::Step::Step(context), type_(type) {}
-
-  ci::Step::Status process() override {
-    if (type_ == CrashStepType::PROCESS)
-      raise(SIGSEGV);
-    return Status::OK;
-  }
-  ci::Step::Status clean() override {
-    if (type_ == CrashStepType::CLEAN)
-      raise(SIGSEGV);
-    return Status::OK;
-  }
-  ci::Step::Status undo() override { return ci::Step::Status::OK; }
-  ci::Step::Status precheck() override { return ci::Step::Status::OK; }
-
-  STEP_NAME(Crash)
-
- private:
-  CrashStepType type_;
-};
-
-#define OVERRIDE_STEPS_BLOCK(STEPS)                                            \
-  void STEPS() override {                                                      \
-    wgt::WgtInstaller::STEPS();                                                \
-    if (crash_at_ > -1)                                                        \
-      AddStepAtIndex<StepCrash>(crash_at_, type_);                             \
-    else if (step_name_.size())                                                \
-      AddStepAfter<StepCrash>(step_name_, type_);                              \
-    else                                                                       \
-      AddStep<StepCrash>(type_);                                               \
-  }                                                                            \
-
-class CrashWgtInstaller : public wgt::WgtInstaller {
- public:
-  explicit CrashWgtInstaller(ci::PkgMgrPtr pkgmgr, int crash_at,
-      std::string step_name, CrashStepType type) :
-          wgt::WgtInstaller(pkgmgr), crash_at_(crash_at),
-          step_name_(step_name), type_(type) { }
-
- private:
-  OVERRIDE_STEPS_BLOCK(InstallSteps)
-  OVERRIDE_STEPS_BLOCK(UpdateSteps)
-  OVERRIDE_STEPS_BLOCK(UninstallSteps)
-  OVERRIDE_STEPS_BLOCK(ReinstallSteps)
-  OVERRIDE_STEPS_BLOCK(DeltaSteps)
-  OVERRIDE_STEPS_BLOCK(MoveSteps)
-  OVERRIDE_STEPS_BLOCK(RecoverySteps)
-  OVERRIDE_STEPS_BLOCK(MountInstallSteps)
-  OVERRIDE_STEPS_BLOCK(MountUpdateSteps)
-  OVERRIDE_STEPS_BLOCK(ManifestDirectInstallSteps)
-  OVERRIDE_STEPS_BLOCK(ManifestDirectUpdateSteps)
-  OVERRIDE_STEPS_BLOCK(ManifestPartialInstallSteps)
-  OVERRIDE_STEPS_BLOCK(ManifestPartialUpdateSteps)
-  OVERRIDE_STEPS_BLOCK(PartialUninstallSteps)
-  OVERRIDE_STEPS_BLOCK(ReadonlyUpdateInstallSteps)
-  OVERRIDE_STEPS_BLOCK(ReadonlyUpdateUninstallSteps)
-  OVERRIDE_STEPS_BLOCK(DisablePkgSteps)
-  OVERRIDE_STEPS_BLOCK(EnablePkgSteps)
-  OVERRIDE_STEPS_BLOCK(MigrateExtImgSteps)
-  OVERRIDE_STEPS_BLOCK(RecoverDBSteps)
-
-  int crash_at_;
-  std::string step_name_;
-  CrashStepType type_;
-};
-
-}  // namespace
-
 // this main of test binay in done purely for recovery smoke test.
 int main(int argc, char** argv) {
   int index = -1;
   int backend_argc = argc;
   std::string step_name;
-  CrashStepType type = CrashStepType::PROCESS;
+  smoke_test::CrashStepType type = smoke_test::CrashStepType::PROCESS;
 
   if (!strcmp(argv[backend_argc - 2], "-idx")) {
     index = atoi(argv[argc - 1]);
@@ -111,7 +32,7 @@ int main(int argc, char** argv) {
 
   if (!strcmp(argv[backend_argc - 1], "-type_clean")) {
     backend_argc--;
-    type = CrashStepType::CLEAN;
+    type = smoke_test::CrashStepType::CLEAN;
     LOG(DEBUG) << "step will be crashed in clean operation";
   }
 
@@ -124,7 +45,7 @@ int main(int argc, char** argv) {
     return EINVAL;
   }
 
-  ::CrashWgtInstaller installer(pkgmgr, index, step_name, type);
+  smoke_test::CrashWgtInstaller installer(pkgmgr, index, step_name, type);
   return (installer.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
 }
 
diff --git a/src/unit_tests/wgt_smoke_utils.h b/src/unit_tests/wgt_smoke_utils.h
index 6de6b32..3aa4ec7 100644
--- a/src/unit_tests/wgt_smoke_utils.h
+++ b/src/unit_tests/wgt_smoke_utils.h
@@ -131,6 +131,54 @@ class FailExpectedHybridInstaller : public hybrid::HybridInstaller {
   int fail_at_;
 };
 
+#ifdef OVERRIDE_STEPS_BLOCK
+#undef OVERRIDE_STEPS_BLOCK
+#endif
+#define OVERRIDE_STEPS_BLOCK(STEPS)                                            \
+  void STEPS() override {                                                      \
+    wgt::WgtInstaller::STEPS();                                                \
+    if (crash_at_ > -1)                                                        \
+      AddStepAtIndex<StepCrash>(crash_at_, type_);                             \
+    else if (step_name_.size())                                                \
+      AddStepAfter<StepCrash>(step_name_, type_);                              \
+    else                                                                       \
+      AddStep<StepCrash>(type_);                                               \
+  }                                                                            \
+
+class CrashWgtInstaller : public wgt::WgtInstaller {
+ public:
+  explicit CrashWgtInstaller(common_installer::PkgMgrPtr pkgmgr, int crash_at,
+      std::string step_name, CrashStepType type) :
+          wgt::WgtInstaller(pkgmgr), crash_at_(crash_at),
+          step_name_(step_name), type_(type) { }
+
+ private:
+  OVERRIDE_STEPS_BLOCK(InstallSteps)
+  OVERRIDE_STEPS_BLOCK(UpdateSteps)
+  OVERRIDE_STEPS_BLOCK(UninstallSteps)
+  OVERRIDE_STEPS_BLOCK(ReinstallSteps)
+  OVERRIDE_STEPS_BLOCK(DeltaSteps)
+  OVERRIDE_STEPS_BLOCK(MoveSteps)
+  OVERRIDE_STEPS_BLOCK(RecoverySteps)
+  OVERRIDE_STEPS_BLOCK(MountInstallSteps)
+  OVERRIDE_STEPS_BLOCK(MountUpdateSteps)
+  OVERRIDE_STEPS_BLOCK(ManifestDirectInstallSteps)
+  OVERRIDE_STEPS_BLOCK(ManifestDirectUpdateSteps)
+  OVERRIDE_STEPS_BLOCK(ManifestPartialInstallSteps)
+  OVERRIDE_STEPS_BLOCK(ManifestPartialUpdateSteps)
+  OVERRIDE_STEPS_BLOCK(PartialUninstallSteps)
+  OVERRIDE_STEPS_BLOCK(ReadonlyUpdateInstallSteps)
+  OVERRIDE_STEPS_BLOCK(ReadonlyUpdateUninstallSteps)
+  OVERRIDE_STEPS_BLOCK(DisablePkgSteps)
+  OVERRIDE_STEPS_BLOCK(EnablePkgSteps)
+  OVERRIDE_STEPS_BLOCK(MigrateExtImgSteps)
+  OVERRIDE_STEPS_BLOCK(RecoverDBSteps)
+
+  int crash_at_;
+  std::string step_name_;
+  CrashStepType type_;
+};
+
 }  // namespace smoke_test
 
 
-- 
2.7.4


From f1edc8e50bf2b25b58be686b4719e40178b3b2f9 Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Tue, 14 Apr 2020 13:40:54 +0900
Subject: [PATCH 03/16] Fix ReadonlyUpdateInstallSteps base step name

Relates :
 - [app-installers]https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/230753/

Change-Id: Ia933be951e9facedfb0095995b6666b51fe3a0c4
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 src/hybrid/hybrid_installer.cc | 2 +-
 src/wgt/wgt_installer.cc       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index c1c4326..37ac600 100644
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -380,7 +380,7 @@ void HybridInstaller::ReadonlyUpdateInstallSteps() {
   AddStepAfter<ci::security::StepPrivilegeCompatibility>("MergeTpkPrivileges",
       ci::security::StepPrivilegeCompatibility::InternalPrivType::BOTH);
   AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CreateStorageDirectories");
+      "UpdateStorageDirectories");
 }
 
 void HybridInstaller::ReadonlyUpdateUninstallSteps() {
diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 87ff292..12f151c 100644
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -293,7 +293,7 @@ void WgtInstaller::ReadonlyUpdateInstallSteps() {
       "CreateWgtSymbolicLink");
   AddStepAfter<wgt::pkgmgr::StepGenerateXml>("CheckExtensionPrivileges");
   AddStepAfter<wgt::filesystem::StepWgtPatchStorageDirectories>(
-      "CreateStorageDirectories");
+      "UpdateStorageDirectories");
 }
 
 void WgtInstaller::ReadonlyUpdateUninstallSteps() {
-- 
2.7.4


From 636733b2230362869af9d1086173ffb0ec679efa Mon Sep 17 00:00:00 2001
From: Youngsoo Choi <kenshin.choi@samsung.com>
Date: Tue, 12 May 2020 22:59:49 -0700
Subject: [PATCH 04/16] Change wrt-service symlink to wrt-service-launcher

The wrt-service has been changed with wrt-service-launcher
to launch service daemon properly.

Change-Id: Ie0377742be3e9bde23ba6dbfda69a3addd2b3cbd
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>
---
 src/wgt/step/filesystem/step_create_wgt_symbolic_link.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/wgt/step/filesystem/step_create_wgt_symbolic_link.cc b/src/wgt/step/filesystem/step_create_wgt_symbolic_link.cc
index 8581504..c6ea4fd 100644
--- a/src/wgt/step/filesystem/step_create_wgt_symbolic_link.cc
+++ b/src/wgt/step/filesystem/step_create_wgt_symbolic_link.cc
@@ -22,7 +22,7 @@ namespace bs = boost::system;
 
 namespace {
 
-const char kWrtServiceBinaryPath[] = "/usr/bin/wrt-service";
+const char kWrtServiceBinaryPath[] = "/usr/bin/wrt-service-launcher";
 const char kWebWidgetRuntimeBinaryPath[] = "/usr/bin/web-widget-runtime";
 const char kWRTPath[] = "/usr/bin/wrt";
 
-- 
2.7.4


From 948b1829aba80028de02dcbaf4cd047a3c995fe5 Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Fri, 17 Apr 2020 17:06:10 +0900
Subject: [PATCH 05/16] Add WgtInstallerFactory and HybridInstallerFactory

Now wgt-backend uses installer-runner to run the installer

Change-Id: I801c452dcaababf77527de54876957689d48974f
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 src/hybrid/hybrid_installer_factory.cc | 37 ++++++++++++++++++++++++++++++++++
 src/hybrid/hybrid_installer_factory.h  | 27 +++++++++++++++++++++++++
 src/wgt/wgt_installer_factory.cc       | 37 ++++++++++++++++++++++++++++++++++
 src/wgt/wgt_installer_factory.h        | 27 +++++++++++++++++++++++++
 src/wgt_backend/wgt_backend.cc         | 27 +++++++++++++++++++++----
 5 files changed, 151 insertions(+), 4 deletions(-)
 create mode 100644 src/hybrid/hybrid_installer_factory.cc
 create mode 100644 src/hybrid/hybrid_installer_factory.h
 create mode 100644 src/wgt/wgt_installer_factory.cc
 create mode 100644 src/wgt/wgt_installer_factory.h

diff --git a/src/hybrid/hybrid_installer_factory.cc b/src/hybrid/hybrid_installer_factory.cc
new file mode 100644
index 0000000..52c5395
--- /dev/null
+++ b/src/hybrid/hybrid_installer_factory.cc
@@ -0,0 +1,37 @@
+// Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#include "hybrid/hybrid_installer_factory.h"
+
+#include <unzip.h>
+
+#include <manifest_parser/utils/logging.h>
+#include <hybrid/hybrid_installer.h>
+#include <wgt/utils/wgt_app_query_interface.h>
+#include <wgt/wgt_installer.h>
+
+#include <map>
+#include <memory>
+#include <string>
+
+#include "common/pkgmgr_interface.h"
+#include "common/pkgmgr_query.h"
+
+namespace ci = common_installer;
+
+namespace hybrid {
+
+std::unique_ptr<ci::AppInstaller> HybridInstallerFactory::CreateInstaller(
+    ci::PkgMgrPtr pkgmgr, int idx) {
+  std::unique_ptr<ci::AppInstaller> installer;
+  wgt::WgtAppQueryInterface* wgt_aqi = new wgt::WgtAppQueryInterface();
+
+  pkgmgr->AddAppQueryInterface(idx, wgt_aqi);
+  installer.reset(new hybrid::HybridInstaller(pkgmgr));
+  installer->SetIndex(idx);
+
+  return installer;
+}
+
+}  // namespace hybrid
diff --git a/src/hybrid/hybrid_installer_factory.h b/src/hybrid/hybrid_installer_factory.h
new file mode 100644
index 0000000..f93bb76
--- /dev/null
+++ b/src/hybrid/hybrid_installer_factory.h
@@ -0,0 +1,27 @@
+// Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#ifndef HYBRID_HYBRID_INSTALLER_FACTORY_H_
+#define HYBRID_HYBRID_INSTALLER_FACTORY_H_
+
+#include <common/installer_factory.h>
+#include <common/pkgmgr_interface.h>
+
+#include <memory>
+
+namespace ci = common_installer;
+
+namespace hybrid {
+
+class AppInstaller;
+
+class HybridInstallerFactory : public ci::InstallerFactory {
+ public:
+  std::unique_ptr<ci::AppInstaller> CreateInstaller(
+      ci::PkgMgrPtr pkgmgr, int idx);
+};
+
+}  // namespace hybrid
+
+#endif  // HYBRID_HYBRID_INSTALLER_FACTORY_H_
diff --git a/src/wgt/wgt_installer_factory.cc b/src/wgt/wgt_installer_factory.cc
new file mode 100644
index 0000000..e826ee2
--- /dev/null
+++ b/src/wgt/wgt_installer_factory.cc
@@ -0,0 +1,37 @@
+// Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#include "wgt/wgt_installer_factory.h"
+
+#include <unzip.h>
+
+#include <manifest_parser/utils/logging.h>
+#include <hybrid/hybrid_installer.h>
+#include <wgt/utils/wgt_app_query_interface.h>
+#include <wgt/wgt_installer.h>
+
+#include <map>
+#include <memory>
+#include <string>
+
+#include "common/pkgmgr_interface.h"
+#include "common/pkgmgr_query.h"
+
+namespace ci = common_installer;
+
+namespace wgt {
+
+std::unique_ptr<ci::AppInstaller> WgtInstallerFactory::CreateInstaller(
+    ci::PkgMgrPtr pkgmgr, int idx) {
+  std::unique_ptr<ci::AppInstaller> installer;
+  WgtAppQueryInterface* wgt_aqi = new WgtAppQueryInterface();
+
+  pkgmgr->AddAppQueryInterface(idx, wgt_aqi);
+  installer.reset(new wgt::WgtInstaller(pkgmgr));
+  installer->SetIndex(idx);
+
+  return installer;
+}
+
+}  // namespace wgt
diff --git a/src/wgt/wgt_installer_factory.h b/src/wgt/wgt_installer_factory.h
new file mode 100644
index 0000000..dd1ff4f
--- /dev/null
+++ b/src/wgt/wgt_installer_factory.h
@@ -0,0 +1,27 @@
+// Copyright (c) 2020 Samsung Electronics Co., Ltd All Rights Reserved
+// Use of this source code is governed by an apache-2.0 license that can be
+// found in the LICENSE file.
+
+#ifndef WGT_WGT_INSTALLER_FACTORY_H_
+#define WGT_WGT_INSTALLER_FACTORY_H_
+
+#include <common/installer_factory.h>
+#include <common/pkgmgr_interface.h>
+
+#include <memory>
+
+namespace ci = common_installer;
+
+namespace wgt {
+
+class AppInstaller;
+
+class WgtInstallerFactory : public ci::InstallerFactory {
+ public:
+  std::unique_ptr<ci::AppInstaller> CreateInstaller(
+      ci::PkgMgrPtr pkgmgr, int idx);
+};
+
+}  // namespace wgt
+
+#endif  // WGT_WGT_INSTALLER_FACTORY_H_
diff --git a/src/wgt_backend/wgt_backend.cc b/src/wgt_backend/wgt_backend.cc
index 9f003e3..c72e135 100644
--- a/src/wgt_backend/wgt_backend.cc
+++ b/src/wgt_backend/wgt_backend.cc
@@ -3,34 +3,53 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
+#include <common/installer_runner.h>
 #include <common/pkgmgr_interface.h>
 #include <cerrno>
 
 #include "hybrid/hybrid_installer.h"
+#include "hybrid/hybrid_installer_factory.h"
 #include "wgt/utils/wgt_app_query_interface.h"
 #include "wgt/wgt_installer.h"
+#include "wgt/wgt_installer_factory.h"
 
 namespace ci = common_installer;
 
+#if __cplusplus < 201300L
+namespace {
+
+template<typename T, typename... Args>
+std::unique_ptr<T> make_unique(Args&&... args) {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+}  // namespace
+#endif
+
 int main(int argc, char** argv) {
   ci::PkgmgrInstaller pkgmgr_installer;
   wgt::WgtAppQueryInterface query_interface;
   auto pkgmgr = ci::PkgMgrInterface::Create(argc, argv, &pkgmgr_installer,
                                             &query_interface);
+  std::unique_ptr<ci::InstallerFactory> installer_factory;
   if (!pkgmgr) {
     LOG(ERROR) << "Options of pkgmgr installer cannot be parsed";
     return EINVAL;
   }
 
+#if __cplusplus >= 201300L
+  using std;
+#endif
   // This is workaround for hybrid apps as they requires much different flow
   // but installer does not branch at all in current design
   if (query_interface.IsHybridApplication(
       pkgmgr->GetRequestInfo(), pkgmgr->GetUid())) {
     LOG(INFO) << "Hybrid package detected";
-    hybrid::HybridInstaller installer(pkgmgr);
-    return (installer.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
+    ci::InstallerRunner runner(
+        make_unique<hybrid::HybridInstallerFactory>(), pkgmgr);
+    return (runner.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
   } else {
-    wgt::WgtInstaller installer(pkgmgr);
-    return (installer.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
+    ci::InstallerRunner runner(make_unique<wgt::WgtInstallerFactory>(), pkgmgr);
+    return (runner.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
   }
 }
-- 
2.7.4


From 9492f8462e01aedbd262652fbfb0783800f078e6 Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Mon, 1 Jun 2020 11:29:59 +0900
Subject: [PATCH 06/16] Release version 0.15.2

Changes:
 - Add GetArchiveInfo
 - Make smoke utils as a library
 - Move CrashWgtInstaller class to wgt-smoke-utils
 - Fix ReadonlyUpdateInstallSteps base step name
 - Change wrt-service symlink to wrt-service-launcher
 - Add WgtInstallerFactory and HybridInstallerFactory

Change-Id: Ia4d702d7f8dee66ac49eb2009acb07e56b26735c
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index e83df85..20b7224 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.15.1
+Version:        0.15.2
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From 72925c80c61285e2bc28c1dbe3570055772eb63c Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Thu, 4 Jun 2020 13:31:11 +0900
Subject: [PATCH 07/16] Change routine to check start file

If webapp has not ui application and all service app's type global,
routine to check start file is skipped

Change-Id: I5108a635525181cbeba8596b27b622914a58bb0d
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 src/wgt/step/configuration/step_parse.cc | 54 +++++++++++++++++---------------
 src/wgt/step/configuration/step_parse.h  |  1 +
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index b544181..757a3c6 100644
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -161,7 +161,8 @@ StepParse::StepParse(common_installer::InstallerContext* context,
                      bool check_start_file)
     : Step(context),
       config_location_(config_location),
-      check_start_file_(check_start_file) {
+      check_start_file_(check_start_file),
+      ui_app_not_exists_(false) {
 }
 
 std::set<std::string> StepParse::ExtractPrivileges(
@@ -368,6 +369,7 @@ bool StepParse::FillMainApplicationInfo(manifest_x* manifest) {
     return true;
 
   if (app_info.get()->id().empty()) {
+    ui_app_not_exists_ = true;
     if (!AllServiceAppGlobal()) {
       LOG(ERROR) << "Empty of ui app's id is possible"
                  << " when service app types are all global";
@@ -949,30 +951,6 @@ common_installer::Step::Status StepParse::process() {
     return common_installer::Step::Status::PARSE_ERROR;
   }
 
-  WgtBackendData* backend_data =
-    static_cast<WgtBackendData*>(context_->backend_data.get());
-
-  if (check_start_file_) {
-    if (!parser_->CheckValidStartFile()) {
-      LOG(ERROR) << parser_->GetErrorMessage();
-      return common_installer::Step::Status::PARSE_ERROR;
-    }
-    if (!parser_->CheckValidServicesStartFiles()) {
-      LOG(ERROR) << parser_->GetErrorMessage();
-      return common_installer::Step::Status::PARSE_ERROR;
-    }
-  } else {
-    // making backup of content data and services content data
-    auto content_info = GetManifestDataForKey<const wgt::parse::ContentInfo>(
-        app_keys::kTizenContentKey);
-    auto service_list = GetManifestDataForKey<const wgt::parse::ServiceList>(
-        app_keys::kTizenServiceKey);
-    if (content_info)
-      backend_data->content.set(*content_info);
-    if (service_list)
-      backend_data->service_list.set(*service_list);
-  }
-
   // Copy data from ManifestData to InstallerContext
   auto info = GetManifestDataForKey<const wgt::parse::TizenApplicationInfo>(
       app_keys::kTizenApplicationKey);
@@ -1014,6 +992,32 @@ common_installer::Step::Status StepParse::process() {
     return common_installer::Step::Status::PARSE_ERROR;
   }
 
+  WgtBackendData* backend_data =
+    static_cast<WgtBackendData*>(context_->backend_data.get());
+
+  if (check_start_file_) {
+    if (!ui_app_not_exists_ && !parser_->CheckValidStartFile()) {
+      LOG(ERROR) << parser_->GetErrorMessage();
+      pkgmgr_parser_free_manifest_xml(manifest);
+      return common_installer::Step::Status::PARSE_ERROR;
+    }
+    if (!parser_->CheckValidServicesStartFiles()) {
+      LOG(ERROR) << parser_->GetErrorMessage();
+      pkgmgr_parser_free_manifest_xml(manifest);
+      return common_installer::Step::Status::PARSE_ERROR;
+    }
+  } else {
+    // making backup of content data and services content data
+    auto content_info = GetManifestDataForKey<const wgt::parse::ContentInfo>(
+        app_keys::kTizenContentKey);
+    auto service_list = GetManifestDataForKey<const wgt::parse::ServiceList>(
+        app_keys::kTizenServiceKey);
+    if (content_info)
+      backend_data->content.set(*content_info);
+    if (service_list)
+      backend_data->service_list.set(*service_list);
+  }
+
   context_->pkgid.set(manifest->package);
 
   // write pkgid for recovery file
diff --git a/src/wgt/step/configuration/step_parse.h b/src/wgt/step/configuration/step_parse.h
index c4afe3a..55cd0d7 100644
--- a/src/wgt/step/configuration/step_parse.h
+++ b/src/wgt/step/configuration/step_parse.h
@@ -81,6 +81,7 @@ class StepParse : public common_installer::Step {
   std::unique_ptr<wgt::parse::WidgetConfigParser> parser_;
   ConfigLocation config_location_;
   bool check_start_file_;
+  bool ui_app_not_exists_;
 
   template<typename T>
   std::shared_ptr<const T> GetManifestDataForKey(const std::string& key) {
-- 
2.7.4


From 7517cbcd46dbef6933f759344d5ab54bbbebc43d Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Fri, 12 Jun 2020 15:58:44 +0900
Subject: [PATCH 08/16] Release version 0.15.3

Changes:
 - Change routine to check start file

Change-Id: I53583f7060e739cda0f61e0d50230b7167079a45
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index 20b7224..bd96389 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.15.2
+Version:        0.15.3
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From e875b1443f706b9b4be8dadbf4603e986212f802 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 17 Jun 2020 16:03:56 +0900
Subject: [PATCH 09/16] Fix WgtArchiveInfo

Allow addon only wgt package.

Change-Id: I78a2c71f6dbbed09e47d40f9c17ee5c5c313587c
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 src/lib/wgt_archive_info.cc | 46 +++++++++++++++++++++++++++++++++++++++------
 src/lib/wgt_archive_info.h  |  2 ++
 2 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/lib/wgt_archive_info.cc b/src/lib/wgt_archive_info.cc
index 4f5a18b..df7efc2 100644
--- a/src/lib/wgt_archive_info.cc
+++ b/src/lib/wgt_archive_info.cc
@@ -9,6 +9,7 @@
 #include <boost/filesystem/path.hpp>
 
 #include <wgt_manifest_handlers/widget_config_parser.h>
+#include <wgt_manifest_handlers/addon_handler.h>
 #include <wgt_manifest_handlers/application_icons_handler.h>
 #include <wgt_manifest_handlers/application_manifest_constants.h>
 #include <wgt_manifest_handlers/permissions_handler.h>
@@ -47,20 +48,44 @@ bool WgtArchiveInfo::GetPackageInfo(
   auto widget_info =
       std::static_pointer_cast<const wgt::parse::WidgetInfo>(
           parser.GetManifestData(wgt::parse::WidgetInfo::Key()));
+  if (!widget_info) {
+    LOG(ERROR) << "WidgetInfo not found";
+    return false;
+  }
+
+  type_ = "wgt";
+  version_ =  widget_info->version().c_str();
+  author_ = widget_info->author().c_str();
+
+  return true;
+}
+
+bool WgtArchiveInfo::GetApplicationInfo(
+    const wgt::parse::WidgetConfigParser& parser) {
   auto app_info =
       std::static_pointer_cast<const wgt::parse::TizenApplicationInfo>(
           parser.GetManifestData(wgt::parse::TizenApplicationInfo::Key()));
-  if (!widget_info || !app_info) {
-    LOG(ERROR) << "WidgetInfo / TizenApplicationInfo not found";
+  if (!app_info)
     return false;
-  }
 
-  type_ = "wgt";
   name_ = app_info->package().c_str();
   pkgid_ = app_info->package().c_str();
-  version_ =  widget_info->version().c_str();
   api_version_ = app_info->required_version().c_str();
-  author_ = widget_info->author().c_str();
+
+  return true;
+}
+
+bool WgtArchiveInfo::GetAddonInfo(
+    const wgt::parse::WidgetConfigParser& parser) {
+  auto addon_info =
+      std::static_pointer_cast<const wgt::parse::AddonInfo>(
+          parser.GetManifestData(wgt::parse::AddonInfo::Key()));
+  if (!addon_info)
+    return false;
+
+  name_ = addon_info->package().c_str();
+  pkgid_ = addon_info->package().c_str();
+  api_version_ = addon_info->required_version().c_str();
 
   return true;
 }
@@ -203,6 +228,15 @@ bool WgtArchiveInfo::LoadArchiveInfo() {
     bf::remove_all(tmp_dir);
     return false;
   }
+  if (!GetApplicationInfo(parser)) {
+    if (!GetAddonInfo(parser)) {
+      LOG(ERROR) << "Failed to get application info nor addon info. "
+                 << "At least one of them must exist";
+      bf::remove_all(tmp_dir);
+      return false;
+    }
+  }
+
   if (!GetPrivilegesInfo(parser))
     LOG(WARNING) << "Failed to get privileges info";
   if (!GetIconInfo(parser))
diff --git a/src/lib/wgt_archive_info.h b/src/lib/wgt_archive_info.h
index 085bb47..debc32c 100644
--- a/src/lib/wgt_archive_info.h
+++ b/src/lib/wgt_archive_info.h
@@ -23,6 +23,8 @@ class WgtArchiveInfo : public common_installer::ArchiveInfo {
 
  private:
   bool GetPackageInfo(const wgt::parse::WidgetConfigParser& parser);
+  bool GetApplicationInfo(const wgt::parse::WidgetConfigParser& parser);
+  bool GetAddonInfo(const wgt::parse::WidgetConfigParser& parser);
   bool GetPrivilegesInfo(const wgt::parse::WidgetConfigParser& parser);
   bool GetIconInfo(const wgt::parse::WidgetConfigParser& parser);
   bool ReadIcon(const bf::path& icon, const bf::path& tmp_dir);
-- 
2.7.4


From c9687915743c9ca70b2347cb460c2bdffad706c5 Mon Sep 17 00:00:00 2001
From: Sangyoon Jang <jeremy.jang@samsung.com>
Date: Wed, 17 Jun 2020 16:23:43 +0900
Subject: [PATCH 10/16] Release version 0.15.4

Changes:
 - Fix WgtArchiveInfo

Change-Id: I251da6505d0e93b045d5721a1f9fb15a4b0b6a92
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index bd96389..65bdfc6 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.15.3
+Version:        0.15.4
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From 52b547ac35c47af9cbfa7208bf85591f4db2f4cd Mon Sep 17 00:00:00 2001
From: Ilho Kim <ilho159.kim@samsung.com>
Date: Tue, 2 Jun 2020 17:16:48 +0900
Subject: [PATCH 11/16] Add InstallerWithoutPasrserPlugins for test

This installer runs without parser plugin

Change-Id: I4ed03253d9144616a58674c896971311b17a9a4c
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
---
 src/unit_tests/wgt_smoke_utils.h | 109 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 109 insertions(+)

diff --git a/src/unit_tests/wgt_smoke_utils.h b/src/unit_tests/wgt_smoke_utils.h
index 3aa4ec7..8c5e0ef 100644
--- a/src/unit_tests/wgt_smoke_utils.h
+++ b/src/unit_tests/wgt_smoke_utils.h
@@ -179,6 +179,115 @@ class CrashWgtInstaller : public wgt::WgtInstaller {
   CrashStepType type_;
 };
 
+#ifdef OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS
+#undef OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS
+#endif
+#define OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(TYPE, STEPS)               \
+  void STEPS() override {                                                      \
+    TYPE::STEPS();                                                             \
+    RemoveStep("RunParserPlugin");                                             \
+  }                                                                            \
+
+class WgtInstallerWithoutPasrserPlugins : public wgt::WgtInstaller {
+ public:
+  explicit WgtInstallerWithoutPasrserPlugins(
+      common_installer::PkgMgrPtr pkgmgr) : wgt::WgtInstaller(pkgmgr) { }
+
+ private:
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, InstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, UpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, UninstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, ReinstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, DeltaSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, MoveSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, MountInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, MountUpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, ManifestDirectInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, ManifestDirectUpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, ManifestPartialInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, ManifestPartialUpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, PartialUninstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, ReadonlyUpdateInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, ReadonlyUpdateUninstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, DisablePkgSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, EnablePkgSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, MigrateExtImgSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      wgt::WgtInstaller, RecoverDBSteps)
+  void RecoverySteps() override {
+    wgt::WgtInstaller::RecoverySteps();
+    RemoveStep("RecoverParserPlugin");
+  }
+};
+
+class HybridInstallerWithoutPasrserPlugins : public hybrid::HybridInstaller {
+ public:
+  explicit HybridInstallerWithoutPasrserPlugins(
+      common_installer::PkgMgrPtr pkgmgr) : hybrid::HybridInstaller(pkgmgr) { }
+
+ private:
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, InstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, UpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, UninstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, ReinstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, DeltaSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, MoveSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, MountInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, MountUpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, ManifestDirectInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, ManifestDirectUpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, ManifestPartialInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, ManifestPartialUpdateSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, PartialUninstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, ReadonlyUpdateInstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, ReadonlyUpdateUninstallSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, DisablePkgSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, EnablePkgSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, MigrateExtImgSteps)
+  OVERRIDE_STEPS_BLOCK_WITHOUT_PARSER_PLUGINS(
+      hybrid::HybridInstaller, RecoverDBSteps)
+  void RecoverySteps() override {
+    hybrid::HybridInstaller::RecoverySteps();
+    RemoveStep("RecoverParserPlugin");
+  }
+};
+
 }  // namespace smoke_test
 
 
-- 
2.7.4


From 56072f09e758ec479aa3774758316da7c97bcc69 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Thu, 2 Jul 2020 09:46:44 +0900
Subject: [PATCH 12/16] Change filepath

Its path has changed.

Related changes:
[app-installers] : https://review.tizen.org/gerrit/#/c/platform/core/appfw/app-installers/+/237608

Change-Id: I29b2a771da487cd56649a185c050620dff4254c5
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/hybrid/hybrid_installer.h                                 | 2 +-
 src/hybrid/hybrid_installer_factory.cc                        | 2 +-
 src/unit_tests/manifest_test.cc                               | 2 +-
 src/unit_tests/smoke_test.cc                                  | 2 +-
 src/unit_tests/wgt_smoke_utils.h                              | 2 +-
 src/wgt/step/configuration/step_check_start_files.cc          | 2 +-
 src/wgt/step/configuration/step_check_start_files.h           | 2 +-
 src/wgt/step/configuration/step_parse.cc                      | 6 +++---
 src/wgt/step/configuration/step_parse.h                       | 2 +-
 src/wgt/step/configuration/step_parse_recovery.cc             | 2 +-
 src/wgt/step/filesystem/step_copy_preview_icons.h             | 2 +-
 src/wgt/step/filesystem/step_create_wgt_symbolic_link.h       | 2 +-
 src/wgt/step/filesystem/step_wgt_prepare_package_directory.cc | 2 +-
 src/wgt/step/filesystem/step_wgt_resource_directory.h         | 2 +-
 src/wgt/step/filesystem/step_wgt_update_package_directory.cc  | 2 +-
 src/wgt/step/security/step_add_default_privileges.h           | 2 +-
 src/wgt/step/security/step_check_extension_privileges.h       | 2 +-
 src/wgt/step/security/step_check_settings_level.h             | 2 +-
 src/wgt/utils/wgt_app_query_interface.cc                      | 4 ++--
 src/wgt/wgt_installer.h                                       | 2 +-
 src/wgt/wgt_installer_factory.cc                              | 2 +-
 21 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/hybrid/hybrid_installer.h b/src/hybrid/hybrid_installer.h
index c595153..cc07dff 100644
--- a/src/hybrid/hybrid_installer.h
+++ b/src/hybrid/hybrid_installer.h
@@ -5,7 +5,7 @@
 #ifndef HYBRID_HYBRID_INSTALLER_H_
 #define HYBRID_HYBRID_INSTALLER_H_
 
-#include "common/app_installer.h"
+#include "common/installer/app_installer.h"
 #include "common/pkgmgr_interface.h"
 
 namespace ci = common_installer;
diff --git a/src/hybrid/hybrid_installer_factory.cc b/src/hybrid/hybrid_installer_factory.cc
index 52c5395..ed9cf2a 100644
--- a/src/hybrid/hybrid_installer_factory.cc
+++ b/src/hybrid/hybrid_installer_factory.cc
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "common/pkgmgr_interface.h"
-#include "common/pkgmgr_query.h"
+#include "common/utils/pkgmgr_query.h"
 
 namespace ci = common_installer;
 
diff --git a/src/unit_tests/manifest_test.cc b/src/unit_tests/manifest_test.cc
index ca90c26..56549d0 100644
--- a/src/unit_tests/manifest_test.cc
+++ b/src/unit_tests/manifest_test.cc
@@ -5,8 +5,8 @@
 #include <boost/filesystem/path.hpp>
 
 #include <common/installer_context.h>
-#include <common/request.h>
 #include <common/utils/glist_range.h>
+#include <common/utils/request.h>
 
 #include <wgt_manifest_handlers/setting_handler.h>
 
diff --git a/src/unit_tests/smoke_test.cc b/src/unit_tests/smoke_test.cc
index 40a1304..2157903 100644
--- a/src/unit_tests/smoke_test.cc
+++ b/src/unit_tests/smoke_test.cc
@@ -6,7 +6,7 @@
 
 #include <common/utils/subprocess.h>
 #include <common/utils/file_util.h>
-#include <common/pkgmgr_query.h>
+#include <common/utils/pkgmgr_query.h>
 #include <unit_tests/common/smoke_utils.h>
 
 #include <memory>
diff --git a/src/unit_tests/wgt_smoke_utils.h b/src/unit_tests/wgt_smoke_utils.h
index 8c5e0ef..51d82a9 100644
--- a/src/unit_tests/wgt_smoke_utils.h
+++ b/src/unit_tests/wgt_smoke_utils.h
@@ -5,7 +5,7 @@
 #ifndef UNIT_TESTS_WGT_SMOKE_UTILS_H_
 #define UNIT_TESTS_WGT_SMOKE_UTILS_H_
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/pkgmgr_interface.h>
 #include <common/step/configuration/step_fail.h>
 #include <unit_tests/common/smoke_utils.h>
diff --git a/src/wgt/step/configuration/step_check_start_files.cc b/src/wgt/step/configuration/step_check_start_files.cc
index c39474b..e1c2b42 100644
--- a/src/wgt/step/configuration/step_check_start_files.cc
+++ b/src/wgt/step/configuration/step_check_start_files.cc
@@ -6,7 +6,7 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/step/configuration/step_check_start_files.h b/src/wgt/step/configuration/step_check_start_files.h
index 31f42d5..31424c0 100644
--- a/src/wgt/step/configuration/step_check_start_files.h
+++ b/src/wgt/step/configuration/step_check_start_files.h
@@ -6,7 +6,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index 757a3c6..8c97c72 100644
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -7,10 +7,10 @@
 
 #include <boost/filesystem/path.hpp>
 
-#include <common/app_installer.h>
-#include <common/paths.h>
+#include <common/installer/app_installer.h>
+#include <common/utils/paths.h>
 #include <common/installer_context.h>
-#include <common/pkgmgr_query.h>
+#include <common/utils/pkgmgr_query.h>
 #include <common/privileges.h>
 #include <common/step/step.h>
 #include <common/utils/glist_range.h>
diff --git a/src/wgt/step/configuration/step_parse.h b/src/wgt/step/configuration/step_parse.h
index 55cd0d7..0480048 100644
--- a/src/wgt/step/configuration/step_parse.h
+++ b/src/wgt/step/configuration/step_parse.h
@@ -6,7 +6,7 @@
 
 #include <boost/filesystem.hpp>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/step/configuration/step_parse_recovery.cc b/src/wgt/step/configuration/step_parse_recovery.cc
index 728a19e..6d8bee9 100644
--- a/src/wgt/step/configuration/step_parse_recovery.cc
+++ b/src/wgt/step/configuration/step_parse_recovery.cc
@@ -4,7 +4,7 @@
 
 #include "wgt/step/configuration/step_parse_recovery.h"
 
-#include <common/paths.h>
+#include <common/utils/paths.h>
 #include <common/installer_context.h>
 
 namespace {
diff --git a/src/wgt/step/filesystem/step_copy_preview_icons.h b/src/wgt/step/filesystem/step_copy_preview_icons.h
index 5a51d83..cf843b9 100644
--- a/src/wgt/step/filesystem/step_copy_preview_icons.h
+++ b/src/wgt/step/filesystem/step_copy_preview_icons.h
@@ -7,7 +7,7 @@
 
 #include <manifest_parser/utils/logging.h>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/step/filesystem/step_create_wgt_symbolic_link.h b/src/wgt/step/filesystem/step_create_wgt_symbolic_link.h
index a91cbf1..548baab 100644
--- a/src/wgt/step/filesystem/step_create_wgt_symbolic_link.h
+++ b/src/wgt/step/filesystem/step_create_wgt_symbolic_link.h
@@ -9,7 +9,7 @@
 
 #include <manifest_parser/utils/logging.h>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/step/filesystem/step_wgt_prepare_package_directory.cc b/src/wgt/step/filesystem/step_wgt_prepare_package_directory.cc
index 3ac814c..5b2bb0f 100644
--- a/src/wgt/step/filesystem/step_wgt_prepare_package_directory.cc
+++ b/src/wgt/step/filesystem/step_wgt_prepare_package_directory.cc
@@ -8,7 +8,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/system/system_error.hpp>
 
-#include <common/paths.h>
+#include <common/utils/paths.h>
 #include <common/utils/file_util.h>
 
 #include <vector>
diff --git a/src/wgt/step/filesystem/step_wgt_resource_directory.h b/src/wgt/step/filesystem/step_wgt_resource_directory.h
index f81ebd5..af811fe 100644
--- a/src/wgt/step/filesystem/step_wgt_resource_directory.h
+++ b/src/wgt/step/filesystem/step_wgt_resource_directory.h
@@ -7,7 +7,7 @@
 
 #include <manifest_parser/utils/logging.h>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/step/filesystem/step_wgt_update_package_directory.cc b/src/wgt/step/filesystem/step_wgt_update_package_directory.cc
index efe6be8..9cb801d 100644
--- a/src/wgt/step/filesystem/step_wgt_update_package_directory.cc
+++ b/src/wgt/step/filesystem/step_wgt_update_package_directory.cc
@@ -8,7 +8,7 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/system/error_code.hpp>
 
-#include <common/paths.h>
+#include <common/utils/paths.h>
 #include <common/utils/file_util.h>
 
 namespace bf = boost::filesystem;
diff --git a/src/wgt/step/security/step_add_default_privileges.h b/src/wgt/step/security/step_add_default_privileges.h
index 84c7bca..fc0671a 100644
--- a/src/wgt/step/security/step_add_default_privileges.h
+++ b/src/wgt/step/security/step_add_default_privileges.h
@@ -7,7 +7,7 @@
 
 #include <manifest_parser/utils/logging.h>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/step/security/step_check_extension_privileges.h b/src/wgt/step/security/step_check_extension_privileges.h
index c390d3c..ee1cf4e 100755
--- a/src/wgt/step/security/step_check_extension_privileges.h
+++ b/src/wgt/step/security/step_check_extension_privileges.h
@@ -8,7 +8,7 @@
 #ifndef WGT_STEP_SECURITY_STEP_CHECK_EXTENSION_PRIVILEGES_H_
 #define WGT_STEP_SECURITY_STEP_CHECK_EXTENSION_PRIVILEGES_H_
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 #include <glib.h>
diff --git a/src/wgt/step/security/step_check_settings_level.h b/src/wgt/step/security/step_check_settings_level.h
index 772188b..2ad7a98 100644
--- a/src/wgt/step/security/step_check_settings_level.h
+++ b/src/wgt/step/security/step_check_settings_level.h
@@ -7,7 +7,7 @@
 
 #include <manifest_parser/utils/logging.h>
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
diff --git a/src/wgt/utils/wgt_app_query_interface.cc b/src/wgt/utils/wgt_app_query_interface.cc
index 3c9131e..d785f90 100644
--- a/src/wgt/utils/wgt_app_query_interface.cc
+++ b/src/wgt/utils/wgt_app_query_interface.cc
@@ -12,10 +12,10 @@
 #include <boost/system/error_code.hpp>
 
 #include <common/pkgmgr_interface.h>
-#include <common/pkgmgr_query.h>
+#include <common/utils/pkgmgr_query.h>
 #include <common/recovery_file.h>
-#include <common/request.h>
 #include <common/utils/file_util.h>
+#include <common/utils/request.h>
 
 #include <manifest_parser/manifest_parser.h>
 #include <manifest_parser/utils/logging.h>
diff --git a/src/wgt/wgt_installer.h b/src/wgt/wgt_installer.h
index e210622..2c99aa6 100644
--- a/src/wgt/wgt_installer.h
+++ b/src/wgt/wgt_installer.h
@@ -5,7 +5,7 @@
 #ifndef WGT_WGT_INSTALLER_H_
 #define WGT_WGT_INSTALLER_H_
 
-#include <common/app_installer.h>
+#include <common/installer/app_installer.h>
 
 namespace wgt {
 
diff --git a/src/wgt/wgt_installer_factory.cc b/src/wgt/wgt_installer_factory.cc
index e826ee2..54d191e 100644
--- a/src/wgt/wgt_installer_factory.cc
+++ b/src/wgt/wgt_installer_factory.cc
@@ -16,7 +16,7 @@
 #include <string>
 
 #include "common/pkgmgr_interface.h"
-#include "common/pkgmgr_query.h"
+#include "common/utils/pkgmgr_query.h"
 
 namespace ci = common_installer;
 
-- 
2.7.4


From 5bdf7c41cd18ac13a2b37fc761854ad9e9e2230f Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Mon, 6 Jul 2020 17:09:17 +0900
Subject: [PATCH 13/16] Release version 0.15.5

Changes:
 - Add InstallerWithoutPasrserPlugins for test
 - Change filepath

Change-Id: Ib0e8cd332b5d5ae95a9479836e156f75e3561178
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index 65bdfc6..da7a197 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.15.4
+Version:        0.15.5
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4


From b18a76a8af3c11a56d1852cbc6e13f42dbfe0de9 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Thu, 30 Jul 2020 16:18:54 +0900
Subject: [PATCH 14/16] Add try-catch statements

Change-Id: Ib83a73359ab768f2af0e5bbf7e5eac52446a3ba3
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 src/wgt_backend/wgt_backend.cc | 44 ++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/wgt_backend/wgt_backend.cc b/src/wgt_backend/wgt_backend.cc
index c72e135..3286b08 100644
--- a/src/wgt_backend/wgt_backend.cc
+++ b/src/wgt_backend/wgt_backend.cc
@@ -29,27 +29,33 @@ std::unique_ptr<T> make_unique(Args&&... args) {
 int main(int argc, char** argv) {
   ci::PkgmgrInstaller pkgmgr_installer;
   wgt::WgtAppQueryInterface query_interface;
-  auto pkgmgr = ci::PkgMgrInterface::Create(argc, argv, &pkgmgr_installer,
-                                            &query_interface);
-  std::unique_ptr<ci::InstallerFactory> installer_factory;
-  if (!pkgmgr) {
-    LOG(ERROR) << "Options of pkgmgr installer cannot be parsed";
-    return EINVAL;
-  }
+  try {
+    auto pkgmgr = ci::PkgMgrInterface::Create(argc, argv, &pkgmgr_installer,
+                                              &query_interface);
+    std::unique_ptr<ci::InstallerFactory> installer_factory;
+    if (!pkgmgr) {
+      LOG(ERROR) << "Options of pkgmgr installer cannot be parsed";
+      return EINVAL;
+    }
 
 #if __cplusplus >= 201300L
-  using std;
+    using std;
 #endif
-  // This is workaround for hybrid apps as they requires much different flow
-  // but installer does not branch at all in current design
-  if (query_interface.IsHybridApplication(
-      pkgmgr->GetRequestInfo(), pkgmgr->GetUid())) {
-    LOG(INFO) << "Hybrid package detected";
-    ci::InstallerRunner runner(
-        make_unique<hybrid::HybridInstallerFactory>(), pkgmgr);
-    return (runner.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
-  } else {
-    ci::InstallerRunner runner(make_unique<wgt::WgtInstallerFactory>(), pkgmgr);
-    return (runner.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
+    // This is workaround for hybrid apps as they requires much different flow
+    // but installer does not branch at all in current design
+    if (query_interface.IsHybridApplication(
+        pkgmgr->GetRequestInfo(), pkgmgr->GetUid())) {
+      LOG(INFO) << "Hybrid package detected";
+      ci::InstallerRunner runner(
+          make_unique<hybrid::HybridInstallerFactory>(), pkgmgr);
+      return (runner.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
+    } else {
+      ci::InstallerRunner runner(
+            make_unique<wgt::WgtInstallerFactory>(), pkgmgr);
+      return (runner.Run() == ci::AppInstaller::Result::OK) ? 0 : 1;
+    }
+  } catch(...) {
+    LOG(ERROR) << "Exception occured";
+    return 1;
   }
 }
-- 
2.7.4


From 918a24db6c766708577e7a50b0a43d6478c09bd1 Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Thu, 16 Jul 2020 15:21:13 +0900
Subject: [PATCH 15/16] Change binary file added for smoke test

Change-Id: I32e6e755e7286fb12aec26318a957214fa010d5b
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 .../smokehyb12/bin/service2                             | Bin 13436 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/unit_tests/test_samples/smoke/ManifestDirectInstallMode_Hybrid/smokehyb12/bin/service2 b/src/unit_tests/test_samples/smoke/ManifestDirectInstallMode_Hybrid/smokehyb12/bin/service2
index f1427f90daceac74d5d7d8617e802f11b34f5f38..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
GIT binary patch
literal 0
HcmV?d00001

literal 13436
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
T<=*0Go;bBih&vnvrSHE1{)B?-

-- 
2.7.4


From cb02c1b9722a03e614c3ba73fa2695731d14c76d Mon Sep 17 00:00:00 2001
From: Junghyun Yeon <jungh.yeon@samsung.com>
Date: Mon, 3 Aug 2020 14:52:07 +0900
Subject: [PATCH 16/16] Release version 0.15.6

Changes:
 - Add try-catch statements
 - Change binary file added for smoke test

Change-Id: I2ec2e1fa9833f303cf1ade90df184a2150ba94a8
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>
---
 packaging/wgt-backend.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packaging/wgt-backend.spec b/packaging/wgt-backend.spec
index da7a197..2db178c 100644
--- a/packaging/wgt-backend.spec
+++ b/packaging/wgt-backend.spec
@@ -1,6 +1,6 @@
 Name:           wgt-backend
 Summary:        Application installer backend for WGT
-Version:        0.15.5
+Version:        0.15.6
 Release:        1
 Group:          Application Framework/Package Management
 License:        Apache-2.0
-- 
2.7.4