revise build scripts and packaging file

Change-Id: I482464b0a92b0ac33f271d2693a5016e400b3299

diff --git a/Definitions.cmake b/Definitions.cmake
index 89e9a72daf40e981b73c2fe46078f090372003ff..604bfd32fe0dec16c9ccac94d350b369d5fe45c5 100644 (file)
--- a/Definitions.cmake
+++ b/Definitions.cmake
@@ -6,7 +6,7 @@ ADD_DEFINITIONS("-DMODES_DBUS_INTERFACE=\"${DBUS_INTERFACE}\"")
 
 IF(NOT DEFINED MODES_PLUGIN_DEFAULT_DIR)
        MESSAGE("No MODES_PLUGIN_DEFAULT_DIR. Check build system")
-       SET(MODES_PLUGIN_DEFAULT_DIR "/usr/lib/modes-plugins/")
+       SET(MODES_PLUGIN_DEFAULT_DIR "${LIB_INSTALL_DIR}/modes-plugins")
 ENDIF(NOT DEFINED MODES_PLUGIN_DEFAULT_DIR)
 ADD_DEFINITIONS("-DMODES_PLUGIN_DEFAULT_DIR=\"${MODES_PLUGIN_DEFAULT_DIR}\"")
 

diff --git a/client/modes.pc.in b/client/modes.pc.in
index edaa360b69000bb153047a4089f36f6fe733b9ab..d589308fbca0b24a40b78c7e199a9fb99e927d17 100644 (file)
--- a/client/modes.pc.in
+++ b/client/modes.pc.in
@@ -3,7 +3,7 @@ exec_prefix=${prefix}/bin
 libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@/@CLIENT@
 
-Name: @LIB@
+Name: @CLIENT@
 Description: Mode Supervisor Client
 Version: @FULLVER@
 Requires: capi-base-common

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 9b3987d045e1cd90864416a06306054192b3dd39..31a2f0f543add959afcadeaa5dc4a7c4da2b8f95 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -4,11 +4,11 @@ STRING(REPLACE ".dbus" "." INTERFACE_PREFIX ${DBUS_INTERFACE})
 FIND_PROGRAM(GDBUS_CODEGEN NAMES gdbus-codegen)
 
 ADD_CUSTOM_COMMAND(
-       OUTPUT dbus
+       OUTPUT dbus.c
        COMMAND ${GDBUS_CODEGEN} --generate-c-code ${MDS_DBUS}
                        --interface-prefix ${INTERFACE_PREFIX}
                        --c-namespace mds
                        ${MDS_DBUS}.xml
        DEPENDS ${MDS_DBUS}.xml)
 
-ADD_CUSTOM_TARGET(GENERATED_DBUS_CODE DEPENDS dbus)
+ADD_CUSTOM_TARGET(GENERATED_DBUS_CODE DEPENDS dbus.c)

diff --git a/common/definitions.h b/common/definitions.h
index e29d9b8c724d0c3cc83f4e8efe260e2df24459f8..6c938418b4b58f20f5b42b9a2e9c55e6322a89b7 100644 (file)
--- a/common/definitions.h
+++ b/common/definitions.h
@@ -31,7 +31,7 @@
 
 #ifndef MODES_PLUGIN_DEFAULT_DIR
 #define MODES_PLUGIN_DEFAULT_DIR "/usr/lib/modes-plugins"
-#warning "MODES_PLUGIN_DEFAULT_DIR is redefined"
+#warning "MODES_PLUGIN_DEFAULT_DIR is redefined. It could be problem on 64bit architecture"
 #endif
 #define MODES_PLUGIN_LIB_PREFIX "libmodes-plugin"
 

diff --git a/packaging/modes.spec b/packaging/modes.spec
index 244039c303d62814636c5605f4a62d463c4c60b0..b40dec219e7f74ab511efbb0840aa7eea5809eb0 100644 (file)
--- a/packaging/modes.spec
+++ b/packaging/modes.spec
@@ -10,21 +10,21 @@ Source0: %{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
 
 BuildRequires: cmake
-BuildRequires: pkgconfig(glib-2.0)
-BuildRequires: pkgconfig(dlog)
 BuildRequires: pkgconfig(capi-base-common)
-BuildRequires: pkgconfig(libxml-2.0)
-BuildRequires: pkgconfig(vconf)
 BuildRequires: pkgconfig(capi-network-wifi-manager)
-BuildRequires: pkgconfig(gmock)
 BuildRequires: pkgconfig(cynara-client)
 BuildRequires: pkgconfig(cynara-creds-gdbus)
 BuildRequires: pkgconfig(cynara-session)
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gmock)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(vconf)
 #For changing owner/group
 Requires: security-config
 %if 0%{?gcov:1}
