summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-10-22 14:21:17 +0900
committerKazumasa Mitsunari <knimitz@witz-inc.co.jp>2018-11-15 14:51:18 +0900
commit9b4dec590ffb9ac99c7ce847b32e9663334d6f57 (patch)
tree99f75e3d6537a72eaf7fc8166196856b9e48de71
parent010ca3f3459a52e44deb5e70e94e9cd394814e3e (diff)
Fix the file names
Fix the file names. Change-Id: I6adaf5fb024347222b235830bf5ff04208adc0ed Signed-off-by: Kazumasa Mitsunari <knimitz@witz-inc.co.jp>
-rw-r--r--conf/areas.json (renamed from src/db/areas.db)0
-rw-r--r--conf/layers.json (renamed from layers.json)0
-rw-r--r--conf/old_roles.json (renamed from src/db/old_roles.db)0
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/window_manager.cpp2
-rw-r--r--src/wm_layer_control.cpp2
6 files changed, 5 insertions, 5 deletions
diff --git a/src/db/areas.db b/conf/areas.json
index 03ddfe4..03ddfe4 100644
--- a/src/db/areas.db
+++ b/conf/areas.json
diff --git a/layers.json b/conf/layers.json
index 539846a..539846a 100644
--- a/layers.json
+++ b/conf/layers.json
diff --git a/src/db/old_roles.db b/conf/old_roles.json
index d8f19f9..d8f19f9 100644
--- a/src/db/old_roles.db
+++ b/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"