From: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
Date: Mon, 22 Oct 2018 05:21:17 +0000 (+0900)
Subject: Fix the file names
X-Git-Tag: 6.99.1~2
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=9b4dec590ffb9ac99c7ce847b32e9663334d6f57;p=apps%2Fagl-service-windowmanager.git

Fix the file names

Fix the file names.

Change-Id: I6adaf5fb024347222b235830bf5ff04208adc0ed
Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
---

diff --git a/src/db/areas.db b/conf/areas.json
similarity index 100%
rename from src/db/areas.db
rename to conf/areas.json
diff --git a/layers.json b/conf/layers.json
similarity index 100%
rename from layers.json
rename to conf/layers.json
diff --git a/src/db/old_roles.db b/conf/old_roles.json
similarity index 100%
rename from src/db/old_roles.db
rename to conf/old_roles.json
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d8f1143..21f287a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,9 +111,9 @@ add_custom_command(TARGET ${TARGETS_WM} POST_BUILD
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND cp -rf ${PROJECT_BINARY_DIR}/src/${TARGETS_WM}.so ${PROJECT_BINARY_DIR}/package/root/lib
    COMMAND mkdir -p ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/old_roles.db ${PROJECT_BINARY_DIR}/package/root/etc
-   COMMAND cp -f ${PROJECT_SOURCE_DIR}/src/db/areas.db ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/layers.json ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/old_roles.json ${PROJECT_BINARY_DIR}/package/root/etc
+   COMMAND cp -f ${CMAKE_SOURCE_DIR}/conf/areas.json ${PROJECT_BINARY_DIR}/package/root/etc
 )
 
 add_custom_target(package DEPENDS ${PROJECT_BINARY_DIR}/package/root
diff --git a/src/window_manager.cpp b/src/window_manager.cpp
index edd3c12..7ab5213 100644
--- a/src/window_manager.cpp
+++ b/src/window_manager.cpp
@@ -1007,7 +1007,7 @@ int WindowManager::loadOldRoleDb()
     }
     else
     {
-        file_name = string(afm_app_install_dir) + string("/etc/old_roles.db");
+        file_name = string(afm_app_install_dir) + string("/etc/old_roles.json");
     }
 
     // Load old_role.db
diff --git a/src/wm_layer_control.cpp b/src/wm_layer_control.cpp
index c76a070..011402d 100644
--- a/src/wm_layer_control.cpp
+++ b/src/wm_layer_control.cpp
@@ -21,7 +21,7 @@
 #include "request.hpp"
 #include "json_helper.hpp"
 
-#define LC_AREA_PATH "/etc/areas.db"
+#define LC_AREA_PATH "/etc/areas.json"
 #define LC_LAYER_SETTING_PATH "/etc/layers.json"
 #define LC_DEFAULT_AREA "fullscreen"
 #define BACK_GROUND_LAYER "BackGroundLayer"