apply extended concept of package's attribute.

Requires :
	https://review.tizen.org/gerrit/#/c/99039/

Change-Id: I3da722ec30cd00554b9fe9e00b001bb6922a8cbf
Signed-off-by: jongmyeongko <jongmyeong.ko@samsung.com>

diff --git a/src/hybrid/hybrid_installer.cc b/src/hybrid/hybrid_installer.cc
index 2b416e3a773a547e9a26645ec6fcc2127e635853..324c771c89e0e85e0449fb142e08b64873c3cfee 100644 (file)
--- a/src/hybrid/hybrid_installer.cc
+++ b/src/hybrid/hybrid_installer.cc
@@ -236,6 +236,7 @@ HybridInstaller::HybridInstaller(common_installer::PkgMgrPtr pkgmgr)
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, true);
       AddStep<hybrid::configuration::StepMergeTpkConfig>();
+      AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::configuration::StepCheckTizenVersion>();
       AddStep<ci::security::StepCheckSignature>();
       AddStep<ci::security::StepPrivilegeCompatibility>(

diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index cf349e8f87b5d7e003daaa1ccec2a6c7c7062056..8fcbcecb1332c68b4ede05ac81c5c9dadada4060 100644 (file)
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -230,10 +230,6 @@ bool StepParse::FillWidgetInfo(manifest_x* manifest) {
   manifest->type = strdup("wgt");
   manifest->appsetting = strdup("false");
   manifest->nodisplay_setting = strdup("false");
-  if (context_->is_preload_request.get())
-    manifest->preload = strdup("true");
-  else
-    manifest->preload = strdup("false");
   manifest->installed_storage = strdup("installed_internal");
 
   // For wgt package use the long name

diff --git a/src/wgt/step/encryption/step_encrypt_resources.cc b/src/wgt/step/encryption/step_encrypt_resources.cc
index d7d2e9a11e324ec50d8eb7ca6af858c9256a14e4..9c6b9d82ac283c5f99bc8471522415a2e09b9aa1 100644 (file)
--- a/src/wgt/step/encryption/step_encrypt_resources.cc
+++ b/src/wgt/step/encryption/step_encrypt_resources.cc
@@ -195,7 +195,7 @@ bool StepEncryptResources::EncryptFile(const bf::path &src) {
               == common_installer::RequestMode::GLOBAL) {
         ret = wae_encrypt_global_web_application(
                 context_->pkgid.get().c_str(),
-                context_->is_preload_request.get() ?
+                context_->is_readonly_package.get() ?
                 true : false,
                 inChunk.get(),
                 (size_t)bytesRead,

diff --git a/src/wgt/step/encryption/step_remove_encryption_data.cc b/src/wgt/step/encryption/step_remove_encryption_data.cc
index e398b23b84230389277673fe6acb88fa765e02f3..7b3e9acd861e43174e8ba3591c8777c54dfd352a 100644 (file)
--- a/src/wgt/step/encryption/step_remove_encryption_data.cc
+++ b/src/wgt/step/encryption/step_remove_encryption_data.cc
@@ -18,7 +18,7 @@ common_installer::Step::Status StepRemoveEncryptionData::process() {
   int ret;
   if (context_->request_mode.get() == common_installer::RequestMode::GLOBAL)
     ret = wae_remove_global_app_dek(context_->pkgid.get().c_str(),
-                context_->is_preload_request.get() ?
+                context_->is_readonly_package.get() ?
                 true : false);
   else
     ret = wae_remove_app_dek(context_->uid.get(),

diff --git a/src/wgt/step/pkgmgr/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc
index 3e6356025af3fcdcad0ae86b66d1cca9b4d740ad..d1d1e6f528e351e930cbfc9cac0ed9b447829273 100644 (file)
--- a/src/wgt/step/pkgmgr/step_generate_xml.cc
+++ b/src/wgt/step/pkgmgr/step_generate_xml.cc
@@ -341,7 +341,7 @@ common_installer::Step::Status StepGenerateXml::precheck() {
 common_installer::Step::Status StepGenerateXml::process() {
   bf::path xml_path =
       bf::path(getUserManifestPath(context_->uid.get(),
-                  context_->is_preload_request.get()))
+                  context_->is_readonly_package.get()))
       / bf::path(context_->pkgid.get());
   xml_path += ".xml";
   context_->xml_path.set(xml_path.string());

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index 43fc80ce2b68a3cef6de36a9a47ad4033b7feac2..e87ec01fcb54788e07d384ffbdf0a95e9f91c6d6 100755 (executable)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -222,6 +222,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<wgt::configuration::StepCheckRDSManifest>();
       AddStep<wgt::configuration::StepParse>(
           wgt::configuration::StepParse::ConfigLocation::RESOURCE_WGT, false);
+      AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::pkgmgr::StepCheckRestriction>();
       AddStep<ci::configuration::StepCheckTizenVersion>();
       AddStep<ci::pkgmgr::StepKillApps>();
@@ -247,6 +248,7 @@ WgtInstaller::WgtInstaller(ci::PkgMgrPtr pkgrmgr)
       AddStep<ci::configuration::StepParseManifest>(
           ci::configuration::StepParseManifest::ManifestLocation::INSTALLED,
           ci::configuration::StepParseManifest::StoreLocation::BACKUP);
+      AddStep<ci::configuration::StepParsePreload>();
       AddStep<ci::configuration::StepCheckTizenVersion>();
       AddStep<ci::filesystem::StepEnableExternalMount>();
       AddStep<ci::filesystem::StepDeltaPatch>("res/wgt/");