Move utility files into newly created directory

Move it to reduce module circular dependency.

Change-Id: Iffed47db7a38950afe961ea4ebdc9b5fd643e57f
Signed-off-by: Junghyun Yeon <jungh.yeon@samsung.com>

diff --git a/src/hybrid/hybrid_backend_data.h b/src/hybrid/hybrid_backend_data.h
index 9cc98c9..de0e9a0 100644 (file)
--- a/src/hybrid/hybrid_backend_data.h
+++ b/src/hybrid/hybrid_backend_data.h
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 namespace hybrid {
 

diff --git a/src/unit_tests/manifest_test.cc b/src/unit_tests/manifest_test.cc
index 051d2f3..e195ff0 100644 (file)
--- a/src/unit_tests/manifest_test.cc
+++ b/src/unit_tests/manifest_test.cc
@@ -19,7 +19,7 @@
 #include <vector>
 
 #include "wgt/step/configuration/step_parse.h"
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 #define ASSERT_CSTR_EQ(STR1, STR2)                                             \
   ASSERT_EQ(strcmp(STR1, STR2), 0)                                             \

diff --git a/src/unit_tests/smoke_test_helper.cc b/src/unit_tests/smoke_test_helper.cc
index 3549d84..9d666b2 100644 (file)
--- a/src/unit_tests/smoke_test_helper.cc
+++ b/src/unit_tests/smoke_test_helper.cc
@@ -5,7 +5,7 @@
 #include <common/pkgmgr_interface.h>
 #include <cerrno>
 
-#include "wgt/wgt_app_query_interface.h"
+#include "wgt/utils/wgt_app_query_interface.h"
 #include "wgt/wgt_installer.h"
 
 namespace ci = common_installer;

diff --git a/src/unit_tests/smoke_utils.h b/src/unit_tests/smoke_utils.h
index 7b22263..14e0994 100644 (file)
--- a/src/unit_tests/smoke_utils.h
+++ b/src/unit_tests/smoke_utils.h
@@ -16,7 +16,7 @@
 
 #include "hybrid/hybrid_installer.h"
 #include "wgt/wgt_installer.h"
-#include "wgt/wgt_app_query_interface.h"
+#include "wgt/utils/wgt_app_query_interface.h"
 
 namespace smoke_test {
 

diff --git a/src/wgt/CMakeLists.txt b/src/wgt/CMakeLists.txt
index a9baf9b..e2456c7 100755 (executable)
--- a/src/wgt/CMakeLists.txt
+++ b/src/wgt/CMakeLists.txt
@@ -5,6 +5,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/encryption WGT_STEP_ENCRYP
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/filesystem WGT_STEP_FILESYSTEM_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/pkgmgr WGT_STEP_PKGMGR_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/security WGT_STEP_SECURITY_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/utils WGT_UTILS_SRCS)
 
 # Target - definition
 ADD_LIBRARY(${TARGET_LIBNAME_WGT} STATIC
@@ -13,7 +14,8 @@ ADD_LIBRARY(${TARGET_LIBNAME_WGT} STATIC
   ${WGT_STEP_ENCRYPTION_SRCS}
   ${WGT_STEP_FILESYSTEM_SRCS}
   ${WGT_STEP_PKGMGR_SRCS}
-  ${WGT_STEP_SECURITY_SRCS})
+  ${WGT_STEP_SECURITY_SRCS}
+  ${WGT_UTILS_SRCS})
 # Target - includes
 TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_WGT} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../")
 # Target - deps

diff --git a/src/wgt/step/configuration/step_check_start_files.cc b/src/wgt/step/configuration/step_check_start_files.cc
index 6db5b8e..c39474b 100644 (file)
--- a/src/wgt/step/configuration/step_check_start_files.cc
+++ b/src/wgt/step/configuration/step_check_start_files.cc
@@ -10,7 +10,7 @@
 #include <common/installer_context.h>
 #include <common/step/step.h>
 
