fix bug related with custom mode

diff --git a/Definitions.cmake b/Definitions.cmake
index 2c936ff061cd04f7f1a3604e396681508fd44467..1ff419fd071ee7cdb99588fc12e793117bc67251 100644 (file)
--- a/Definitions.cmake
+++ b/Definitions.cmake
@@ -18,7 +18,7 @@ ADD_DEFINITIONS("-DMODES_MODE_DEFAULT_DIR=\"${MODES_MODE_DEFAULT_DIR}\"")
 
 IF(NOT DEFINED MODES_CUSTOM_MODE_DEFAULT_DIR)
        MESSAGE("No MODES_CUSTOM_MODE_DEFAULT_DIR. Check build system")
-       SET(MODES_CUSTOM_MODE_DEFAULT_DIR "/usr/share/modes/custom-mode")
+       SET(MODES_CUSTOM_MODE_DEFAULT_DIR "/var/lib/modes/custom-mode")
 ENDIF(NOT DEFINED MODES_CUSTOM_MODE_DEFAULT_DIR)
 ADD_DEFINITIONS("-DMODES_CUSTOM_MODE_DEFAULT_DIR=\"${MODES_CUSTOM_MODE_DEFAULT_DIR}\"")
 

diff --git a/common/definitions.h b/common/definitions.h
index 78083bbbfddf86d62d75683f7b4f9841fbc6724a..448b720c7a136bc00d36607b52c02ca14952ad39 100644 (file)
--- a/common/definitions.h
+++ b/common/definitions.h
@@ -35,7 +35,7 @@
 #endif
 
 #ifndef MODES_CUSTOM_MODE_DEFAULT_DIR
-#define MODES_CUSTOM_MODE_DEFAULT_DIR "/usr/share/modes/custom-mode"
+#define MODES_CUSTOM_MODE_DEFAULT_DIR "/var/lib/modes/custom-mode"
 #warning "MODES_CUSTOM_MODE_DEFAULT_DIR is redefined"
 #endif
 

diff --git a/common/log.h b/common/log.h
index 884fa0a7a34375e3416ed8314b53de8ee397f51f..472c26e1ab611814b2bec26069ee4332bc8f14a8 100644 (file)
--- a/common/log.h
+++ b/common/log.h
@@ -84,10 +84,6 @@
 #define MDS_DEBUGGING
 
 #ifdef MDS_DEBUGGING
-#define API_CALL _DBG(">>>>>>>> API called")
-#define API_END _DBG(">>>>>>>> API ended")
-#define FN_CALL _DBG(">>>>>>>> called")
-#define FN_END _DBG("<<<<<<<< ended")
 #define DBG(fmt, arg...) _DBG(fmt, ##arg)
 #define WARN(fmt, arg...) _WARN(fmt, ##arg)
 #define ERR(fmt, arg...) _ERR(fmt, ##arg)

diff --git a/packaging/modes.spec b/packaging/modes.spec
index 7652f894b42161dca9fff130131d0218533e9ec9..ea8d0e5dd16a179dc9431125a2bd152a9815bca6 100644 (file)
--- a/packaging/modes.spec
+++ b/packaging/modes.spec
@@ -58,9 +58,9 @@ The %{name}-unittests pacakge contains programs for checking quality the %{name}
 
 %define _dbus_interface org.tizen.%{name}.dbus
 %define modes_plugin_dir %{_libdir}/modes-plugins
-%define modes_data_dir %{_datadir}/%{name}
+%define modes_ro_dir %{_datadir}/%{name}
 %define modes_test_dir %{_bindir}/%{name}
-%define modes_info_dir /var/lib/%{name}
+%define modes_rw_dir /var/lib/%{name}
 
 %prep
 %setup -q
@@ -82,11 +82,11 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
        -DTEST_INSTALL_DIR:PATH=%{modes_test_dir} \
        -DSYSTEMD_DIR:PATH=%{_unitdir} \
        -DSYSCONF_DIR:PATH=%{_sysconfdir} \
-       -DMODES_MODE_DEFAULT_DIR:PATH=%{modes_data_dir}/mode \
-       -DMODES_UNDO_INFO_DEFAULT_DIR:PATH=%{modes_info_dir}/undo-info \
-       -DMODES_CUSTOM_MODE_DEFAULT_DIR:PATH=%{modes_data_dir}/custom-mode \
-       -DMODES_ACTIONRULE_DEFAULT_DIR:PATH=%{modes_data_dir}/rule \
-       -DMODES_XSD_DEFAULT_DIR:PATH=%{modes_data_dir}/schema \
+       -DMODES_MODE_DEFAULT_DIR:PATH=%{modes_ro_dir}/mode \
+       -DMODES_UNDO_INFO_DEFAULT_DIR:PATH=%{modes_rw_dir}/undo-info \
+       -DMODES_CUSTOM_MODE_DEFAULT_DIR:PATH=%{modes_rw_dir}/custom-mode \
+       -DMODES_ACTIONRULE_DEFAULT_DIR:PATH=%{modes_ro_dir}/rule \
+       -DMODES_XSD_DEFAULT_DIR:PATH=%{modes_ro_dir}/schema \
        -DMODES_PLUGIN_DEFAULT_DIR:PATH=%{modes_plugin_dir} \
        -DDBUS_INTERFACE=%{_dbus_interface} \
        -DBUILD_GCOV=%{?gcov:1}%{!?gcov:0} \
