#include "hybrid/step/configuration/step_merge_tpk_privileges.h"
#include "hybrid/step/configuration/step_stash_tpk_config.h"
#include "hybrid/step/encryption/step_encrypt_resources.h"
-#include "hybrid/step/pkgmgr/step_generate_xml.h"
+#include "hybrid/step/pkgmgr/step_merge_xml.h"
#include "wgt/step/configuration/step_parse.h"
#include "wgt/step/configuration/step_set_old_signature_files_location.h"
#include "wgt/step/encryption/step_remove_encryption_data.h"
AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
AddStep<ci::filesystem::StepCreateStorageDirectories>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
AddStep<ci::filesystem::StepCopyStorageDirectories>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
AddStep<ci::filesystem::StepCopyStorageDirectories>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
AddStep<ci::filesystem::StepCreateStorageDirectories>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
AddStep<wgt::filesystem::StepCopyPreviewIcons>();
AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
AddStep<tpk::filesystem::StepTpkPatchIcons>();
AddStep<wgt::filesystem::StepWgtPatchIcons>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
AddStep<tpk::filesystem::StepTpkPatchIcons>();
AddStep<wgt::filesystem::StepWgtPatchIcons>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::OVERWRITE);
AddStep<wgt::filesystem::StepWgtPatchStorageDirectories>();
AddStep<ci::filesystem::StepCreateStorageDirectories>();
AddStep<wgt::pkgmgr::StepGenerateXml>();
- AddStep<hybrid::pkgmgr::StepGenerateXml>();
+ AddStep<hybrid::pkgmgr::StepMergeXml>();
AddStep<tpk::pkgmgr::StepManifestAdjustment>();
AddStep<hybrid::configuration::StepMergeTpkConfig>(
hybrid::configuration::StepMergeTpkConfig::MergeType::CONCAT);
// Use of this source code is governed by an apache-2.0 license that can be
// found in the LICENSE file.
-#include "hybrid/step/pkgmgr/step_generate_xml.h"
+#include "hybrid/step/pkgmgr/step_merge_xml.h"
#include <boost/filesystem/operations.hpp>
#include <boost/filesystem/path.hpp>
namespace hybrid {
namespace pkgmgr {
-bool StepGenerateXml::LoadXmlDocument(const bf::path& wgt_xml_path,
+bool StepMergeXml::LoadXmlDocument(const bf::path& wgt_xml_path,
const bf::path& tpk_xml_path) {
// trim blanks
int keep_blanks = xmlKeepBlanksDefault(0);
return true;
}
-xmlNodePtr StepGenerateXml::GetXmlNode(const xmlDocPtr doc,
+xmlNodePtr StepMergeXml::GetXmlNode(const xmlDocPtr doc,
const std::string& name, const std::string& attr,
const std::string& attr_val) {
xmlXPathContextPtr ctxt = xmlXPathNewContext(doc);
return node;
}
-void StepGenerateXml::MergeXmlNode(xmlNodePtr node1, xmlNodePtr node2) {
+void StepMergeXml::MergeXmlNode(xmlNodePtr node1, xmlNodePtr node2) {
xmlNodePtr last = xmlGetLastChild(node1);
xmlNodePtr next;
// merge node2's child into node1
}
}
-void StepGenerateXml::SetXmlNodeAttribute(xmlNodePtr node,
+void StepMergeXml::SetXmlNodeAttribute(xmlNodePtr node,
const std::string& attr, const std::string& attr_val) {
xmlSetProp(node, reinterpret_cast<const xmlChar*>(attr.c_str()),
reinterpret_cast<const xmlChar*>(attr_val.c_str()));
}
-ci::Step::Status StepGenerateXml::process() {
+ci::Step::Status StepMergeXml::process() {
bf::path wgt_xml_path = context_->xml_path.get();
bf::path tpk_xml_path = context_->GetPkgPath() / "tizen-manifest.xml";
return Status::OK;
}
-ci::Step::Status StepGenerateXml::precheck() {
+ci::Step::Status StepMergeXml::precheck() {
bf::path wgt_xml_path = context_->xml_path.get();
if (!bf::exists(wgt_xml_path)) {
LOG(ERROR) << "Converted config file not found: " << wgt_xml_path;
// Use of this source code is governed by an apache-2.0 license that can be
// found in the LICENSE file.
-#ifndef HYBRID_STEP_PKGMGR_STEP_GENERATE_XML_H_
-#define HYBRID_STEP_PKGMGR_STEP_GENERATE_XML_H_
+#ifndef HYBRID_STEP_PKGMGR_STEP_MERGE_XML_H_
+#define HYBRID_STEP_PKGMGR_STEP_MERGE_XML_H_
#include <boost/filesystem.hpp>
namespace hybrid {
namespace pkgmgr {
-class StepGenerateXml : public common_installer::Step {
+class StepMergeXml : public common_installer::Step {
public:
using Step::Step;
- explicit StepGenerateXml(common_installer::InstallerContext* context)
+ explicit StepMergeXml(common_installer::InstallerContext* context)
: Step(context), wgt_doc_(nullptr), tpk_doc_(nullptr) {}
Status process() override;
Status clean() override { return Status::OK; }
xmlDocPtr wgt_doc_;
xmlDocPtr tpk_doc_;
- STEP_NAME(GenerateXml2);
+ STEP_NAME(MergeXml);
};
} // namespace pkgmgr
} // namespace hybrid
-#endif // HYBRID_STEP_PKGMGR_STEP_GENERATE_XML_H_
+#endif // HYBRID_STEP_PKGMGR_STEP_MERGE_XML_H_