-#include <wgt/wgt_backend_data.h>
+#include <wgt/utils/wgt_backend_data.h>
 
 #include <wgt_manifest_handlers/w3c_pc_utils.h>
 #include <wgt_manifest_handlers/content_handler.h>

diff --git a/src/wgt/step/configuration/step_check_start_files.h b/src/wgt/step/configuration/step_check_start_files.h
index 7fc7025..31f42d5 100644 (file)
--- a/src/wgt/step/configuration/step_check_start_files.h
+++ b/src/wgt/step/configuration/step_check_start_files.h
@@ -12,7 +12,7 @@
 
 #include <manifest_parser/utils/logging.h>
 
-#include <wgt/wgt_backend_data.h>
+#include <wgt/utils/wgt_backend_data.h>
 
 #include <type_traits>
 #include <cassert>

diff --git a/src/wgt/step/configuration/step_parse.cc b/src/wgt/step/configuration/step_parse.cc
index 9cbf0fb..be1e09c 100644 (file)
--- a/src/wgt/step/configuration/step_parse.cc
+++ b/src/wgt/step/configuration/step_parse.cc
@@ -47,7 +47,7 @@
 #include <vector>
 #include <utility>
 
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 namespace bf = boost::filesystem;
 namespace ci = common_installer;

diff --git a/src/wgt/step/encryption/step_encrypt_resources.h b/src/wgt/step/encryption/step_encrypt_resources.h
index 6b420fd..b66db68 100644 (file)
--- a/src/wgt/step/encryption/step_encrypt_resources.h
+++ b/src/wgt/step/encryption/step_encrypt_resources.h
@@ -10,7 +10,7 @@
 #include <common/step/step.h>
 #include <manifest_parser/utils/logging.h>
 
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 namespace wgt {
 namespace encryption {

diff --git a/src/wgt/step/filesystem/step_copy_preview_icons.cc b/src/wgt/step/filesystem/step_copy_preview_icons.cc
index 2cdf5cc..b706345 100644 (file)
--- a/src/wgt/step/filesystem/step_copy_preview_icons.cc
+++ b/src/wgt/step/filesystem/step_copy_preview_icons.cc
@@ -10,7 +10,7 @@
 
 #include <string>
 
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 namespace bf = boost::filesystem;
 namespace ci = common_installer;

diff --git a/src/wgt/step/pkgmgr/step_generate_xml.cc b/src/wgt/step/pkgmgr/step_generate_xml.cc
index f6537f9..7294e17 100644 (file)
--- a/src/wgt/step/pkgmgr/step_generate_xml.cc
+++ b/src/wgt/step/pkgmgr/step_generate_xml.cc
@@ -23,7 +23,7 @@
 #include <cstring>
 #include <string>
 
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 namespace bs = boost::system;
 namespace bf = boost::filesystem;

diff --git a/src/wgt/step/security/step_check_extension_privileges.cc b/src/wgt/step/security/step_check_extension_privileges.cc
index b5330bd..affeb47 100755 (executable)
--- a/src/wgt/step/security/step_check_extension_privileges.cc
+++ b/src/wgt/step/security/step_check_extension_privileges.cc
@@ -22,7 +22,7 @@
 #include <string>
 #include <memory>
 
-#include "wgt/extension_config_parser.h"
+#include "wgt/utils/extension_config_parser.h"
 
 namespace {
 

diff --git a/src/wgt/step/security/step_check_settings_level.cc b/src/wgt/step/security/step_check_settings_level.cc
index b26f7ed..2ea5a85 100644 (file)
--- a/src/wgt/step/security/step_check_settings_level.cc
+++ b/src/wgt/step/security/step_check_settings_level.cc
@@ -12,7 +12,7 @@
 
 #include <map>
 
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 namespace wgt {
 namespace security {

diff --git a/src/wgt/step/security/step_check_wgt_background_category.cc b/src/wgt/step/security/step_check_wgt_background_category.cc
index b3d6a2c..a245545 100644 (file)
--- a/src/wgt/step/security/step_check_wgt_background_category.cc
+++ b/src/wgt/step/security/step_check_wgt_background_category.cc
@@ -7,7 +7,7 @@
 #include <common/installer_context.h>
 #include <wgt_manifest_handlers/setting_handler.h>
 
-#include "wgt/wgt_backend_data.h"
+#include "wgt/utils/wgt_backend_data.h"
 
 namespace {
 

diff --git a/src/wgt/extension_config_parser.cc b/src/wgt/utils/extension_config_parser.cc
old mode 100755 (executable)
new mode 100644 (file)
similarity index 99%
rename from src/wgt/extension_config_parser.cc
rename to src/wgt/utils/extension_config_parser.cc
index 2409389..7a448a4
--- a/src/wgt/extension_config_parser.cc
+++ b/src/wgt/utils/extension_config_parser.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "wgt/extension_config_parser.h"
+#include "wgt/utils/extension_config_parser.h"
 #include <manifest_parser/utils/string_util.h>
 #include <manifest_parser/manifest_handler.h>
 

diff --git a/src/wgt/extension_config_parser.h b/src/wgt/utils/extension_config_parser.h
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from src/wgt/extension_config_parser.h
rename to src/wgt/utils/extension_config_parser.h

diff --git a/src/wgt/shared_dirs.h b/src/wgt/utils/shared_dirs.h
similarity index 100%
rename from src/wgt/shared_dirs.h
rename to src/wgt/utils/shared_dirs.h

diff --git a/src/wgt/wgt_app_query_interface.cc b/src/wgt/utils/wgt_app_query_interface.cc
similarity index 98%
rename from src/wgt/wgt_app_query_interface.cc
rename to src/wgt/utils/wgt_app_query_interface.cc
index 736982c..3c9131e 100644 (file)
--- a/src/wgt/wgt_app_query_interface.cc
+++ b/src/wgt/utils/wgt_app_query_interface.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an apache 2.0 license that can be
 // found in the LICENSE file.
 
-#include "wgt/wgt_app_query_interface.h"
+#include "wgt/utils/wgt_app_query_interface.h"
 
 #include <unistd.h>
 #include <sys/types.h>

diff --git a/src/wgt/wgt_app_query_interface.h b/src/wgt/utils/wgt_app_query_interface.h
similarity index 100%
rename from src/wgt/wgt_app_query_interface.h
rename to src/wgt/utils/wgt_app_query_interface.h

diff --git a/src/wgt/wgt_backend_data.h b/src/wgt/utils/wgt_backend_data.h
similarity index 100%
rename from src/wgt/wgt_backend_data.h
rename to src/wgt/utils/wgt_backend_data.h

diff --git a/src/wgt/wgt_installer.cc b/src/wgt/wgt_installer.cc
index f74e37a..76d0a00 100644 (file)
--- a/src/wgt/wgt_installer.cc
+++ b/src/wgt/wgt_installer.cc
@@ -14,7 +14,7 @@
 
 #include <wgt_manifest_handlers/widget_config_parser.h>
 
-#include "wgt/shared_dirs.h"
+#include "wgt/utils/shared_dirs.h"
 #include "wgt/step/configuration/step_check_rds_manifest.h"
 #include "wgt/step/configuration/step_check_start_files.h"
 #include "wgt/step/configuration/step_parse.h"

diff --git a/src/wgt_backend/wgt_backend.cc b/src/wgt_backend/wgt_backend.cc
index f0633b4..9f003e3 100644 (file)
--- a/src/wgt_backend/wgt_backend.cc
+++ b/src/wgt_backend/wgt_backend.cc
@@ -7,7 +7,7 @@
 #include <cerrno>
 
 #include "hybrid/hybrid_installer.h"
-#include "wgt/wgt_app_query_interface.h"
+#include "wgt/utils/wgt_app_query_interface.h"
 #include "wgt/wgt_installer.h"
 
 namespace ci = common_installer;