@@ -95,13 +95,13 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-install -d -m 755 %{buildroot}%{modes_data_dir}/mode
-install -d -m 755 %{buildroot}%{modes_data_dir}/rule
-install -d -m 755 %{buildroot}%{modes_data_dir}/custom-mode
-install -d -m 755 %{buildroot}%{modes_info_dir}/undo-info
-install -m 0644 example/mode/*ex*_mode.xml %{buildroot}%{modes_data_dir}/mode/
-install -m 0644 example/mode/*apply*_mode.xml %{buildroot}%{modes_data_dir}/mode/
-install -m 0644 example/rule/*ex*_rule.xml %{buildroot}%{modes_data_dir}/rule/
+install -d -m 755 %{buildroot}%{modes_ro_dir}/mode
+install -d -m 755 %{buildroot}%{modes_ro_dir}/rule
+install -d -m 755 %{buildroot}%{modes_rw_dir}/custom-mode
+install -d -m 755 %{buildroot}%{modes_rw_dir}/undo-info
+install -m 0644 example/mode/*ex*_mode.xml %{buildroot}%{modes_ro_dir}/mode/
+install -m 0644 example/mode/*apply*_mode.xml %{buildroot}%{modes_ro_dir}/mode/
+install -m 0644 example/rule/*ex*_rule.xml %{buildroot}%{modes_ro_dir}/rule/
 install -m 0644 example/mode/*conflict*_mode.xml %{buildroot}%{modes_test_dir}/
 install -m 0644 example/mode/*invalid*_mode.xml %{buildroot}%{modes_test_dir}/
 install -m 0644 example/rule/*fail*_rule.xml %{buildroot}%{modes_test_dir}/
@@ -124,7 +124,7 @@ systemctl try-restart %{name}.service
 %posttrans unittests
 systemctl try-restart %{name}.path
 systemctl try-restart %{name}.service
-%{modes_test_dir}/modes-gtest-run.sh %{modes_data_dir} %{modes_test_dir}
+%{modes_test_dir}/modes-gtest-run.sh %{modes_ro_dir} %{modes_test_dir}
 
 %preun unittests
 rm -rf %{modes_test_dir}/*ex*.xml %{modes_test_dir}/*.xsd %{modes_test_dir}/extra
@@ -143,11 +143,11 @@ systemctl try-restart %{name}.service
 %{_unitdir}/multi-user.target.wants/%{name}.path
 %{_sysconfdir}/dbus-1/system.d/%{_dbus_interface}.conf
 %{_datadir}/dbus-1/system-services/%{_dbus_interface}.service
-%{modes_data_dir}/schema/*
-%dir %{modes_data_dir}/mode
-%dir %{modes_data_dir}/rule
-%dir %attr(0755,system_fw,system_fw) %{modes_info_dir}/undo-info
-%dir %attr(0755,system_fw,system_fw) %{modes_data_dir}/custom-mode
+%{modes_ro_dir}/schema/*
+%dir %{modes_ro_dir}/mode
+%dir %{modes_ro_dir}/rule
+%dir %attr(0755,system_fw,system_fw) %{modes_rw_dir}/undo-info
+%dir %attr(0755,system_fw,system_fw) %{modes_rw_dir}/custom-mode
 %license LICENSE.APLv2
 
 %files lib
@@ -170,7 +170,7 @@ systemctl try-restart %{name}.service
 %{modes_plugin_dir}/*test.so
 %{modes_test_dir}/modes-gtest-*
 %{modes_test_dir}/modes-mode-test
-%{modes_data_dir}/mode/*
-%{modes_data_dir}/rule/*
+%{modes_ro_dir}/mode/*
+%{modes_ro_dir}/rule/*
 %{modes_test_dir}/*.xml
 %license LICENSE.APLv2

diff --git a/supervisor/modes.service.in b/supervisor/modes.service.in
index 24e3857eec6c98d2aef095c2fcd9738a1162dfc4..7eb3f3255e2444111f91208be611499ab920e7d1 100644 (file)
--- a/supervisor/modes.service.in
+++ b/supervisor/modes.service.in
@@ -7,5 +7,5 @@ BusName=@DBUS_INTERFACE@
 User=system_fw
 Group=system_fw
 SmackProcessLabel=System
-ExecStart=@BIN_INSTALL_DIR@/@DAEMON@ @MODES_MODE_DEFAULT_DIR@
+ExecStart=@BIN_INSTALL_DIR@/@DAEMON@ @MODES_MODE_DEFAULT_DIR@ @MODES_CUSTOM_MODE_DEFAULT_DIR@