-BuildRequires: tar
 BuildRequires: lcov
+BuildRequires: tar
 %endif
 
 %description
@@ -73,11 +73,11 @@ Group: System/Testing
 The %{name}-gcov pacakge contains gcov objects
 %endif
 
-%define _dbus_interface org.tizen.%{name}.dbus
-%define modes_plugin_dir %{_libdir}/modes-plugins
-%define modes_ro_dir %{_datadir}/%{name}
-%define modes_test_dir %{_bindir}/%{name}
-%define modes_rw_dir %{_localstatedir}/lib/%{name}
+%global _dbus_interface org.tizen.%{name}.dbus
+%global modes_plugin_dir %{_libdir}/modes-plugins
+%global modes_ro_dir %{_datadir}/%{name}
+%global modes_test_dir %{_bindir}/%{name}
+%global modes_rw_dir %{_localstatedir}/lib/%{name}
 
 %prep
 %setup -q
@@ -87,7 +87,6 @@ cp %{SOURCE1001} ./%{name}.manifest
 %if 0%{?gcov:1}
 export CFLAGS+=" -fprofile-arcs -ftest-coverage"
 export CXXFLAGS+=" -fprofile-arcs -ftest-coverage"
-export FFLAGS+=" -fprofile-arcs -ftest-coverage"
 export LDFLAGS+=" -lgcov -Wl,--dynamic-list-data"
 %endif
 
@@ -108,10 +107,10 @@ make %{?_smp_mflags}
 
 %install
 %make_install
-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 -d -m 0755 %{buildroot}%{modes_ro_dir}/mode
+install -d -m 0755 %{buildroot}%{modes_ro_dir}/rule
+install -d -m 0755 %{buildroot}%{modes_rw_dir}/custom-mode
+install -d -m 0755 %{buildroot}%{modes_rw_dir}/undo-info
 install -m 0644 example/mode/*Ex*_mode.xml %{buildroot}%{modes_ro_dir}/mode/
 install -m 0644 example/mode/*Err*_mode.xml %{buildroot}%{modes_test_dir}/
 install -m 0644 example/rule/*Err*_rule.xml %{buildroot}%{modes_test_dir}/
@@ -121,7 +120,7 @@ install -m 0755 tests/modes-gtest-run.sh %{buildroot}%{modes_test_dir}/
 
 %if 0%{?gcov:1}
 find .. -name '*.gcno' | tar cf %{name}-gcov.tar -T -
-install -d -m 755 %{buildroot}%{_datadir}/gcov/obj
+install -d -m 0755 %{buildroot}%{_datadir}/gcov/obj
 tar xf %{name}-gcov.tar -C %{buildroot}%{_datadir}/gcov/obj
 %endif
 

diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
index 72a04f2ce968c68a2a00478f250a4b934245a6bd..bef409df2c4195d68f95f7a1b159a4c42a45bfc5 100644 (file)
--- a/plugin/CMakeLists.txt
+++ b/plugin/CMakeLists.txt
@@ -10,6 +10,7 @@ ADD_DEFINITIONS("-DMDS_PLUGIN")
 
 ADD_LIBRARY(${LIB_NAME} SHARED ${TEST_PLUGIN_SRCS})
 TARGET_LINK_LIBRARIES(${LIB_NAME} ${plugin_pkgs_LIBRARIES})
+TARGET_COMPILE_OPTIONS(${LIB_NAME} PUBLIC ${plugin_pkgs_CFLAGS_OTHER})
 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES NO_SONAME 1 )
 INSTALL(TARGETS ${LIB_NAME} DESTINATION ${MODES_PLUGIN_DEFAULT_DIR})
 INSTALL(FILES tizen_test_rule.xml DESTINATION ${MODES_DEFAULT_RO_DIR}/rule)

diff --git a/supervisor/CMakeLists.txt b/supervisor/CMakeLists.txt
index 76c590e0d9455f94771ed3d7b73f2fd9af9d2608..5c1c51ec31e137a5ac7d55e268b7997e5669e4b7 100644 (file)
--- a/supervisor/CMakeLists.txt
+++ b/supervisor/CMakeLists.txt
@@ -15,7 +15,8 @@ ADD_DEFINITIONS("-DMDS_SUPERVISOR")
 ADD_EXECUTABLE(${DAEMON} ${DAEMON_SRCS})
 ADD_DEPENDENCIES(${DAEMON} GENERATED_DBUS_CODE)
 TARGET_LINK_LIBRARIES(${DAEMON} ${daemon_pkgs_LIBRARIES} dl pthread)
-TARGET_COMPILE_OPTIONS(${DAEMON} PUBLIC ${daemon_pkgs_CFLAGS_OTHER} -fPIE)
+TARGET_COMPILE_OPTIONS(${DAEMON} PUBLIC ${daemon_pkgs_CFLAGS_OTHER})
+SET_TARGET_PROPERTIES(${DAEMON} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 CONFIGURE_FILE(${DBUS_INTERFACE}.service.in ${DBUS_INTERFACE}.service @ONLY)
 CONFIGURE_FILE(${DBUS_INTERFACE}.conf.in ${DBUS_INTERFACE}.conf @ONLY)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index eb2523543baf8515e4413bbd300f9527170ddcd4..e2a4be36440f2fa40bffc6dbef023c23d96e15bd 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -39,23 +39,23 @@ INSTALL(TARGETS ${TEST_APPLY_MODE} DESTINATION ${TEST_INSTALL_DIR})
 #=======================================================================================#
 SET(GTEST_MODEMGR "modes-gtest-modemgr")
 FILE(GLOB GTEST_MODEMGR_SRCS
-               ${SUPERVISOR_DIR}/ModesXMLTag.cpp
-               ${SUPERVISOR_DIR}/XMLParser.cpp
-               ${SUPERVISOR_DIR}/XMLGenerator.cpp
-               ${SUPERVISOR_DIR}/ModeManager.cpp
-               ${SUPERVISOR_DIR}/ConflictManager.cpp
-               ${SUPERVISOR_DIR}/ModeCareTaker.cpp
-               ${SUPERVISOR_DIR}/EssentialHandler.cpp
-               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
-               ${SUPERVISOR_DIR}/UndoInfoParser.cpp
                ${SUPERVISOR_DIR}/Action.cpp
                ${SUPERVISOR_DIR}/ActionRule.cpp
-               ${SUPERVISOR_DIR}/RuleManager.cpp
-               ${SUPERVISOR_DIR}/PluginMapper.cpp
                ${SUPERVISOR_DIR}/ClientPrivilege.cpp
+               ${SUPERVISOR_DIR}/ConflictManager.cpp
+               ${SUPERVISOR_DIR}/EssentialHandler.cpp
                ${SUPERVISOR_DIR}/Mode.cpp
+               ${SUPERVISOR_DIR}/ModeCareTaker.cpp
+               ${SUPERVISOR_DIR}/ModeManager.cpp
                ${SUPERVISOR_DIR}/ModesEx.cpp
+               ${SUPERVISOR_DIR}/ModesXMLTag.cpp
+               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
+               ${SUPERVISOR_DIR}/PluginMapper.cpp
+               ${SUPERVISOR_DIR}/RuleManager.cpp
+               ${SUPERVISOR_DIR}/UndoInfoParser.cpp
                ${SUPERVISOR_DIR}/ValueChecker.cpp
+               ${SUPERVISOR_DIR}/XMLGenerator.cpp
+               ${SUPERVISOR_DIR}/XMLParser.cpp
                modes_test_modemgr.cpp
        )
 ADD_EXECUTABLE(${GTEST_MODEMGR} ${SRC} ${GTEST_MODEMGR_SRCS})
@@ -66,8 +66,8 @@ INSTALL(TARGETS ${GTEST_MODEMGR} DESTINATION ${TEST_INSTALL_DIR})
 #=======================================================================================#
 SET(GTEST_PLUGIN "modes-gtest-plugin")
 FILE(GLOB GTEST_PLUGIN_SRCS
-               ${SUPERVISOR_DIR}/PluginMapper.cpp
                ${SUPERVISOR_DIR}/ModesEx.cpp
+               ${SUPERVISOR_DIR}/PluginMapper.cpp
                modes_test_plugin.cpp
        )
 ADD_EXECUTABLE(${GTEST_PLUGIN} ${SRC} ${GTEST_PLUGIN_SRCS})
@@ -77,17 +77,17 @@ INSTALL(TARGETS ${GTEST_PLUGIN} DESTINATION ${TEST_INSTALL_DIR})
 #=======================================================================================#
 SET(GTEST_PARSER "modes-gtest-parser")
 FILE(GLOB GTEST_PARSER_SRCS
-               ${SUPERVISOR_DIR}/XMLParser.cpp
-               ${SUPERVISOR_DIR}/ClientPrivilege.cpp
                ${SUPERVISOR_DIR}/Action.cpp
                ${SUPERVISOR_DIR}/ActionRule.cpp
-               ${SUPERVISOR_DIR}/RuleManager.cpp
-               ${SUPERVISOR_DIR}/PluginMapper.cpp
-               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
-               ${SUPERVISOR_DIR}/ModesEx.cpp
+               ${SUPERVISOR_DIR}/ClientPrivilege.cpp
                ${SUPERVISOR_DIR}/Mode.cpp
+               ${SUPERVISOR_DIR}/ModesEx.cpp
                ${SUPERVISOR_DIR}/ModesXMLTag.cpp
+               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
+               ${SUPERVISOR_DIR}/PluginMapper.cpp
+               ${SUPERVISOR_DIR}/RuleManager.cpp
                ${SUPERVISOR_DIR}/ValueChecker.cpp
+               ${SUPERVISOR_DIR}/XMLParser.cpp
                modes_test_parser.cpp
        )
 ADD_EXECUTABLE(${GTEST_PARSER} ${SRC} ${GTEST_PARSER_SRCS})
@@ -97,19 +97,19 @@ INSTALL(TARGETS ${GTEST_PARSER} DESTINATION ${TEST_INSTALL_DIR})
 #=======================================================================================#
 SET(GTEST_GENERATOR "modes-gtest-generator")
 FILE(GLOB GTEST_GENERATOR_SRCS
-               ${SUPERVISOR_DIR}/XMLGenerator.cpp
-               ${SUPERVISOR_DIR}/ModesXMLTag.cpp
-               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
-               ${SUPERVISOR_DIR}/XMLParser.cpp
-               ${SUPERVISOR_DIR}/Mode.cpp
+               "modes_test_generator.cpp"
                ${SUPERVISOR_DIR}/Action.cpp
-               ${SUPERVISOR_DIR}/ModesEx.cpp
+               ${SUPERVISOR_DIR}/ActionRule.cpp
                ${SUPERVISOR_DIR}/ClientPrivilege.cpp
-               ${SUPERVISOR_DIR}/RuleManager.cpp
+               ${SUPERVISOR_DIR}/Mode.cpp
+               ${SUPERVISOR_DIR}/ModesEx.cpp
+               ${SUPERVISOR_DIR}/ModesXMLTag.cpp
+               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
                ${SUPERVISOR_DIR}/PluginMapper.cpp
-               ${SUPERVISOR_DIR}/ActionRule.cpp
+               ${SUPERVISOR_DIR}/RuleManager.cpp
                ${SUPERVISOR_DIR}/ValueChecker.cpp
-               "modes_test_generator.cpp"
+               ${SUPERVISOR_DIR}/XMLGenerator.cpp
+               ${SUPERVISOR_DIR}/XMLParser.cpp
        )
 ADD_EXECUTABLE(${GTEST_GENERATOR} ${SRC} ${GTEST_GENERATOR_SRCS})
 ADD_DEPENDENCIES(${GTEST_GENERATOR} GENERATED_DBUS_CODE)
@@ -119,23 +119,23 @@ INSTALL(TARGETS ${GTEST_GENERATOR} DESTINATION ${TEST_INSTALL_DIR})
 #=======================================================================================#
 SET(GTEST_CONFLICT "modes-gtest-conflict")
 FILE(GLOB GTEST_CONFLICT_SRCS
+               ${SUPERVISOR_DIR}/Action.cpp
+               ${SUPERVISOR_DIR}/ActionRule.cpp
+               ${SUPERVISOR_DIR}/ClientPrivilege.cpp
                ${SUPERVISOR_DIR}/ConflictManager.cpp
+               ${SUPERVISOR_DIR}/EssentialHandler.cpp
                ${SUPERVISOR_DIR}/Mode.cpp
                ${SUPERVISOR_DIR}/ModeCareTaker.cpp
-               ${SUPERVISOR_DIR}/EssentialHandler.cpp
                ${SUPERVISOR_DIR}/ModeManager.cpp
-               ${SUPERVISOR_DIR}/UndoInfoParser.cpp
-               ${SUPERVISOR_DIR}/XMLGenerator.cpp
-               ${SUPERVISOR_DIR}/Action.cpp
-               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
-               ${SUPERVISOR_DIR}/XMLParser.cpp
                ${SUPERVISOR_DIR}/ModesEx.cpp
-               ${SUPERVISOR_DIR}/ClientPrivilege.cpp
                ${SUPERVISOR_DIR}/ModesXMLTag.cpp
-               ${SUPERVISOR_DIR}/RuleManager.cpp
+               ${SUPERVISOR_DIR}/ModeXMLParser.cpp
                ${SUPERVISOR_DIR}/PluginMapper.cpp
-               ${SUPERVISOR_DIR}/ActionRule.cpp
+               ${SUPERVISOR_DIR}/RuleManager.cpp
+               ${SUPERVISOR_DIR}/UndoInfoParser.cpp
                ${SUPERVISOR_DIR}/ValueChecker.cpp
+               ${SUPERVISOR_DIR}/XMLGenerator.cpp
+               ${SUPERVISOR_DIR}/XMLParser.cpp
                modes_test_conflict.cpp
        )
 ADD_EXECUTABLE(${GTEST_CONFLICT} ${SRC} ${GTEST_CONFLICT_SRCS})
@@ -145,15 +145,15 @@ INSTALL(TARGETS ${GTEST_CONFLICT} DESTINATION ${TEST_INSTALL_DIR})
 #=======================================================================================#
 SET(GTEST_RULEMGR "modes-gtest-rulemgr")
 FILE(GLOB GTEST_RULE_SRCS
-               ${SUPERVISOR_DIR}/RuleManager.cpp
-               ${SUPERVISOR_DIR}/PluginMapper.cpp
-               ${SUPERVISOR_DIR}/XMLParser.cpp
+               ${SUPERVISOR_DIR}/Action.cpp
                ${SUPERVISOR_DIR}/ActionRule.cpp
-               ${SUPERVISOR_DIR}/ModesEx.cpp
-               ${SUPERVISOR_DIR}/Mode.cpp
                ${SUPERVISOR_DIR}/ClientPrivilege.cpp
-               ${SUPERVISOR_DIR}/Action.cpp
+               ${SUPERVISOR_DIR}/Mode.cpp
+               ${SUPERVISOR_DIR}/ModesEx.cpp
+               ${SUPERVISOR_DIR}/PluginMapper.cpp
+               ${SUPERVISOR_DIR}/RuleManager.cpp
                ${SUPERVISOR_DIR}/ValueChecker.cpp
+               ${SUPERVISOR_DIR}/XMLParser.cpp
                modes_test_rulemgr.cpp
        )
 ADD_EXECUTABLE(${GTEST_RULEMGR} ${SRC} ${GTEST_RULE_SRCS})
@@ -163,13 +163,12 @@ INSTALL(TARGETS ${GTEST_RULEMGR} DESTINATION ${TEST_INSTALL_DIR})
 #=======================================================================================#
 SET(GTEST_POLICY "modes-gtest-policy")
 FILE(GLOB GTEST_POLICY_SRCS
-               ${SUPERVISOR_DIR}/ModesEx.cpp
+               ${CMAKE_SOURCE_DIR}/plugin/*.cpp
                ${SUPERVISOR_DIR}/Action.cpp
+               ${SUPERVISOR_DIR}/ModesEx.cpp
                ${SUPERVISOR_DIR}/ValueChecker.cpp
-               ${CMAKE_SOURCE_DIR}/plugin/*.cpp
                modes_test_policy.cpp
        )
 ADD_EXECUTABLE(${GTEST_POLICY} ${SRC} ${GTEST_POLICY_SRCS})
-ADD_DEPENDENCIES(${GTEST_POLICY} GENERATED_DBUS_CODE)
 TARGET_LINK_LIBRARIES(${GTEST_POLICY} ${gtest_pkgs_LIBRARIES})
 INSTALL(TARGETS ${GTEST_POLICY} DESTINATION ${TEST_INSTALL_DIR})