From e9c9da1a12ebc180b910e0c3e64718c02144b717 Mon Sep 17 00:00:00 2001 From: Hwankyu Jhun Date: Thu, 1 Feb 2024 09:33:54 +0900 Subject: [PATCH] Adjust directory hierarchy The following directories are moved to the src directory. - aul - server - parser - tool The include directory is moved to the src/aul directory. The source codes will have the following directory structure: aul-1/src |---aul |---parser |---server +---tool Change-Id: I0f29482336759eea00cbbdef0b8d15bc11eccbc4 Signed-off-by: Hwankyu Jhun --- CMakeLists.txt | 113 +++------- packaging/aul.spec | 4 +- src/CMakeLists.txt | 4 + src/aul/CMakeLists.txt | 80 +++++++ {aul => src/aul}/api/aul_app_context.cc | 0 {aul => src/aul}/api/aul_app_context.h | 0 {aul => src/aul}/api/aul_app_event.cc | 0 {aul => src/aul}/api/aul_app_event.h | 0 {aul => src/aul}/api/aul_app_lifecycle.cc | 0 {aul => src/aul}/api/aul_app_lifecycle.h | 0 {aul => src/aul}/api/aul_app_manager.cc | 0 {aul => src/aul}/api/aul_app_manager.h | 0 {aul => src/aul}/api/aul_component_port.cc | 0 {aul => src/aul}/api/aul_component_port.h | 0 src/{ => aul}/app_com.cc | 14 +- {aul => src/aul}/app_control/resolve_info.cc | 7 +- {aul => src/aul}/app_control/resolve_info.hh | 0 src/{ => aul}/app_group.cc | 17 +- {aul => src/aul}/app_group/app_group_info.cc | 0 {aul => src/aul}/app_group/app_group_info.hh | 0 {aul => src/aul}/app_info/app_info.cc | 0 {aul => src/aul}/app_info/app_info.hh | 0 {aul => src/aul}/app_info/directory_info.cc | 0 {aul => src/aul}/app_info/directory_info.hh | 0 .../aul}/app_info/external_directory_info.cc | 0 .../aul}/app_info/external_directory_info.hh | 0 {aul => src/aul}/app_manager/app_context.cc | 0 {aul => src/aul}/app_manager/app_context.hh | 0 {aul => src/aul}/app_manager/app_event.cc | 0 {aul => src/aul}/app_manager/app_event.hh | 0 {aul => src/aul}/app_manager/app_manager.cc | 0 {aul => src/aul}/app_manager/app_manager.hh | 0 src/{ => aul}/app_request.cc | 12 +- src/{ => aul}/app_request.h | 12 +- src/{ => aul}/app_signal.cc | 7 +- src/{ => aul}/app_signal.h | 0 aul.conf => src/aul/aul.conf | 0 aul.pc.in => src/aul/aul.pc.in | 0 src/{ => aul}/aul_api.h | 0 src/aul/aul_cmd.cc | 232 ++++++++++++++++++++ src/{ => aul}/aul_comp_context.cc | 13 +- src/{ => aul}/aul_comp_info.cc | 15 +- src/{ => aul}/aul_comp_status.cc | 0 src/{ => aul}/aul_complication.cc | 0 src/{ => aul}/aul_debug_info.c | 0 src/aul/aul_error.cc | 66 ++++++ src/{ => aul}/aul_job_scheduler.cc | 12 +- src/{ => aul}/aul_launch.c | 0 src/{ => aul}/aul_launcher_service.cc | 19 +- src/{ => aul}/aul_path.cc | 6 +- src/{ => aul}/aul_proc.cc | 17 +- src/{ => aul}/aul_proc_group.cc | 13 +- src/{ => aul}/aul_rpc_port.cc | 19 +- src/{ => aul}/aul_rsc_mgr.c | 0 src/{ => aul}/aul_rsc_mgr_internal.c | 0 src/{ => aul}/aul_rsc_mgr_internal.h | 0 src/{ => aul}/aul_rsc_mgr_schema.h | 0 src/{ => aul}/aul_running_context.c | 0 src/{ => aul}/aul_screen_connector.c | 0 src/{ => aul}/aul_sock.cc | 14 +- src/{ => aul}/aul_svc.cc | 20 +- src/{ => aul}/aul_svc_priv_key.h | 0 src/{ => aul}/aul_util.c | 0 src/{ => aul}/aul_util.h | 0 src/{ => aul}/aul_watch_control.cc | 12 +- src/{ => aul}/aul_watch_control_internal.h | 0 src/{ => aul}/aul_watchdog.cc | 12 +- src/{ => aul}/aul_window.cc | 20 +- src/{ => aul}/aul_worker.c | 0 src/{ => aul}/aul_worker.h | 0 {aul => src/aul}/common/api.hh | 0 {aul => src/aul}/common/common.hh | 0 {aul => src/aul}/common/exception.hh | 0 {aul => src/aul}/common/file_descriptor.hh | 0 {aul => src/aul}/common/log_private.hh | 0 {aul => src/aul}/common/util.hh | 0 {aul => src/aul}/component/component_info.cc | 0 {aul => src/aul}/component/component_info.hh | 0 {aul => src/aul}/component/component_port.cc | 0 {aul => src/aul}/component/component_port.hh | 0 .../aul}/component/component_running_context.cc | 0 .../aul}/component/component_running_context.hh | 0 {aul => src/aul}/component/localized_info.cc | 0 {aul => src/aul}/component/localized_info.hh | 0 src/{ => aul}/cpu_inheritance.cc | 6 +- src/{ => aul}/cpu_inheritance.hh | 0 {include => src/aul/include}/aul.h | 0 {include => src/aul/include}/aul_app_com.h | 0 {include => src/aul/include}/aul_app_group.h | 0 {include => src/aul/include}/aul_cmd.h | 0 {include => src/aul/include}/aul_comp_context.h | 0 {include => src/aul/include}/aul_comp_info.h | 0 {include => src/aul/include}/aul_comp_status.h | 0 {include => src/aul/include}/aul_comp_types.h | 0 {include => src/aul/include}/aul_complication.h | 0 {include => src/aul/include}/aul_debug_info.h | 0 {include => src/aul/include}/aul_error.h | 0 {include => src/aul/include}/aul_job_scheduler.h | 0 {include => src/aul/include}/aul_key.h | 0 .../aul/include}/aul_launcher_service.h | 0 {include => src/aul/include}/aul_proc.h | 0 {include => src/aul/include}/aul_proc_group.h | 0 {include => src/aul/include}/aul_rpc_port.h | 0 {include => src/aul/include}/aul_rsc_mgr.h | 0 {include => src/aul/include}/aul_running_context.h | 0 .../aul/include}/aul_screen_connector.h | 0 {include => src/aul/include}/aul_sock.h | 0 {include => src/aul/include}/aul_svc.h | 0 {include => src/aul/include}/aul_svc_internal.h | 0 {include => src/aul/include}/aul_watch_control.h | 0 {include => src/aul/include}/aul_watchdog.h | 0 {include => src/aul/include}/aul_widget.h | 0 {include => src/aul/include}/aul_window.h | 1 + src/{ => aul}/launch.cc | 19 +- src/{ => aul}/launch.h | 1 + src/{ => aul}/launch_with_result.cc | 22 +- src/{ => aul}/menu_db_util.h | 0 src/{ => aul}/mime.c | 0 src/{ => aul}/miregex.c | 0 src/{ => aul}/miregex.h | 0 src/{ => aul}/pkginfo.cc | 18 +- src/{ => aul}/pkginfo_internal.h | 0 {aul => src/aul}/socket/client.cc | 0 {aul => src/aul}/socket/client.hh | 0 {aul => src/aul}/socket/client_socket.cc | 0 {aul => src/aul}/socket/client_socket.hh | 0 {aul => src/aul}/socket/packet.cc | 0 {aul => src/aul}/socket/packet.hh | 0 {aul => src/aul}/socket/server_socket.cc | 0 {aul => src/aul}/socket/server_socket.hh | 0 {aul => src/aul}/socket/socket.cc | 0 {aul => src/aul}/socket/socket.hh | 0 src/{ => aul}/status.cc | 23 +- src/{ => aul}/widget.c | 0 src/aul_cmd.c | 235 --------------------- src/aul_error.c | 67 ------ {parser => src/parser}/CMakeLists.txt | 0 .../parser}/boot-sequencer/CMakeLists.txt | 0 {parser => src/parser}/boot-sequencer/app_info.cc | 0 {parser => src/parser}/boot-sequencer/app_info.hh | 0 {parser => src/parser}/boot-sequencer/appsvc_db.cc | 0 {parser => src/parser}/boot-sequencer/appsvc_db.hh | 0 .../parser}/boot-sequencer/cert_checker.cc | 0 .../parser}/boot-sequencer/cert_checker.hh | 0 .../boot-sequencer/data/boot-sequencer.info | 0 {parser => src/parser}/boot-sequencer/database.cc | 0 {parser => src/parser}/boot-sequencer/database.hh | 0 .../parser}/boot-sequencer/event_type.hh | 0 {parser => src/parser}/boot-sequencer/exception.cc | 0 {parser => src/parser}/boot-sequencer/exception.hh | 0 .../parser}/boot-sequencer/log_private.hh | 0 .../parser}/boot-sequencer/package_event_args.cc | 0 .../parser}/boot-sequencer/package_event_args.hh | 0 .../parser}/boot-sequencer/parser_plugin.cc | 0 .../parser}/boot-sequencer/parser_plugin.hh | 0 .../parser}/boot-sequencer/pkgmgr_interface.cc | 0 {parser => src/parser}/component/CMakeLists.txt | 0 .../parser}/component/data/component.info | 0 .../parser}/component/data/component_db.sql.in | 0 .../component/inc/component_plugin_parser.h | 0 .../component/inc/component_plugin_parser_db.h | 0 .../inc/component_plugin_parser_handler.h | 0 .../inc/component_plugin_parser_private.h | 0 .../component/inc/component_plugin_parser_type.h | 0 .../component/script/14_component-add.post.in | 0 .../component/script/501.component_upgrade.sh.in | 0 .../script/upgrade/1_component_db_upgrade.sh.in | 0 .../component/src/component_plugin_parser.c | 0 .../component/src/component_plugin_parser_db.c | 0 .../src/component_plugin_parser_handler.c | 0 .../src/component_plugin_parser_pkgmgr_interface.c | 0 {parser => src/parser}/exec-checker/CMakeLists.txt | 0 .../parser}/exec-checker/data/exec-checker.info | 0 .../parser}/exec-checker/inc/exec_checker.hh | 0 .../exec-checker/inc/exec_checker_private.hh | 0 .../parser}/exec-checker/inc/plugin_manager.hh | 0 .../parser}/exec-checker/src/exec_checker.cc | 0 .../src/exec_checker_plugin_interface.cc | 0 .../parser}/exec-checker/src/plugin_manager.cc | 0 {parser => src/parser}/metadata/CMakeLists.txt | 0 .../parser}/metadata/alias-appid/CMakeLists.txt | 0 .../parser}/metadata/alias-appid/alias_info.hh | 0 .../parser}/metadata/alias-appid/appsvc_db.cc | 0 .../parser}/metadata/alias-appid/appsvc_db.hh | 0 .../metadata/alias-appid/data/alias-appid.info | 0 .../metadata/alias-appid/pkgmgr_interface.cc | 0 .../parser}/metadata/alias-appid/plugin_manager.cc | 0 .../parser}/metadata/alias-appid/plugin_manager.hh | 0 .../parser}/metadata/allowed-appid/CMakeLists.txt | 0 .../parser}/metadata/allowed-appid/allowed_info.hh | 0 .../parser}/metadata/allowed-appid/appsvc_db.cc | 0 .../parser}/metadata/allowed-appid/appsvc_db.hh | 0 .../metadata/allowed-appid/data/allowed-appid.info | 0 .../metadata/allowed-appid/pkgmgr_interface.cc | 0 .../metadata/allowed-appid/plugin_manager.cc | 0 .../metadata/allowed-appid/plugin_manager.hh | 0 .../parser}/metadata/common/app_event_args.hh | 0 {parser => src/parser}/metadata/common/database.cc | 0 {parser => src/parser}/metadata/common/database.hh | 0 .../parser}/metadata/common/event_type.hh | 0 .../parser}/metadata/common/exception.hh | 0 .../parser}/metadata/common/log_private.hh | 0 {parser => src/parser}/metadata/common/metadata.hh | 0 .../parser}/metadata/common/metadata_plugin.cc | 0 .../parser}/metadata/common/metadata_plugin.hh | 0 .../parser}/metadata/common/metadata_type.hh | 0 {server => src/server}/CMakeLists.txt | 0 {server => src/server}/api/aul_boot_sequence.cc | 0 {server => src/server}/api/aul_boot_sequence.h | 0 .../server}/api/aul_comp_info_internal.cc | 0 .../server}/api/aul_comp_info_internal.h | 0 {server => src/server}/api/aul_service.cc | 0 {server => src/server}/api/aul_service.h | 0 {server => src/server}/api/aul_types.h | 0 {server => src/server}/api/aul_widget_service.cc | 0 {server => src/server}/api/aul_widget_service.h | 0 {server => src/server}/aul-server.pc.in | 0 {server => src/server}/boot_sequence.cc | 0 {server => src/server}/boot_sequence.hh | 0 {server => src/server}/common_private.hh | 0 {server => src/server}/component_info.cc | 0 {server => src/server}/component_info.hh | 0 {server => src/server}/database.cc | 0 {server => src/server}/database.hh | 0 {server => src/server}/exception.cc | 0 {server => src/server}/exception.hh | 0 {server => src/server}/localized_info.cc | 0 {server => src/server}/localized_info.hh | 0 {server => src/server}/log_private.hh | 0 {tool => src/tool}/CMakeLists.txt | 0 src/tool/app_com_tool/CMakeLists.txt | 16 ++ {tool => src/tool}/app_com_tool/app_com_tool.c | 0 {tool => src/tool}/app_launcher/CMakeLists.txt | 12 +- {tool => src/tool}/app_launcher/app_launcher.c | 0 src/tool/appgroup_info/CMakeLists.txt | 16 ++ {tool => src/tool}/appgroup_info/app_group_info.c | 0 src/tool/appid2pid/CMakeLists.txt | 16 ++ {tool => src/tool}/appid2pid/appid2pid.c | 0 {tool => src/tool}/aul_test/CMakeLists.txt | 8 +- {tool => src/tool}/aul_test/aul_test.cc | 0 {tool => src/tool}/aul_test/aul_test.hh | 0 {tool => src/tool}/aul_test/aul_test_private.hh | 0 {tool => src/tool}/aul_test/log_private.hh | 0 {tool => src/tool}/aul_test/main.cc | 0 ...ul_app_get_all_running_app_info_for_uid_test.cc | 0 .../tests/aul_app_get_all_running_app_info_test.cc | 0 .../tests/aul_app_get_appid_bypid_async_test.cc | 0 .../aul_test/tests/aul_app_get_appid_bypid_test.cc | 0 .../aul_app_get_last_caller_pid_for_uid_test.cc | 0 .../tests/aul_app_get_last_caller_pid_test.cc | 0 .../aul_test/tests/aul_app_get_pid_for_uid_test.cc | 0 .../tool}/aul_test/tests/aul_app_get_pid_test.cc | 0 .../aul_test/tests/aul_app_get_pkgid_bypid_test.cc | 0 .../aul_app_get_running_app_info_for_uid_test.cc | 0 .../tests/aul_app_get_running_app_info_test.cc | 0 .../tests/aul_app_get_status_bypid_for_uid_test.cc | 0 .../tests/aul_app_get_status_bypid_test.cc | 0 .../tests/aul_app_get_status_for_uid_test.cc | 0 .../aul_test/tests/aul_app_get_status_test.cc | 0 .../aul_test/tests/aul_app_is_running_test.cc | 0 .../tests/aul_app_lifecycle_get_state_test.cc | 0 ...app_lifecycle_register_state_changed_cb_test.cc | 0 .../aul_test/tests/aul_disable_alias_info_test.cc | 0 .../aul_test/tests/aul_enable_alias_info_test.cc | 0 .../aul_get_app_info_from_db_by_pkgname_test.cc | 0 .../tests/aul_get_defapp_from_mime_test.cc | 0 .../aul_test/tests/aul_get_default_app_test.cc | 0 .../tests/aul_get_mime_description_test.cc | 0 .../aul_test/tests/aul_get_mime_extension_test.cc | 0 .../tests/aul_get_mime_from_content_test.cc | 0 .../aul_test/tests/aul_get_mime_from_file_test.cc | 0 .../tool}/aul_test/tests/aul_get_mime_icon_test.cc | 0 .../tool}/aul_test/tests/aul_kill_loader_test.cc | 0 .../aul_test/tests/aul_kill_pid_async_test.cc | 0 .../tests/aul_launch_app_async_for_uid_test.cc | 0 .../aul_test/tests/aul_launch_app_async_test.cc | 0 .../aul_test/tests/aul_launch_app_for_uid_test.cc | 0 .../tool}/aul_test/tests/aul_launch_app_test.cc | 0 .../tests/aul_listen_app_dead_signal_test.cc | 0 .../tests/aul_listen_app_launch_signal_test.cc | 0 .../tests/aul_listen_app_launch_signal_v2_test.cc | 0 .../tests/aul_listen_app_status_for_uid_test.cc | 0 .../tests/aul_listen_app_status_signal_test.cc | 0 .../aul_test/tests/aul_listen_app_status_test.cc | 0 .../aul_test/tests/aul_open_app_for_uid_test.cc | 0 .../tool}/aul_test/tests/aul_open_app_test.cc | 0 .../tool}/aul_test/tests/aul_open_content_test.cc | 0 .../tool}/aul_test/tests/aul_open_file_test.cc | 0 .../aul_test/tests/aul_pause_app_for_uid_test.cc | 0 .../tool}/aul_test/tests/aul_pause_app_test.cc | 0 .../aul_test/tests/aul_pause_pid_for_uid_test.cc | 0 .../tool}/aul_test/tests/aul_pause_pid_test.cc | 0 .../aul_test/tests/aul_proc_get_extra_test.cc | 0 .../tool}/aul_test/tests/aul_proc_get_name_test.cc | 0 .../aul_test/tests/aul_proc_group_add_test.cc | 0 .../aul_test/tests/aul_proc_group_foreach_test.cc | 0 .../aul_test/tests/aul_proc_group_get_test.cc | 0 .../aul_test/tests/aul_proc_group_remove_test.cc | 0 .../tool}/aul_test/tests/aul_proc_register_test.cc | 0 .../aul_test/tests/aul_reload_appinfo_test.cc | 0 .../aul_test/tests/aul_restart_loader_test.cc | 0 .../aul_test/tests/aul_resume_app_for_uid_test.cc | 0 .../tool}/aul_test/tests/aul_resume_app_test.cc | 0 .../tests/aul_resume_pid_async_for_uid_test.cc | 0 .../aul_test/tests/aul_resume_pid_async_test.cc | 0 .../aul_test/tests/aul_resume_pid_for_uid_test.cc | 0 .../tool}/aul_test/tests/aul_resume_pid_test.cc | 0 .../aul_test/tests/aul_set_alias_appid_test.cc | 0 .../tests/aul_set_defapp_with_mime_test.cc | 0 .../tests/aul_set_default_app_by_operation_test.cc | 0 .../tests/aul_subapp_terminate_request_pid_test.cc | 0 .../aul_test/tests/aul_terminate_app_async_test.cc | 0 .../aul_test/tests/aul_terminate_bgapp_pid_test.cc | 0 .../tests/aul_terminate_pid_async_for_uid_test.cc | 0 .../tests/aul_terminate_pid_async_v2_test.cc | 0 .../tests/aul_terminate_pid_for_uid_test.cc | 0 .../tests/aul_terminate_pid_sync_for_uid_test.cc | 0 .../aul_test/tests/aul_terminate_pid_sync_test.cc | 0 .../tool}/aul_test/tests/aul_terminate_pid_test.cc | 0 .../aul_terminate_pid_without_restart_test.cc | 0 .../aul_test/tests/aul_unset_alias_appid_test.cc | 0 {tool => src/tool}/aul_window/CMakeLists.txt | 4 +- {tool => src/tool}/aul_window/aul_window.cc | 0 {tool => src/tool}/aulctl/CMakeLists.txt | 4 +- {tool => src/tool}/aulctl/aulctl.cc | 0 .../tool}/aulctl/boot_sequence/app_info.cc | 4 +- .../tool}/aulctl/boot_sequence/app_info.hh | 0 .../aulctl/boot_sequence/boot_sequence_manager.cc | 8 +- .../aulctl/boot_sequence/boot_sequence_manager.hh | 0 .../tool}/aulctl/operation/help_operation.cc | 0 .../tool}/aulctl/operation/help_operation.hh | 0 .../tool}/aulctl/operation/is_active_operation.cc | 0 .../tool}/aulctl/operation/is_active_operation.hh | 0 .../tool}/aulctl/operation/list_apps_operation.cc | 0 .../tool}/aulctl/operation/list_apps_operation.hh | 0 .../operation/list_dependencies_operation.cc | 0 .../operation/list_dependencies_operation.hh | 0 {tool => src/tool}/aulctl/operation/operation.hh | 0 .../tool}/aulctl/operation/operation_factory.cc | 0 .../tool}/aulctl/operation/operation_factory.hh | 0 .../tool}/aulctl/operation/reload_operation.cc | 0 .../tool}/aulctl/operation/reload_operation.hh | 0 .../tool}/aulctl/operation/start_operation.cc | 0 .../tool}/aulctl/operation/start_operation.hh | 0 .../tool}/aulctl/operation/status_all_operation.cc | 0 .../tool}/aulctl/operation/status_all_operation.hh | 0 .../aulctl/operation/status_once_operation.cc | 0 .../aulctl/operation/status_once_operation.hh | 0 .../tool}/aulctl/operation/stop_operation.cc | 0 .../tool}/aulctl/operation/stop_operation.hh | 0 src/tool/compmgr_tool/CMakeLists.txt | 15 ++ {tool => src/tool}/compmgr_tool/compmgr_tool.c | 0 src/tool/launch_app/CMakeLists.txt | 14 ++ {tool => src/tool}/launch_app/launch_app.c | 0 {tool => src/tool}/launch_debug/CMakeLists.txt | 11 +- {tool => src/tool}/launch_debug/launch_debug.c | 0 {tool => src/tool}/open_app/CMakeLists.txt | 8 +- {tool => src/tool}/open_app/open_app.c | 0 {tool => src/tool}/recovery/CMakeLists.txt | 0 {tool => src/tool}/recovery/appsvc_db_recovery.c | 0 .../tool}/recovery/component_db_recovery.c | 0 {tool => src/tool}/recovery/db_internal.c | 0 {tool => src/tool}/recovery/db_internal.h | 0 test/app_control_tests/CMakeLists.txt | 8 +- test/unit_tests/CMakeLists.txt | 11 +- test/unit_tests/test_app_com.cc | 5 +- test/unit_tests/test_app_group.cc | 5 +- test/unit_tests/test_comp_context.cc | 7 +- test/unit_tests/test_comp_info.cc | 5 +- test/unit_tests/test_comp_status.cc | 5 +- test/unit_tests/test_complication.cc | 5 +- test/unit_tests/test_job_scheduler.cc | 5 +- test/unit_tests/test_launch.cc | 8 +- test/unit_tests/test_launch_with_result.cc | 12 +- test/unit_tests/test_launcher_service.cc | 5 +- test/unit_tests/test_pkginfo.cc | 7 +- test/unit_tests/test_status.cc | 5 +- test/unit_tests/test_watchdog.cc | 7 +- tool/app_com_tool/CMakeLists.txt | 11 - tool/appgroup_info/CMakeLists.txt | 11 - tool/appid2pid/CMakeLists.txt | 11 - tool/compmgr_tool/CMakeLists.txt | 11 - tool/launch_app/CMakeLists.txt | 11 - 383 files changed, 735 insertions(+), 708 deletions(-) create mode 100644 src/CMakeLists.txt create mode 100644 src/aul/CMakeLists.txt rename {aul => src/aul}/api/aul_app_context.cc (100%) rename {aul => src/aul}/api/aul_app_context.h (100%) rename {aul => src/aul}/api/aul_app_event.cc (100%) rename {aul => src/aul}/api/aul_app_event.h (100%) rename {aul => src/aul}/api/aul_app_lifecycle.cc (100%) rename {aul => src/aul}/api/aul_app_lifecycle.h (100%) rename {aul => src/aul}/api/aul_app_manager.cc (100%) rename {aul => src/aul}/api/aul_app_manager.h (100%) rename {aul => src/aul}/api/aul_component_port.cc (100%) rename {aul => src/aul}/api/aul_component_port.h (100%) rename src/{ => aul}/app_com.cc (97%) rename {aul => src/aul}/app_control/resolve_info.cc (99%) rename {aul => src/aul}/app_control/resolve_info.hh (100%) rename src/{ => aul}/app_group.cc (98%) rename {aul => src/aul}/app_group/app_group_info.cc (100%) rename {aul => src/aul}/app_group/app_group_info.hh (100%) rename {aul => src/aul}/app_info/app_info.cc (100%) rename {aul => src/aul}/app_info/app_info.hh (100%) rename {aul => src/aul}/app_info/directory_info.cc (100%) rename {aul => src/aul}/app_info/directory_info.hh (100%) rename {aul => src/aul}/app_info/external_directory_info.cc (100%) rename {aul => src/aul}/app_info/external_directory_info.hh (100%) rename {aul => src/aul}/app_manager/app_context.cc (100%) rename {aul => src/aul}/app_manager/app_context.hh (100%) rename {aul => src/aul}/app_manager/app_event.cc (100%) rename {aul => src/aul}/app_manager/app_event.hh (100%) rename {aul => src/aul}/app_manager/app_manager.cc (100%) rename {aul => src/aul}/app_manager/app_manager.hh (100%) rename src/{ => aul}/app_request.cc (96%) rename src/{ => aul}/app_request.h (88%) rename src/{ => aul}/app_signal.cc (99%) rename src/{ => aul}/app_signal.h (100%) rename aul.conf => src/aul/aul.conf (100%) rename aul.pc.in => src/aul/aul.pc.in (100%) rename src/{ => aul}/aul_api.h (100%) create mode 100644 src/aul/aul_cmd.cc rename src/{ => aul}/aul_comp_context.cc (98%) rename src/{ => aul}/aul_comp_info.cc (97%) rename src/{ => aul}/aul_comp_status.cc (100%) rename src/{ => aul}/aul_complication.cc (100%) rename src/{ => aul}/aul_debug_info.c (100%) create mode 100644 src/aul/aul_error.cc rename src/{ => aul}/aul_job_scheduler.cc (86%) rename src/{ => aul}/aul_launch.c (100%) rename src/{ => aul}/aul_launcher_service.cc (94%) rename src/{ => aul}/aul_path.cc (99%) rename src/{ => aul}/aul_proc.cc (98%) rename src/{ => aul}/aul_proc_group.cc (96%) rename src/{ => aul}/aul_rpc_port.cc (97%) rename src/{ => aul}/aul_rsc_mgr.c (100%) rename src/{ => aul}/aul_rsc_mgr_internal.c (100%) rename src/{ => aul}/aul_rsc_mgr_internal.h (100%) rename src/{ => aul}/aul_rsc_mgr_schema.h (100%) rename src/{ => aul}/aul_running_context.c (100%) rename src/{ => aul}/aul_screen_connector.c (100%) rename src/{ => aul}/aul_sock.cc (99%) rename src/{ => aul}/aul_svc.cc (99%) rename src/{ => aul}/aul_svc_priv_key.h (100%) rename src/{ => aul}/aul_util.c (100%) rename src/{ => aul}/aul_util.h (100%) rename src/{ => aul}/aul_watch_control.cc (92%) rename src/{ => aul}/aul_watch_control_internal.h (100%) rename src/{ => aul}/aul_watchdog.cc (95%) rename src/{ => aul}/aul_window.cc (98%) rename src/{ => aul}/aul_worker.c (100%) rename src/{ => aul}/aul_worker.h (100%) rename {aul => src/aul}/common/api.hh (100%) rename {aul => src/aul}/common/common.hh (100%) rename {aul => src/aul}/common/exception.hh (100%) rename {aul => src/aul}/common/file_descriptor.hh (100%) rename {aul => src/aul}/common/log_private.hh (100%) rename {aul => src/aul}/common/util.hh (100%) rename {aul => src/aul}/component/component_info.cc (100%) rename {aul => src/aul}/component/component_info.hh (100%) rename {aul => src/aul}/component/component_port.cc (100%) rename {aul => src/aul}/component/component_port.hh (100%) rename {aul => src/aul}/component/component_running_context.cc (100%) rename {aul => src/aul}/component/component_running_context.hh (100%) rename {aul => src/aul}/component/localized_info.cc (100%) rename {aul => src/aul}/component/localized_info.hh (100%) rename src/{ => aul}/cpu_inheritance.cc (95%) rename src/{ => aul}/cpu_inheritance.hh (100%) rename {include => src/aul/include}/aul.h (100%) rename {include => src/aul/include}/aul_app_com.h (100%) rename {include => src/aul/include}/aul_app_group.h (100%) rename {include => src/aul/include}/aul_cmd.h (100%) rename {include => src/aul/include}/aul_comp_context.h (100%) rename {include => src/aul/include}/aul_comp_info.h (100%) rename {include => src/aul/include}/aul_comp_status.h (100%) rename {include => src/aul/include}/aul_comp_types.h (100%) rename {include => src/aul/include}/aul_complication.h (100%) rename {include => src/aul/include}/aul_debug_info.h (100%) rename {include => src/aul/include}/aul_error.h (100%) rename {include => src/aul/include}/aul_job_scheduler.h (100%) rename {include => src/aul/include}/aul_key.h (100%) rename {include => src/aul/include}/aul_launcher_service.h (100%) rename {include => src/aul/include}/aul_proc.h (100%) rename {include => src/aul/include}/aul_proc_group.h (100%) rename {include => src/aul/include}/aul_rpc_port.h (100%) rename {include => src/aul/include}/aul_rsc_mgr.h (100%) rename {include => src/aul/include}/aul_running_context.h (100%) rename {include => src/aul/include}/aul_screen_connector.h (100%) rename {include => src/aul/include}/aul_sock.h (100%) rename {include => src/aul/include}/aul_svc.h (100%) rename {include => src/aul/include}/aul_svc_internal.h (100%) rename {include => src/aul/include}/aul_watch_control.h (100%) rename {include => src/aul/include}/aul_watchdog.h (100%) rename {include => src/aul/include}/aul_widget.h (100%) rename {include => src/aul/include}/aul_window.h (99%) rename src/{ => aul}/launch.cc (98%) rename src/{ => aul}/launch.h (99%) rename src/{ => aul}/launch_with_result.cc (98%) rename src/{ => aul}/menu_db_util.h (100%) rename src/{ => aul}/mime.c (100%) rename src/{ => aul}/miregex.c (100%) rename src/{ => aul}/miregex.h (100%) rename src/{ => aul}/pkginfo.cc (98%) rename src/{ => aul}/pkginfo_internal.h (100%) rename {aul => src/aul}/socket/client.cc (100%) rename {aul => src/aul}/socket/client.hh (100%) rename {aul => src/aul}/socket/client_socket.cc (100%) rename {aul => src/aul}/socket/client_socket.hh (100%) rename {aul => src/aul}/socket/packet.cc (100%) rename {aul => src/aul}/socket/packet.hh (100%) rename {aul => src/aul}/socket/server_socket.cc (100%) rename {aul => src/aul}/socket/server_socket.hh (100%) rename {aul => src/aul}/socket/socket.cc (100%) rename {aul => src/aul}/socket/socket.hh (100%) rename src/{ => aul}/status.cc (97%) rename src/{ => aul}/widget.c (100%) delete mode 100644 src/aul_cmd.c delete mode 100644 src/aul_error.c rename {parser => src/parser}/CMakeLists.txt (100%) rename {parser => src/parser}/boot-sequencer/CMakeLists.txt (100%) rename {parser => src/parser}/boot-sequencer/app_info.cc (100%) rename {parser => src/parser}/boot-sequencer/app_info.hh (100%) rename {parser => src/parser}/boot-sequencer/appsvc_db.cc (100%) rename {parser => src/parser}/boot-sequencer/appsvc_db.hh (100%) rename {parser => src/parser}/boot-sequencer/cert_checker.cc (100%) rename {parser => src/parser}/boot-sequencer/cert_checker.hh (100%) rename {parser => src/parser}/boot-sequencer/data/boot-sequencer.info (100%) rename {parser => src/parser}/boot-sequencer/database.cc (100%) rename {parser => src/parser}/boot-sequencer/database.hh (100%) rename {parser => src/parser}/boot-sequencer/event_type.hh (100%) rename {parser => src/parser}/boot-sequencer/exception.cc (100%) rename {parser => src/parser}/boot-sequencer/exception.hh (100%) rename {parser => src/parser}/boot-sequencer/log_private.hh (100%) rename {parser => src/parser}/boot-sequencer/package_event_args.cc (100%) rename {parser => src/parser}/boot-sequencer/package_event_args.hh (100%) rename {parser => src/parser}/boot-sequencer/parser_plugin.cc (100%) rename {parser => src/parser}/boot-sequencer/parser_plugin.hh (100%) rename {parser => src/parser}/boot-sequencer/pkgmgr_interface.cc (100%) rename {parser => src/parser}/component/CMakeLists.txt (100%) rename {parser => src/parser}/component/data/component.info (100%) rename {parser => src/parser}/component/data/component_db.sql.in (100%) rename {parser => src/parser}/component/inc/component_plugin_parser.h (100%) rename {parser => src/parser}/component/inc/component_plugin_parser_db.h (100%) rename {parser => src/parser}/component/inc/component_plugin_parser_handler.h (100%) rename {parser => src/parser}/component/inc/component_plugin_parser_private.h (100%) rename {parser => src/parser}/component/inc/component_plugin_parser_type.h (100%) rename {parser => src/parser}/component/script/14_component-add.post.in (100%) rename {parser => src/parser}/component/script/501.component_upgrade.sh.in (100%) rename {parser => src/parser}/component/script/upgrade/1_component_db_upgrade.sh.in (100%) rename {parser => src/parser}/component/src/component_plugin_parser.c (100%) rename {parser => src/parser}/component/src/component_plugin_parser_db.c (100%) rename {parser => src/parser}/component/src/component_plugin_parser_handler.c (100%) rename {parser => src/parser}/component/src/component_plugin_parser_pkgmgr_interface.c (100%) rename {parser => src/parser}/exec-checker/CMakeLists.txt (100%) rename {parser => src/parser}/exec-checker/data/exec-checker.info (100%) rename {parser => src/parser}/exec-checker/inc/exec_checker.hh (100%) rename {parser => src/parser}/exec-checker/inc/exec_checker_private.hh (100%) rename {parser => src/parser}/exec-checker/inc/plugin_manager.hh (100%) rename {parser => src/parser}/exec-checker/src/exec_checker.cc (100%) rename {parser => src/parser}/exec-checker/src/exec_checker_plugin_interface.cc (100%) rename {parser => src/parser}/exec-checker/src/plugin_manager.cc (100%) rename {parser => src/parser}/metadata/CMakeLists.txt (100%) rename {parser => src/parser}/metadata/alias-appid/CMakeLists.txt (100%) rename {parser => src/parser}/metadata/alias-appid/alias_info.hh (100%) rename {parser => src/parser}/metadata/alias-appid/appsvc_db.cc (100%) rename {parser => src/parser}/metadata/alias-appid/appsvc_db.hh (100%) rename {parser => src/parser}/metadata/alias-appid/data/alias-appid.info (100%) rename {parser => src/parser}/metadata/alias-appid/pkgmgr_interface.cc (100%) rename {parser => src/parser}/metadata/alias-appid/plugin_manager.cc (100%) rename {parser => src/parser}/metadata/alias-appid/plugin_manager.hh (100%) rename {parser => src/parser}/metadata/allowed-appid/CMakeLists.txt (100%) rename {parser => src/parser}/metadata/allowed-appid/allowed_info.hh (100%) rename {parser => src/parser}/metadata/allowed-appid/appsvc_db.cc (100%) rename {parser => src/parser}/metadata/allowed-appid/appsvc_db.hh (100%) rename {parser => src/parser}/metadata/allowed-appid/data/allowed-appid.info (100%) rename {parser => src/parser}/metadata/allowed-appid/pkgmgr_interface.cc (100%) rename {parser => src/parser}/metadata/allowed-appid/plugin_manager.cc (100%) rename {parser => src/parser}/metadata/allowed-appid/plugin_manager.hh (100%) rename {parser => src/parser}/metadata/common/app_event_args.hh (100%) rename {parser => src/parser}/metadata/common/database.cc (100%) rename {parser => src/parser}/metadata/common/database.hh (100%) rename {parser => src/parser}/metadata/common/event_type.hh (100%) rename {parser => src/parser}/metadata/common/exception.hh (100%) rename {parser => src/parser}/metadata/common/log_private.hh (100%) rename {parser => src/parser}/metadata/common/metadata.hh (100%) rename {parser => src/parser}/metadata/common/metadata_plugin.cc (100%) rename {parser => src/parser}/metadata/common/metadata_plugin.hh (100%) rename {parser => src/parser}/metadata/common/metadata_type.hh (100%) rename {server => src/server}/CMakeLists.txt (100%) rename {server => src/server}/api/aul_boot_sequence.cc (100%) rename {server => src/server}/api/aul_boot_sequence.h (100%) rename {server => src/server}/api/aul_comp_info_internal.cc (100%) rename {server => src/server}/api/aul_comp_info_internal.h (100%) rename {server => src/server}/api/aul_service.cc (100%) rename {server => src/server}/api/aul_service.h (100%) rename {server => src/server}/api/aul_types.h (100%) rename {server => src/server}/api/aul_widget_service.cc (100%) rename {server => src/server}/api/aul_widget_service.h (100%) rename {server => src/server}/aul-server.pc.in (100%) rename {server => src/server}/boot_sequence.cc (100%) rename {server => src/server}/boot_sequence.hh (100%) rename {server => src/server}/common_private.hh (100%) rename {server => src/server}/component_info.cc (100%) rename {server => src/server}/component_info.hh (100%) rename {server => src/server}/database.cc (100%) rename {server => src/server}/database.hh (100%) rename {server => src/server}/exception.cc (100%) rename {server => src/server}/exception.hh (100%) rename {server => src/server}/localized_info.cc (100%) rename {server => src/server}/localized_info.hh (100%) rename {server => src/server}/log_private.hh (100%) rename {tool => src/tool}/CMakeLists.txt (100%) create mode 100644 src/tool/app_com_tool/CMakeLists.txt rename {tool => src/tool}/app_com_tool/app_com_tool.c (100%) rename {tool => src/tool}/app_launcher/CMakeLists.txt (53%) rename {tool => src/tool}/app_launcher/app_launcher.c (100%) create mode 100644 src/tool/appgroup_info/CMakeLists.txt rename {tool => src/tool}/appgroup_info/app_group_info.c (100%) create mode 100644 src/tool/appid2pid/CMakeLists.txt rename {tool => src/tool}/appid2pid/appid2pid.c (100%) rename {tool => src/tool}/aul_test/CMakeLists.txt (78%) rename {tool => src/tool}/aul_test/aul_test.cc (100%) rename {tool => src/tool}/aul_test/aul_test.hh (100%) rename {tool => src/tool}/aul_test/aul_test_private.hh (100%) rename {tool => src/tool}/aul_test/log_private.hh (100%) rename {tool => src/tool}/aul_test/main.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_all_running_app_info_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_all_running_app_info_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_appid_bypid_async_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_appid_bypid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_last_caller_pid_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_last_caller_pid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_pid_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_pid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_pkgid_bypid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_running_app_info_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_running_app_info_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_status_bypid_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_status_bypid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_status_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_get_status_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_is_running_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_lifecycle_get_state_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_app_lifecycle_register_state_changed_cb_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_disable_alias_info_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_enable_alias_info_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_app_info_from_db_by_pkgname_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_defapp_from_mime_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_default_app_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_mime_description_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_mime_extension_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_mime_from_content_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_mime_from_file_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_get_mime_icon_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_kill_loader_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_kill_pid_async_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_launch_app_async_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_launch_app_async_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_launch_app_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_launch_app_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_listen_app_dead_signal_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_listen_app_launch_signal_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_listen_app_launch_signal_v2_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_listen_app_status_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_listen_app_status_signal_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_listen_app_status_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_open_app_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_open_app_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_open_content_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_open_file_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_pause_app_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_pause_app_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_pause_pid_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_pause_pid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_proc_get_extra_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_proc_get_name_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_proc_group_add_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_proc_group_foreach_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_proc_group_get_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_proc_group_remove_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_proc_register_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_reload_appinfo_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_restart_loader_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_resume_app_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_resume_app_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_resume_pid_async_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_resume_pid_async_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_resume_pid_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_resume_pid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_set_alias_appid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_set_defapp_with_mime_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_set_default_app_by_operation_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_subapp_terminate_request_pid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_app_async_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_bgapp_pid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_pid_async_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_pid_async_v2_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_pid_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_pid_sync_for_uid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_pid_sync_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_pid_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_terminate_pid_without_restart_test.cc (100%) rename {tool => src/tool}/aul_test/tests/aul_unset_alias_appid_test.cc (100%) rename {tool => src/tool}/aul_window/CMakeLists.txt (87%) rename {tool => src/tool}/aul_window/aul_window.cc (100%) rename {tool => src/tool}/aulctl/CMakeLists.txt (90%) rename {tool => src/tool}/aulctl/aulctl.cc (100%) rename {tool => src/tool}/aulctl/boot_sequence/app_info.cc (99%) rename {tool => src/tool}/aulctl/boot_sequence/app_info.hh (100%) rename {tool => src/tool}/aulctl/boot_sequence/boot_sequence_manager.cc (95%) rename {tool => src/tool}/aulctl/boot_sequence/boot_sequence_manager.hh (100%) rename {tool => src/tool}/aulctl/operation/help_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/help_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/is_active_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/is_active_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/list_apps_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/list_apps_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/list_dependencies_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/list_dependencies_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/operation.hh (100%) rename {tool => src/tool}/aulctl/operation/operation_factory.cc (100%) rename {tool => src/tool}/aulctl/operation/operation_factory.hh (100%) rename {tool => src/tool}/aulctl/operation/reload_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/reload_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/start_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/start_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/status_all_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/status_all_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/status_once_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/status_once_operation.hh (100%) rename {tool => src/tool}/aulctl/operation/stop_operation.cc (100%) rename {tool => src/tool}/aulctl/operation/stop_operation.hh (100%) create mode 100644 src/tool/compmgr_tool/CMakeLists.txt rename {tool => src/tool}/compmgr_tool/compmgr_tool.c (100%) create mode 100644 src/tool/launch_app/CMakeLists.txt rename {tool => src/tool}/launch_app/launch_app.c (100%) rename {tool => src/tool}/launch_debug/CMakeLists.txt (50%) rename {tool => src/tool}/launch_debug/launch_debug.c (100%) rename {tool => src/tool}/open_app/CMakeLists.txt (52%) rename {tool => src/tool}/open_app/open_app.c (100%) rename {tool => src/tool}/recovery/CMakeLists.txt (100%) rename {tool => src/tool}/recovery/appsvc_db_recovery.c (100%) rename {tool => src/tool}/recovery/component_db_recovery.c (100%) rename {tool => src/tool}/recovery/db_internal.c (100%) rename {tool => src/tool}/recovery/db_internal.h (100%) delete mode 100644 tool/app_com_tool/CMakeLists.txt delete mode 100644 tool/appgroup_info/CMakeLists.txt delete mode 100644 tool/appid2pid/CMakeLists.txt delete mode 100644 tool/compmgr_tool/CMakeLists.txt delete mode 100644 tool/launch_app/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index dcd0144..95a204c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,12 @@ ADD_DEFINITIONS("-DCOMPONENT_DB_VERSION=\"${COMPONENT_DB_VERSION}\"") ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"") ## Compile flags -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-zdefs -fvisibility=hidden -g -Wall -Werror -fpic ") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wl,-zdefs") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpic") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") SET(CMAKE_C_FLAGS_RELEASE "-O2") @@ -25,7 +30,8 @@ SET(CMAKE_CXX_FLAGS_RELEASE "-O2") SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") -SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/") +SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules/") ## Target SET(TARGET_AUL "aul") @@ -59,78 +65,19 @@ PKG_CHECK_MODULES(UUID_DEPS REQUIRED uuid) PKG_CHECK_MODULES(VCONF_DEPS REQUIRED vconf) PKG_CHECK_MODULES(XDGMIME_DEPS REQUIRED xdgmime) -## Target sources -AUX_SOURCE_DIRECTORY(src SRCS) -AUX_SOURCE_DIRECTORY(aul AUL_SRCS) -AUX_SOURCE_DIRECTORY(aul/api AUL_API_SRCS) -AUX_SOURCE_DIRECTORY(aul/app_control AUL_APP_CONTROL_SRCS) -AUX_SOURCE_DIRECTORY(aul/app_group AUL_APP_GROUP_SRCS) -AUX_SOURCE_DIRECTORY(aul/app_info AUL_APP_INFO_SRCS) -AUX_SOURCE_DIRECTORY(aul/app_manager AUL_APP_MANAGER_SRCS) -AUX_SOURCE_DIRECTORY(aul/common AUL_COMMON_SRCS) -AUX_SOURCE_DIRECTORY(aul/component AUL_COMPONENT_SRCS) -AUX_SOURCE_DIRECTORY(aul/socket AUL_SOCKET_SRCS) - -ADD_LIBRARY(${TARGET_AUL} SHARED - ${SRCS} - ${AUL_SRCS} - ${AUL_API_SRCS} - ${AUL_APP_CONTROL_SRCS} - ${AUL_APP_GROUP_SRCS} - ${AUL_APP_MANAGER_SRCS} - ${AUL_APP_INFO_SRCS} - ${AUL_COMMON_SRCS} - ${AUL_COMPONENT_SRCS} - ${AUL_SOCKET_SRCS} - ${AUL_BOOT_SEQUENCE_SRCS} -) - -TARGET_INCLUDE_DIRECTORIES(${TARGET_AUL} PUBLIC - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/include/internal - ${CMAKE_CURRENT_SOURCE_DIR}/aul/ - ${CMAKE_CURRENT_SOURCE_DIR}/aul/api - ${CMAKE_CURRENT_SOURCE_DIR}/aul/app_control - ${CMAKE_CURRENT_SOURCE_DIR}/aul/app_manager - ${CMAKE_CURRENT_SOURCE_DIR}/aul/common - ${CMAKE_CURRENT_SOURCE_DIR}/aul/component - ${CMAKE_CURRENT_SOURCE_DIR}/aul/socket -) - -SET_TARGET_PROPERTIES(${TARGET_AUL} PROPERTIES SOVERSION ${MAJORVER}) -SET_TARGET_PROPERTIES(${TARGET_AUL} PROPERTIES VERSION ${FULLVER}) - -APPLY_PKG_CONFIG(${TARGET_AUL} PUBLIC - BUNDLE_DEPS - CAPI_SYSTEM_INFO_DEPS - CAPI_SYSTEM_RESOURCE_DEPS - DLOG_DEPS - GIO_DEPS - GLIB_DEPS - INIPARSER_DEPS - LIBSMACK_DEPS - LIBTZPLATFORM_CONFIG_DEPS - LIBXML_DEPS - PARCEL_DEPS - PKGMGR_INFO_DEPS - STORAGE_DEPS - TTRACE_DEPS - UUID_DEPS - VCONF_DEPS - XDGMIME_DEPS -) - -INSTALL(TARGETS ${TARGET_AUL} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) - # pkgconfig file -CONFIGURE_FILE(aul.pc.in aul.pc @ONLY) -CONFIGURE_FILE(feature/preexec_list.txt.in feature/preexec_list.txt @ONLY) -CONFIGURE_FILE(data/appsvc_db.sql.in data/appsvc_db.sql @ONLY) -CONFIGURE_FILE(scripts/12_appsvc-add.post.in scripts/12_appsvc-add.post @ONLY) -CONFIGURE_FILE(scripts/501.appsvc_db_upgrade.sh.in scripts/501.appsvc_db_upgrade.sh @ONLY) -CONFIGURE_FILE(scripts/upgrade/1_appsvc_db_upgrade.sh.in scripts/upgrade/1_appsvc_db_upgrade.sh @ONLY) -CONFIGURE_FILE(scripts/upgrade/2_appsvc_db_upgrade.sh.in scripts/upgrade/2_appsvc_db_upgrade.sh @ONLY) +CONFIGURE_FILE(feature/preexec_list.txt.in + feature/preexec_list.txt @ONLY) +CONFIGURE_FILE(data/appsvc_db.sql.in + data/appsvc_db.sql @ONLY) +CONFIGURE_FILE(scripts/12_appsvc-add.post.in + scripts/12_appsvc-add.post @ONLY) +CONFIGURE_FILE(scripts/501.appsvc_db_upgrade.sh.in + scripts/501.appsvc_db_upgrade.sh @ONLY) +CONFIGURE_FILE(scripts/upgrade/1_appsvc_db_upgrade.sh.in + scripts/upgrade/1_appsvc_db_upgrade.sh @ONLY) +CONFIGURE_FILE(scripts/upgrade/2_appsvc_db_upgrade.sh.in + scripts/upgrade/2_appsvc_db_upgrade.sh @ONLY) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/501.appsvc_db_upgrade.sh DESTINATION /usr/share/upgrade/scripts) @@ -138,21 +85,11 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/upgrade/1_appsvc_db_upgrade.sh DESTINATION /etc/aul/upgrade/scripts) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/scripts/upgrade/2_appsvc_db_upgrade.sh DESTINATION /etc/aul/upgrade/scripts) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/aul.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/feature/preexec_list.txt DESTINATION ${SHARE_INSTALL_PREFIX}/aul ) -INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/miregex DESTINATION ${SHARE_INSTALL_PREFIX}/aul ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/aul.conf DESTINATION /etc/dbus-1/system.d) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/aul - FILES_MATCHING - PATTERN "*.h" -) -INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/aul/api/ DESTINATION include/aul/api - FILES_MATCHING - PATTERN "*.h" -) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/feature/preexec_list.txt + DESTINATION ${SHARE_INSTALL_PREFIX}/aul ) +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/miregex + DESTINATION ${SHARE_INSTALL_PREFIX}/aul ) ## Sub directories -ADD_SUBDIRECTORY(parser) -ADD_SUBDIRECTORY(server) +ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(test) -ADD_SUBDIRECTORY(tool) diff --git a/packaging/aul.spec b/packaging/aul.spec index 6616d13..1e5dc61 100644 --- a/packaging/aul.spec +++ b/packaging/aul.spec @@ -155,10 +155,10 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %__make %{?_smp_mflags} sqlite3 .appsvc.db < ./data/appsvc_db.sql -sqlite3 .component.db < ./parser/component/data/component_db.sql +sqlite3 .component.db < ./src/parser/component/data/component_db.sql %check -export LD_LIBRARY_PATH="../../" +export LD_LIBRARY_PATH="../../src/aul" ctest -V %if 0%{?gcov:1} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..cd5f6cc --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,4 @@ +ADD_SUBDIRECTORY(aul) +ADD_SUBDIRECTORY(parser) +ADD_SUBDIRECTORY(server) +ADD_SUBDIRECTORY(tool) diff --git a/src/aul/CMakeLists.txt b/src/aul/CMakeLists.txt new file mode 100644 index 0000000..f372ce9 --- /dev/null +++ b/src/aul/CMakeLists.txt @@ -0,0 +1,80 @@ +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR} SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/api AUL_API_SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/app_control + AUL_APP_CONTROL_SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/app_group AUL_APP_GROUP_SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/app_info AUL_APP_INFO_SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/app_manager AUL_APP_MANAGER_SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/common AUL_COMMON_SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/component AUL_COMPONENT_SRCS) +AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/socket AUL_SOCKET_SRCS) + +ADD_LIBRARY(${TARGET_AUL} SHARED + ${SRCS} + ${AUL_API_SRCS} + ${AUL_APP_CONTROL_SRCS} + ${AUL_APP_GROUP_SRCS} + ${AUL_APP_MANAGER_SRCS} + ${AUL_APP_INFO_SRCS} + ${AUL_COMMON_SRCS} + ${AUL_COMPONENT_SRCS} + ${AUL_SOCKET_SRCS} + ${AUL_BOOT_SEQUENCE_SRCS} +) + +TARGET_INCLUDE_DIRECTORIES(${TARGET_AUL} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/include/internal + ${CMAKE_CURRENT_SOURCE_DIR}/api + ${CMAKE_CURRENT_SOURCE_DIR}/app_control + ${CMAKE_CURRENT_SOURCE_DIR}/app_manager + ${CMAKE_CURRENT_SOURCE_DIR}/common + ${CMAKE_CURRENT_SOURCE_DIR}/component + ${CMAKE_CURRENT_SOURCE_DIR}/socket +) + +SET_TARGET_PROPERTIES(${TARGET_AUL} PROPERTIES SOVERSION ${MAJORVER}) +SET_TARGET_PROPERTIES(${TARGET_AUL} PROPERTIES VERSION ${FULLVER}) + +APPLY_PKG_CONFIG(${TARGET_AUL} PUBLIC + BUNDLE_DEPS + CAPI_SYSTEM_INFO_DEPS + CAPI_SYSTEM_RESOURCE_DEPS + DLOG_DEPS + GIO_DEPS + GLIB_DEPS + INIPARSER_DEPS + LIBSMACK_DEPS + LIBTZPLATFORM_CONFIG_DEPS + LIBXML_DEPS + PARCEL_DEPS + PKGMGR_INFO_DEPS + STORAGE_DEPS + TTRACE_DEPS + UUID_DEPS + VCONF_DEPS + XDGMIME_DEPS +) + +INSTALL(TARGETS ${TARGET_AUL} + DESTINATION ${LIB_INSTALL_DIR} + COMPONENT RuntimeLibraries) + +# pkgconfig file +CONFIGURE_FILE(aul.pc.in aul.pc @ONLY) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/aul.pc + DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/aul.conf + DESTINATION /etc/dbus-1/system.d) + +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION include/aul + FILES_MATCHING + PATTERN "*.h" +) + +INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/api/ DESTINATION include/aul/api + FILES_MATCHING + PATTERN "*.h" +) diff --git a/aul/api/aul_app_context.cc b/src/aul/api/aul_app_context.cc similarity index 100% rename from aul/api/aul_app_context.cc rename to src/aul/api/aul_app_context.cc diff --git a/aul/api/aul_app_context.h b/src/aul/api/aul_app_context.h similarity index 100% rename from aul/api/aul_app_context.h rename to src/aul/api/aul_app_context.h diff --git a/aul/api/aul_app_event.cc b/src/aul/api/aul_app_event.cc similarity index 100% rename from aul/api/aul_app_event.cc rename to src/aul/api/aul_app_event.cc diff --git a/aul/api/aul_app_event.h b/src/aul/api/aul_app_event.h similarity index 100% rename from aul/api/aul_app_event.h rename to src/aul/api/aul_app_event.h diff --git a/aul/api/aul_app_lifecycle.cc b/src/aul/api/aul_app_lifecycle.cc similarity index 100% rename from aul/api/aul_app_lifecycle.cc rename to src/aul/api/aul_app_lifecycle.cc diff --git a/aul/api/aul_app_lifecycle.h b/src/aul/api/aul_app_lifecycle.h similarity index 100% rename from aul/api/aul_app_lifecycle.h rename to src/aul/api/aul_app_lifecycle.h diff --git a/aul/api/aul_app_manager.cc b/src/aul/api/aul_app_manager.cc similarity index 100% rename from aul/api/aul_app_manager.cc rename to src/aul/api/aul_app_manager.cc diff --git a/aul/api/aul_app_manager.h b/src/aul/api/aul_app_manager.h similarity index 100% rename from aul/api/aul_app_manager.h rename to src/aul/api/aul_app_manager.h diff --git a/aul/api/aul_component_port.cc b/src/aul/api/aul_component_port.cc similarity index 100% rename from aul/api/aul_component_port.cc rename to src/aul/api/aul_component_port.cc diff --git a/aul/api/aul_component_port.h b/src/aul/api/aul_component_port.h similarity index 100% rename from aul/api/aul_component_port.h rename to src/aul/api/aul_component_port.h diff --git a/src/app_com.cc b/src/aul/app_com.cc similarity index 97% rename from src/app_com.cc rename to src/aul/app_com.cc index 57c304d..ff92125 100644 --- a/src/app_com.cc +++ b/src/aul/app_com.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/aul_app_com.h" +#include "aul/include/aul_app_com.h" #include #include @@ -23,12 +23,12 @@ #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_cmd.h" -#include "launch.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" +#include "aul/include/aul_cmd.h" +#include "aul/launch.h" using namespace aul::internal; diff --git a/aul/app_control/resolve_info.cc b/src/aul/app_control/resolve_info.cc similarity index 99% rename from aul/app_control/resolve_info.cc rename to src/aul/app_control/resolve_info.cc index 5efc46d..c384f05 100644 --- a/aul/app_control/resolve_info.cc +++ b/src/aul/app_control/resolve_info.cc @@ -14,15 +14,16 @@ * limitations under the License. */ +#include "aul/app_control/resolve_info.hh" + #include #include -#include "aul/app_control/resolve_info.hh" +#include "aul/aul_svc_priv_key.h" #include "aul/common/exception.hh" #include "aul/common/log_private.hh" #include "aul/common/util.hh" -#include "include/aul.h" -#include "src/aul_svc_priv_key.h" +#include "aul/include/aul.h" namespace aul { diff --git a/aul/app_control/resolve_info.hh b/src/aul/app_control/resolve_info.hh similarity index 100% rename from aul/app_control/resolve_info.hh rename to src/aul/app_control/resolve_info.hh diff --git a/src/app_group.cc b/src/aul/app_group.cc similarity index 98% rename from src/app_group.cc rename to src/aul/app_group.cc index dc2d1a0..4d74244 100644 --- a/src/app_group.cc +++ b/src/aul/app_group.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/aul_app_group.h" +#include "aul/include/aul_app_group.h" #include @@ -22,16 +22,15 @@ #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_error.h" -#include "include/aul_sock.h" -#include "launch.h" - #include "aul/app_group/app_group_info.hh" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" #include "aul/common/exception.hh" +#include "aul/include/aul.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" +#include "aul/launch.h" using namespace aul; using namespace aul::internal; diff --git a/aul/app_group/app_group_info.cc b/src/aul/app_group/app_group_info.cc similarity index 100% rename from aul/app_group/app_group_info.cc rename to src/aul/app_group/app_group_info.cc diff --git a/aul/app_group/app_group_info.hh b/src/aul/app_group/app_group_info.hh similarity index 100% rename from aul/app_group/app_group_info.hh rename to src/aul/app_group/app_group_info.hh diff --git a/aul/app_info/app_info.cc b/src/aul/app_info/app_info.cc similarity index 100% rename from aul/app_info/app_info.cc rename to src/aul/app_info/app_info.cc diff --git a/aul/app_info/app_info.hh b/src/aul/app_info/app_info.hh similarity index 100% rename from aul/app_info/app_info.hh rename to src/aul/app_info/app_info.hh diff --git a/aul/app_info/directory_info.cc b/src/aul/app_info/directory_info.cc similarity index 100% rename from aul/app_info/directory_info.cc rename to src/aul/app_info/directory_info.cc diff --git a/aul/app_info/directory_info.hh b/src/aul/app_info/directory_info.hh similarity index 100% rename from aul/app_info/directory_info.hh rename to src/aul/app_info/directory_info.hh diff --git a/aul/app_info/external_directory_info.cc b/src/aul/app_info/external_directory_info.cc similarity index 100% rename from aul/app_info/external_directory_info.cc rename to src/aul/app_info/external_directory_info.cc diff --git a/aul/app_info/external_directory_info.hh b/src/aul/app_info/external_directory_info.hh similarity index 100% rename from aul/app_info/external_directory_info.hh rename to src/aul/app_info/external_directory_info.hh diff --git a/aul/app_manager/app_context.cc b/src/aul/app_manager/app_context.cc similarity index 100% rename from aul/app_manager/app_context.cc rename to src/aul/app_manager/app_context.cc diff --git a/aul/app_manager/app_context.hh b/src/aul/app_manager/app_context.hh similarity index 100% rename from aul/app_manager/app_context.hh rename to src/aul/app_manager/app_context.hh diff --git a/aul/app_manager/app_event.cc b/src/aul/app_manager/app_event.cc similarity index 100% rename from aul/app_manager/app_event.cc rename to src/aul/app_manager/app_event.cc diff --git a/aul/app_manager/app_event.hh b/src/aul/app_manager/app_event.hh similarity index 100% rename from aul/app_manager/app_event.hh rename to src/aul/app_manager/app_event.hh diff --git a/aul/app_manager/app_manager.cc b/src/aul/app_manager/app_manager.cc similarity index 100% rename from aul/app_manager/app_manager.cc rename to src/aul/app_manager/app_manager.cc diff --git a/aul/app_manager/app_manager.hh b/src/aul/app_manager/app_manager.hh similarity index 100% rename from aul/app_manager/app_manager.hh rename to src/aul/app_manager/app_manager.hh diff --git a/src/app_request.cc b/src/aul/app_request.cc similarity index 96% rename from src/app_request.cc rename to src/aul/app_request.cc index 1842a2e..488bc25 100644 --- a/src/app_request.cc +++ b/src/aul/app_request.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "app_request.h" +#include "aul/app_request.h" #include #include @@ -33,11 +33,11 @@ #include #include -#include "aul_cmd.h" -#include "aul_error.h" -#include "aul_sock.h" -#include "aul_util.h" -#include "launch.h" +#include "aul/aul_util.h" +#include "aul/include/aul_cmd.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" +#include "aul/launch.h" namespace aul { namespace internal { diff --git a/src/app_request.h b/src/aul/app_request.h similarity index 88% rename from src/app_request.h rename to src/aul/app_request.h index 28f066f..ce21ac5 100644 --- a/src/app_request.h +++ b/src/aul/app_request.h @@ -14,15 +14,15 @@ * limitations under the License. */ -#ifndef APP_REQUEST_H_ -#define APP_REQUEST_H_ +#ifndef AUL_APP_REQUEST_H_ +#define AUL_APP_REQUEST_H_ #include #include #include -#include "aul.h" -#include "aul_sock.h" +#include "aul/include/aul.h" +#include "aul/include/aul_sock.h" namespace aul { namespace internal { @@ -30,7 +30,7 @@ namespace internal { class AppRequest { public: AppRequest(int cmd, uid_t uid); - AppRequest(int cmd); + explicit AppRequest(int cmd); AppRequest& With(tizen_base::Bundle b); AppRequest& With(bundle* b); @@ -56,4 +56,4 @@ class AppRequest { } // namespace internal } // namespace aul -#endif // APP_REQUEST_H_ \ No newline at end of file +#endif // AUL_APP_REQUEST_H_ \ No newline at end of file diff --git a/src/app_signal.cc b/src/aul/app_signal.cc similarity index 99% rename from src/app_signal.cc rename to src/aul/app_signal.cc index ae44e7b..a9d6967 100644 --- a/src/app_signal.cc +++ b/src/aul/app_signal.cc @@ -21,10 +21,9 @@ #include #include -#include "include/aul.h" -#include "aul_api.h" - -#include "log_private.hh" +#include "aul/aul_api.h" +#include "aul/include/aul.h" +#include "aul/common/log_private.hh" namespace { diff --git a/src/app_signal.h b/src/aul/app_signal.h similarity index 100% rename from src/app_signal.h rename to src/aul/app_signal.h diff --git a/aul.conf b/src/aul/aul.conf similarity index 100% rename from aul.conf rename to src/aul/aul.conf diff --git a/aul.pc.in b/src/aul/aul.pc.in similarity index 100% rename from aul.pc.in rename to src/aul/aul.pc.in diff --git a/src/aul_api.h b/src/aul/aul_api.h similarity index 100% rename from src/aul_api.h rename to src/aul/aul_api.h diff --git a/src/aul/aul_cmd.cc b/src/aul/aul_cmd.cc new file mode 100644 index 0000000..84c6465 --- /dev/null +++ b/src/aul/aul_cmd.cc @@ -0,0 +1,232 @@ +/* + * Copyright (c) 2018 - 2020 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include "aul/include/aul_cmd.h" + +#include + +#include "aul/aul_api.h" + +extern "C" API const char* aul_cmd_convert_to_string(int cmd) { + static const char* cmd_string_table[] = { + "APP_START", + + "APP_OPEN", + "APP_RESUME", + "APP_RESUME_BY_PID", + "APP_TERM_BY_PID", + "APP_TERM_BY_PID_WITHOUT_RESTART", + "APP_RESULT", + "APP_START_RES", + "APP_CANCEL", + "APP_KILL_BY_PID", + "APP_UPDATE_RUA_STAT", + + "APP_ADD_HISTORY", + "APP_REMOVE_HISTORY", + "APP_RUNNING_INFO", + "APP_RUNNING_INFO_RESULT", + "APP_IS_RUNNING", + "APP_GET_APPID_BYPID", + "APP_GET_PKGID_BYPID", + "APP_GET_INFO_OK", + "APP_GET_INFO_ERROR", + "APP_KEY_EVENT", + + "APP_KEY_RESERVE", + "APP_KEY_RELEASE", + "APP_STATUS_UPDATE", + "APP_RUNNING_LIST_UPDATE", + "APP_TERM_REQ_BY_PID", + "APP_TERM_BY_PID_ASYNC", + "APP_TERM_BGAPP_BY_PID", + "APP_PAUSE", + "APP_PAUSE_BY_PID", + "APP_GROUP_GET_WINDOW", + + "APP_GROUP_SET_WINDOW", + "APP_GROUP_GET_FG", + "APP_GROUP_GET_LEADER_PID", + "APP_GROUP_GET_LEADER_PIDS", + "APP_GROUP_GET_GROUP_PIDS", + "APP_GROUP_GET_IDLE_PIDS", + "APP_GROUP_LOWER", + "APP_GROUP_CLEAR_TOP", + "APP_GROUP_ACTIVATE_BELOW", + "APP_GET_STATUS", + + "APP_ADD_LOADER", + "APP_REMOVE_LOADER", + "APP_GET_PID", + "APP_GET_DC_SOCKET_PAIR", + "APP_GET_MP_SOCKET_PAIR", + "APP_COM_CREATE", + "APP_COM_JOIN", + "APP_COM_SEND", + "APP_COM_LEAVE", + "APP_COM_MESSAGE", + + "WIDGET_ADD", + "WIDGET_DEL", + "WIDGET_LIST", + "WIDGET_UPDATE", + "WIDGET_COUNT", + "WIDGET_GET_CONTENT", + "APP_REGISTER_PID", + "APP_WAKE", + "APP_SUSPEND", + "AMD_RELOAD_APPINFO", + + "LAUNCHPAD_DEAD_SIGNAL", + "APP_ALL_RUNNING_INFO", + "APP_SET_APP_CONTROL_DEFAULT_APP", + "APP_UNSET_APP_CONTROL_DEFAULT_APP", + "APP_START_ASYNC", + "APP_SET_PROCESS_GROUP", + "APP_PREPARE_CANDIDATE_PROCESS", + "APP_TERM_BY_PID_SYNC", + "APP_GET_STATUS_BY_APPID", + "APP_GET_LAST_CALLER_PID", + + "APP_TERM_BY_PID_SYNC_WITHOUT_RESTART", + "APP_RESUME_BY_PID_ASYNC", + "APP_SET_ALIAS_APPID", + "APP_UNSET_ALIAS_APPID", + "APP_ENABLE_ALIAS_INFO", + "APP_DISABLE_ALIAS_INFO", + "APP_GROUP_ACTIVATE_ABOVE", + "ADD_APP_SCREEN", + "REMOVE_APP_SCREEN", + "APP_UPDATE_REQUESTED", + + "ADD_SCREEN_VIEWER", + "REMOVE_SCREEN_VIEWER", + "LAUNCHPAD_LAUNCH_SIGNAL", + "APP_RUNNING_INSTANCE_INFO", + "APP_GET_INSTANCE_ID_BYPID", + "APP_SET_CACHE", + "APP_GET_APPID_FROM_CACHE", + "APP_INVALIDATE_CACHE", + "APP_STARTUP_SIGNAL", + "APP_WINDOW_ATTACH", + + "APP_WINDOW_DETACH", + "APP_START_RES_ASYNC", + "APP_NOTIFY_EXIT", + "APP_GET_APPID_BY_SURFACE_ID", + "APP_GET_INSTANCE_ID_BY_SURFACE_ID", + "UPDATE_SCREEN_VIEWER_STATUS", + "WIDGET_RUNNING_INFO", + "JOB_STATUS_UPDATE", + "WIDGET_CHANGE_STATUS", + "RPC_PORT_PREPARE_STUB", + + "RPC_PORT_CREATE_SOCKET_PAIR", + "RPC_PORT_NOTIFY_RPC_FINISHED", + "COMPLICATION_UPDATE_REQUEST", + "APP_NOTIFY_START", + "WATCHDOG_ENABLE", + "WATCHDOG_DISABLE", + "WATCHDOG_PING", + "WATCHDOG_KICK", + "APP_SEND_LAUNCH_REQUEST", + "APP_SEND_LAUNCH_REQUEST_SYNC", + + "COMP_NOTIFY_START", + "COMP_NOTIFY_EXIT", + "COMP_STATUS_UPDATE", + "APP_TERM_INSTANCE_ASYNC", + "APP_GROUP_SET_WINDOW_V2", + "APP_GROUP_LOWER_V2", + "APP_GROUP_GET_LEADER_IDS", + "APP_GROUP_GET_GROUP_INFO", + "APP_GROUP_GET_IDLE_INFO", + "COMP_CONTEXT_FOREACH", + + "COMP_CONTEXT_GET", + "COMP_CONTEXT_IS_RUNNING", + "COMP_CONTEXT_RESUME", + "COMP_CONTEXT_PAUSE", + "COMP_CONTEXT_TERMINATE_BG_COMP", + "COMP_CONTEXT_TERMINATE", + "APP_RESUME_INSTANCE", + "APP_PAUSE_INSTANCE", + "APP_TERM_BG_INSTANCE", + "LAUNCHPAD_CHILD_PROCESS", /* unused */ + + "COMP_INFO_GET", + "COMP_INFO_FOREACH", + "APP_TERMINATE", + "APP_IS_RUNNING_V2", + "ANR_NOTIFY", + "APP_GET_RUNNING_CONTEXT", + "LAUNCHER_SERVICE_NOTIFY_ANIMATION_STARTED", + "LAUNCHER_SERVICE_NOTIFY_ANIMATION_FINISHED", + "APP_SEND_RESUME_REQUEST", + "APP_PREPARE_APP_DEFINED_LOADER", + + "WIDGET_DISABLE", + "TRIGGER_APP_SCREEN_FOCUSED_FORCE", + "WIDGET_EVENT", + "SET_PRIVATE_SHARING", + "UNSET_PRIVATE_SHARING", + "APP_CONTEXT_GET", + "APP_CONTEXT_GET_BY_INSTANCE_ID", + "APP_CONTEXT_GET_BY_PID", + "APP_GROUP_ADD", + "APP_GROUP_REMOVE", + + "APP_GET_APPID_LIST", + "COMP_PORT_EXIST", + "COMP_PORT_CREATE", + "COMP_PORT_DESTROY", + "APP_LIFECYCLE_UPDATE_STATE", + + "APP_STATUS_UPDATE_V2", + "APP_GET_APP_CONTROL_DEFAULT_APPS", + "APP_GET_APPID_BY_ALIAS_APPID", + "APP_GET_APP_CONTROL_DEFAULT_APP", + "APP_LIFECYCLE_GET_STATE", + + "PROC_REGISTER", + "PROC_DEREGISTER", + "PROC_GET_NAME", + "PROC_GET_EXTRA", + "RPC_PORT_CREATE", + + "RPC_PORT_DESTROY", + "RPC_PORT_EXIST", + "APP_WINDOW_ATTACH_BELOW", + "PROC_GROUP_ADD", + "PROC_GROUP_REMOVE", + + "APP_CONNECT", + "APP_SET_AUTO_RESTART", + "BOOT_SEQUENCE_START_APP", + "BOOT_SEQUENCE_GET_APPINFO_LIST", + "BOOT_SEQUENCE_RELOAD", + + "PKG_PRE_EVENT_SEND", + "PROC_GROUP_FOREACH", + "PROC_GROUP_GET", + + "CUSTOM_COMMAND"}; + + if (cmd < 0 || cmd >= APP_CMD_MAX) return cmd_string_table[APP_CMD_MAX]; + + return cmd_string_table[cmd]; +} diff --git a/src/aul_comp_context.cc b/src/aul/aul_comp_context.cc similarity index 98% rename from src/aul_comp_context.cc rename to src/aul/aul_comp_context.cc index b93e82c..46b06bb 100644 --- a/src/aul_comp_context.cc +++ b/src/aul/aul_comp_context.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/aul_comp_context.h" +#include "aul/include/aul_comp_context.h" #include @@ -22,14 +22,13 @@ #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_error.h" - +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" #include "aul/common/exception.hh" #include "aul/component/component_running_context.hh" +#include "aul/include/aul.h" +#include "aul/include/aul_error.h" using namespace aul; diff --git a/src/aul_comp_info.cc b/src/aul/aul_comp_info.cc similarity index 97% rename from src/aul_comp_info.cc rename to src/aul/aul_comp_info.cc index 544579f..604779b 100644 --- a/src/aul_comp_info.cc +++ b/src/aul/aul_comp_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/aul_comp_info.h" +#include "aul/include/aul_comp_info.h" #include @@ -23,15 +23,14 @@ #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_error.h" -#include "include/aul_sock.h" - +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" #include "aul/common/exception.hh" #include "aul/component/component_info.hh" +#include "aul/include/aul.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" using namespace aul; diff --git a/src/aul_comp_status.cc b/src/aul/aul_comp_status.cc similarity index 100% rename from src/aul_comp_status.cc rename to src/aul/aul_comp_status.cc diff --git a/src/aul_complication.cc b/src/aul/aul_complication.cc similarity index 100% rename from src/aul_complication.cc rename to src/aul/aul_complication.cc diff --git a/src/aul_debug_info.c b/src/aul/aul_debug_info.c similarity index 100% rename from src/aul_debug_info.c rename to src/aul/aul_debug_info.c diff --git a/src/aul/aul_error.cc b/src/aul/aul_error.cc new file mode 100644 index 0000000..a2ca1bd --- /dev/null +++ b/src/aul/aul_error.cc @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "aul/include/aul_error.h" + +#include + +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" +#include "aul/include/aul_sock.h" + +extern "C" API int aul_error_convert(int res) { + int ret; + + switch (res) { + case -ENOMEM: + ret = AUL_R_ENOMEM; + break; + case -EREJECTED: + ret = AUL_R_EREJECTED; + break; + case -ENOENT: + ret = AUL_R_ENOAPP; + break; + case -ETERMINATING: + ret = AUL_R_ETERMINATING; + break; + case -EILLEGALACCESS: + ret = AUL_R_EILLACC; + break; + case -ELOCALLAUNCH_ID: + ret = AUL_R_LOCAL; + break; + case -EAGAIN: + ret = AUL_R_ETIMEOUT; + break; + case -EINVAL: + ret = AUL_R_EINVAL; + break; + case -ECOMM: + ret = AUL_R_ECOMM; + break; + case -ECANCELED: + ret = AUL_R_ECANCELED; + break; + default: + ret = AUL_R_ERROR; + break; + } + + return ret; +} diff --git a/src/aul_job_scheduler.cc b/src/aul/aul_job_scheduler.cc similarity index 86% rename from src/aul_job_scheduler.cc rename to src/aul/aul_job_scheduler.cc index 1b169de..a42175a 100644 --- a/src/aul_job_scheduler.cc +++ b/src/aul/aul_job_scheduler.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "include/aul_job_scheduler.h" +#include "aul/include/aul_job_scheduler.h" #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_sock.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" +#include "aul/include/aul_sock.h" extern "C" API int aul_job_scheduler_update_job_status(const char* job_id, aul_job_status_e job_status) { diff --git a/src/aul_launch.c b/src/aul/aul_launch.c similarity index 100% rename from src/aul_launch.c rename to src/aul/aul_launch.c diff --git a/src/aul_launcher_service.cc b/src/aul/aul_launcher_service.cc similarity index 94% rename from src/aul_launcher_service.cc rename to src/aul/aul_launcher_service.cc index d9b9411..9edf7f2 100644 --- a/src/aul_launcher_service.cc +++ b/src/aul/aul_launcher_service.cc @@ -15,20 +15,19 @@ * */ -#include "include/aul_launcher_service.h" +#include "aul/include/aul_launcher_service.h" +#include +#include #include #include -#include -#include - -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul_app_com.h" -#include "include/aul_error.h" -#include "include/aul_sock.h" -#include "app_request.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul_app_com.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" struct aul_launcher_serivce_s { void* dummy; diff --git a/src/aul_path.cc b/src/aul/aul_path.cc similarity index 99% rename from src/aul_path.cc rename to src/aul/aul_path.cc index c681d59..446bc09 100644 --- a/src/aul_path.cc +++ b/src/aul/aul_path.cc @@ -21,9 +21,9 @@ #include "aul/app_info/directory_info.hh" #include "aul/app_info/external_directory_info.hh" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" #undef AUL_API #define AUL_API extern "C" API diff --git a/src/aul_proc.cc b/src/aul/aul_proc.cc similarity index 98% rename from src/aul_proc.cc rename to src/aul/aul_proc.cc index dd53c69..e592975 100644 --- a/src/aul_proc.cc +++ b/src/aul/aul_proc.cc @@ -14,6 +14,9 @@ * limitations under the License. */ +#include "aul/include/aul_proc.h" + +#include #include #include #include @@ -23,19 +26,15 @@ #include #include -#include - -#include #include #include +#include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul_proc.h" -#include "include/aul_sock.h" - +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" #include "aul/common/file_descriptor.hh" +#include "aul/include/aul_sock.h" using namespace aul; using namespace aul::internal; diff --git a/src/aul_proc_group.cc b/src/aul/aul_proc_group.cc similarity index 96% rename from src/aul_proc_group.cc rename to src/aul/aul_proc_group.cc index d42104e..fd34ba2 100644 --- a/src/aul_proc_group.cc +++ b/src/aul/aul_proc_group.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/aul_proc_group.h" +#include "aul/include/aul_proc_group.h" #include #include @@ -22,13 +22,12 @@ #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul_error.h" -#include "include/aul_sock.h" - +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" #include "aul/common/file_descriptor.hh" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" using namespace aul; using namespace aul::internal; diff --git a/src/aul_rpc_port.cc b/src/aul/aul_rpc_port.cc similarity index 97% rename from src/aul_rpc_port.cc rename to src/aul/aul_rpc_port.cc index 492d9e2..7a8d68b 100644 --- a/src/aul_rpc_port.cc +++ b/src/aul/aul_rpc_port.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "aul/include/aul_rpc_port.h" + #include #include #include @@ -24,15 +26,14 @@ #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_app_com.h" -#include "include/aul_error.h" -#include "include/aul_rpc_port.h" -#include "include/aul_sock.h" -#include "include/aul_svc.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" +#include "aul/include/aul_app_com.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" +#include "aul/include/aul_svc.h" using namespace aul::internal; diff --git a/src/aul_rsc_mgr.c b/src/aul/aul_rsc_mgr.c similarity index 100% rename from src/aul_rsc_mgr.c rename to src/aul/aul_rsc_mgr.c diff --git a/src/aul_rsc_mgr_internal.c b/src/aul/aul_rsc_mgr_internal.c similarity index 100% rename from src/aul_rsc_mgr_internal.c rename to src/aul/aul_rsc_mgr_internal.c diff --git a/src/aul_rsc_mgr_internal.h b/src/aul/aul_rsc_mgr_internal.h similarity index 100% rename from src/aul_rsc_mgr_internal.h rename to src/aul/aul_rsc_mgr_internal.h diff --git a/src/aul_rsc_mgr_schema.h b/src/aul/aul_rsc_mgr_schema.h similarity index 100% rename from src/aul_rsc_mgr_schema.h rename to src/aul/aul_rsc_mgr_schema.h diff --git a/src/aul_running_context.c b/src/aul/aul_running_context.c similarity index 100% rename from src/aul_running_context.c rename to src/aul/aul_running_context.c diff --git a/src/aul_screen_connector.c b/src/aul/aul_screen_connector.c similarity index 100% rename from src/aul_screen_connector.c rename to src/aul/aul_screen_connector.c diff --git a/src/aul_sock.cc b/src/aul/aul_sock.cc similarity index 99% rename from src/aul_sock.cc rename to src/aul/aul_sock.cc index 23903a3..88007fa 100644 --- a/src/aul_sock.cc +++ b/src/aul/aul_sock.cc @@ -14,8 +14,9 @@ * limitations under the License. */ -#include "include/aul_sock.h" +#include "aul/include/aul_sock.h" +#include #include #include #include @@ -29,16 +30,13 @@ #include #include -#include - -#include "aul_api.h" -#include "aul_key.h" -#include "aul_util.h" - +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/cpu_inheritance.hh" +#include "aul/include/aul_key.h" #include "aul/socket/client_socket.hh" #include "aul/socket/packet.hh" #include "aul/socket/server_socket.hh" -#include "cpu_inheritance.hh" using namespace aul; diff --git a/src/aul_svc.cc b/src/aul/aul_svc.cc similarity index 99% rename from src/aul_svc.cc rename to src/aul/aul_svc.cc index 389dc50..73ff1b8 100644 --- a/src/aul_svc.cc +++ b/src/aul/aul_svc.cc @@ -34,16 +34,16 @@ #include #include "aul/app_control/resolve_info.hh" -#include "include/aul.h" -#include "include/aul_app_group.h" -#include "include/aul_error.h" -#include "include/aul_sock.h" -#include "include/aul_svc.h" -#include "include/aul_svc_internal.h" -#include "src/aul_api.h" -#include "src/aul_svc_priv_key.h" -#include "src/aul_util.h" -#include "src/launch.h" +#include "aul/include/aul.h" +#include "aul/include/aul_app_group.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" +#include "aul/include/aul_svc.h" +#include "aul/include/aul_svc_internal.h" +#include "aul/aul_api.h" +#include "aul/aul_svc_priv_key.h" +#include "aul/aul_util.h" +#include "aul/launch.h" #undef MAX_MIME_STR_SIZE #define MAX_MIME_STR_SIZE 256 diff --git a/src/aul_svc_priv_key.h b/src/aul/aul_svc_priv_key.h similarity index 100% rename from src/aul_svc_priv_key.h rename to src/aul/aul_svc_priv_key.h diff --git a/src/aul_util.c b/src/aul/aul_util.c similarity index 100% rename from src/aul_util.c rename to src/aul/aul_util.c diff --git a/src/aul_util.h b/src/aul/aul_util.h similarity index 100% rename from src/aul_util.h rename to src/aul/aul_util.h diff --git a/src/aul_watch_control.cc b/src/aul/aul_watch_control.cc similarity index 92% rename from src/aul_watch_control.cc rename to src/aul/aul_watch_control.cc index d21936a..41a1c98 100644 --- a/src/aul_watch_control.cc +++ b/src/aul/aul_watch_control.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "include/aul_watch_control.h" +#include "aul/include/aul_watch_control.h" #include -#include #include +#include -#include "aul_api.h" -#include "aul_util.h" -#include "aul_watch_control_internal.h" -#include "include/aul.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/aul_watch_control_internal.h" +#include "aul/include/aul.h" namespace { diff --git a/src/aul_watch_control_internal.h b/src/aul/aul_watch_control_internal.h similarity index 100% rename from src/aul_watch_control_internal.h rename to src/aul/aul_watch_control_internal.h diff --git a/src/aul_watchdog.cc b/src/aul/aul_watchdog.cc similarity index 95% rename from src/aul_watchdog.cc rename to src/aul/aul_watchdog.cc index 069a5f3..fdceabd 100644 --- a/src/aul_watchdog.cc +++ b/src/aul/aul_watchdog.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "include/aul_watchdog.h" +#include "aul/include/aul_watchdog.h" #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_error.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" #include "aul/common/exception.hh" +#include "aul/include/aul.h" +#include "aul/include/aul_error.h" using namespace aul; diff --git a/src/aul_window.cc b/src/aul/aul_window.cc similarity index 98% rename from src/aul_window.cc rename to src/aul/aul_window.cc index 56b5752..4b0f720 100644 --- a/src/aul_window.cc +++ b/src/aul/aul_window.cc @@ -14,25 +14,25 @@ * limitations under the License. */ +#include "aul/include/aul_window.h" + +#include #include #include #include #include -#include - #include #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul.h" -#include "include/aul_app_com.h" -#include "include/aul_cmd.h" -#include "include/aul_window.h" -#include "launch.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" +#include "aul/include/aul_app_com.h" +#include "aul/include/aul_cmd.h" +#include "aul/launch.h" using namespace aul; using namespace aul::internal; diff --git a/src/aul_worker.c b/src/aul/aul_worker.c similarity index 100% rename from src/aul_worker.c rename to src/aul/aul_worker.c diff --git a/src/aul_worker.h b/src/aul/aul_worker.h similarity index 100% rename from src/aul_worker.h rename to src/aul/aul_worker.h diff --git a/aul/common/api.hh b/src/aul/common/api.hh similarity index 100% rename from aul/common/api.hh rename to src/aul/common/api.hh diff --git a/aul/common/common.hh b/src/aul/common/common.hh similarity index 100% rename from aul/common/common.hh rename to src/aul/common/common.hh diff --git a/aul/common/exception.hh b/src/aul/common/exception.hh similarity index 100% rename from aul/common/exception.hh rename to src/aul/common/exception.hh diff --git a/aul/common/file_descriptor.hh b/src/aul/common/file_descriptor.hh similarity index 100% rename from aul/common/file_descriptor.hh rename to src/aul/common/file_descriptor.hh diff --git a/aul/common/log_private.hh b/src/aul/common/log_private.hh similarity index 100% rename from aul/common/log_private.hh rename to src/aul/common/log_private.hh diff --git a/aul/common/util.hh b/src/aul/common/util.hh similarity index 100% rename from aul/common/util.hh rename to src/aul/common/util.hh diff --git a/aul/component/component_info.cc b/src/aul/component/component_info.cc similarity index 100% rename from aul/component/component_info.cc rename to src/aul/component/component_info.cc diff --git a/aul/component/component_info.hh b/src/aul/component/component_info.hh similarity index 100% rename from aul/component/component_info.hh rename to src/aul/component/component_info.hh diff --git a/aul/component/component_port.cc b/src/aul/component/component_port.cc similarity index 100% rename from aul/component/component_port.cc rename to src/aul/component/component_port.cc diff --git a/aul/component/component_port.hh b/src/aul/component/component_port.hh similarity index 100% rename from aul/component/component_port.hh rename to src/aul/component/component_port.hh diff --git a/aul/component/component_running_context.cc b/src/aul/component/component_running_context.cc similarity index 100% rename from aul/component/component_running_context.cc rename to src/aul/component/component_running_context.cc diff --git a/aul/component/component_running_context.hh b/src/aul/component/component_running_context.hh similarity index 100% rename from aul/component/component_running_context.hh rename to src/aul/component/component_running_context.hh diff --git a/aul/component/localized_info.cc b/src/aul/component/localized_info.cc similarity index 100% rename from aul/component/localized_info.cc rename to src/aul/component/localized_info.cc diff --git a/aul/component/localized_info.hh b/src/aul/component/localized_info.hh similarity index 100% rename from aul/component/localized_info.hh rename to src/aul/component/localized_info.hh diff --git a/src/cpu_inheritance.cc b/src/aul/cpu_inheritance.cc similarity index 95% rename from src/cpu_inheritance.cc rename to src/aul/cpu_inheritance.cc index 3eac883..1a7b6b2 100644 --- a/src/cpu_inheritance.cc +++ b/src/aul/cpu_inheritance.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "cpu_inheritance.hh" +#include "aul/cpu_inheritance.hh" #include -#include "include/aul_cmd.h" -#include "aul_util.h" +#include "aul/aul_util.h" +#include "aul/include/aul_cmd.h" namespace aul { namespace internal { diff --git a/src/cpu_inheritance.hh b/src/aul/cpu_inheritance.hh similarity index 100% rename from src/cpu_inheritance.hh rename to src/aul/cpu_inheritance.hh diff --git a/include/aul.h b/src/aul/include/aul.h similarity index 100% rename from include/aul.h rename to src/aul/include/aul.h diff --git a/include/aul_app_com.h b/src/aul/include/aul_app_com.h similarity index 100% rename from include/aul_app_com.h rename to src/aul/include/aul_app_com.h diff --git a/include/aul_app_group.h b/src/aul/include/aul_app_group.h similarity index 100% rename from include/aul_app_group.h rename to src/aul/include/aul_app_group.h diff --git a/include/aul_cmd.h b/src/aul/include/aul_cmd.h similarity index 100% rename from include/aul_cmd.h rename to src/aul/include/aul_cmd.h diff --git a/include/aul_comp_context.h b/src/aul/include/aul_comp_context.h similarity index 100% rename from include/aul_comp_context.h rename to src/aul/include/aul_comp_context.h diff --git a/include/aul_comp_info.h b/src/aul/include/aul_comp_info.h similarity index 100% rename from include/aul_comp_info.h rename to src/aul/include/aul_comp_info.h diff --git a/include/aul_comp_status.h b/src/aul/include/aul_comp_status.h similarity index 100% rename from include/aul_comp_status.h rename to src/aul/include/aul_comp_status.h diff --git a/include/aul_comp_types.h b/src/aul/include/aul_comp_types.h similarity index 100% rename from include/aul_comp_types.h rename to src/aul/include/aul_comp_types.h diff --git a/include/aul_complication.h b/src/aul/include/aul_complication.h similarity index 100% rename from include/aul_complication.h rename to src/aul/include/aul_complication.h diff --git a/include/aul_debug_info.h b/src/aul/include/aul_debug_info.h similarity index 100% rename from include/aul_debug_info.h rename to src/aul/include/aul_debug_info.h diff --git a/include/aul_error.h b/src/aul/include/aul_error.h similarity index 100% rename from include/aul_error.h rename to src/aul/include/aul_error.h diff --git a/include/aul_job_scheduler.h b/src/aul/include/aul_job_scheduler.h similarity index 100% rename from include/aul_job_scheduler.h rename to src/aul/include/aul_job_scheduler.h diff --git a/include/aul_key.h b/src/aul/include/aul_key.h similarity index 100% rename from include/aul_key.h rename to src/aul/include/aul_key.h diff --git a/include/aul_launcher_service.h b/src/aul/include/aul_launcher_service.h similarity index 100% rename from include/aul_launcher_service.h rename to src/aul/include/aul_launcher_service.h diff --git a/include/aul_proc.h b/src/aul/include/aul_proc.h similarity index 100% rename from include/aul_proc.h rename to src/aul/include/aul_proc.h diff --git a/include/aul_proc_group.h b/src/aul/include/aul_proc_group.h similarity index 100% rename from include/aul_proc_group.h rename to src/aul/include/aul_proc_group.h diff --git a/include/aul_rpc_port.h b/src/aul/include/aul_rpc_port.h similarity index 100% rename from include/aul_rpc_port.h rename to src/aul/include/aul_rpc_port.h diff --git a/include/aul_rsc_mgr.h b/src/aul/include/aul_rsc_mgr.h similarity index 100% rename from include/aul_rsc_mgr.h rename to src/aul/include/aul_rsc_mgr.h diff --git a/include/aul_running_context.h b/src/aul/include/aul_running_context.h similarity index 100% rename from include/aul_running_context.h rename to src/aul/include/aul_running_context.h diff --git a/include/aul_screen_connector.h b/src/aul/include/aul_screen_connector.h similarity index 100% rename from include/aul_screen_connector.h rename to src/aul/include/aul_screen_connector.h diff --git a/include/aul_sock.h b/src/aul/include/aul_sock.h similarity index 100% rename from include/aul_sock.h rename to src/aul/include/aul_sock.h diff --git a/include/aul_svc.h b/src/aul/include/aul_svc.h similarity index 100% rename from include/aul_svc.h rename to src/aul/include/aul_svc.h diff --git a/include/aul_svc_internal.h b/src/aul/include/aul_svc_internal.h similarity index 100% rename from include/aul_svc_internal.h rename to src/aul/include/aul_svc_internal.h diff --git a/include/aul_watch_control.h b/src/aul/include/aul_watch_control.h similarity index 100% rename from include/aul_watch_control.h rename to src/aul/include/aul_watch_control.h diff --git a/include/aul_watchdog.h b/src/aul/include/aul_watchdog.h similarity index 100% rename from include/aul_watchdog.h rename to src/aul/include/aul_watchdog.h diff --git a/include/aul_widget.h b/src/aul/include/aul_widget.h similarity index 100% rename from include/aul_widget.h rename to src/aul/include/aul_widget.h diff --git a/include/aul_window.h b/src/aul/include/aul_window.h similarity index 99% rename from include/aul_window.h rename to src/aul/include/aul_window.h index 22c944f..91352e2 100644 --- a/include/aul_window.h +++ b/src/aul/include/aul_window.h @@ -17,6 +17,7 @@ #pragma once #include +#include #ifdef __cplusplus extern "C" { diff --git a/src/launch.cc b/src/aul/launch.cc similarity index 98% rename from src/launch.cc rename to src/aul/launch.cc index adf2559..48a6ea3 100644 --- a/src/launch.cc +++ b/src/aul/launch.cc @@ -14,6 +14,8 @@ * limitations under the License. */ +#include "aul/launch.h" + #include #include #include @@ -34,15 +36,14 @@ #include #include -#include "app_request.h" -#include "app_signal.h" -#include "aul.h" -#include "aul_api.h" -#include "aul_app_com.h" -#include "aul_error.h" -#include "aul_sock.h" -#include "aul_util.h" -#include "launch.h" +#include "aul/app_request.h" +#include "aul/app_signal.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" +#include "aul/include/aul_app_com.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" using namespace aul::internal; diff --git a/src/launch.h b/src/aul/launch.h similarity index 99% rename from src/launch.h rename to src/aul/launch.h index 50919ae..74ea1c0 100644 --- a/src/launch.h +++ b/src/aul/launch.h @@ -17,6 +17,7 @@ #pragma once #include +#include #ifdef __cplusplus extern "C" { diff --git a/src/launch_with_result.cc b/src/aul/launch_with_result.cc similarity index 98% rename from src/launch_with_result.cc rename to src/aul/launch_with_result.cc index 1bbca55..25ca3ff 100644 --- a/src/launch_with_result.cc +++ b/src/aul/launch_with_result.cc @@ -15,8 +15,8 @@ */ #include -#include #include +#include #include #include @@ -24,16 +24,16 @@ #include #include -#include "app_request.h" -#include "aul.h" -#include "aul_api.h" -#include "aul_error.h" -#include "aul_sock.h" -#include "aul_svc.h" -#include "aul_svc_priv_key.h" -#include "aul_util.h" -#include "cpu_inheritance.hh" -#include "launch.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_svc_priv_key.h" +#include "aul/aul_util.h" +#include "aul/cpu_inheritance.hh" +#include "aul/include/aul.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" +#include "aul/include/aul_svc.h" +#include "aul/launch.h" using namespace aul::internal; diff --git a/src/menu_db_util.h b/src/aul/menu_db_util.h similarity index 100% rename from src/menu_db_util.h rename to src/aul/menu_db_util.h diff --git a/src/mime.c b/src/aul/mime.c similarity index 100% rename from src/mime.c rename to src/aul/mime.c diff --git a/src/miregex.c b/src/aul/miregex.c similarity index 100% rename from src/miregex.c rename to src/aul/miregex.c diff --git a/src/miregex.h b/src/aul/miregex.h similarity index 100% rename from src/miregex.h rename to src/aul/miregex.h diff --git a/src/pkginfo.cc b/src/aul/pkginfo.cc similarity index 98% rename from src/pkginfo.cc rename to src/aul/pkginfo.cc index 9716bce..6aa7d2f 100644 --- a/src/pkginfo.cc +++ b/src/aul/pkginfo.cc @@ -14,8 +14,6 @@ * limitations under the License. */ -#include "pkginfo_internal.h" - #include #include #include @@ -30,14 +28,14 @@ #include #include -#include "app_request.h" -#include "aul_api.h" -#include "aul_error.h" -#include "aul_util.h" -#include "menu_db_util.h" -#include "include/aul.h" -#include "include/aul_error.h" -#include "include/aul_sock.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" +#include "aul/include/aul.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" +#include "aul/menu_db_util.h" +#include "aul/pkginfo_internal.h" using namespace aul::internal; diff --git a/src/pkginfo_internal.h b/src/aul/pkginfo_internal.h similarity index 100% rename from src/pkginfo_internal.h rename to src/aul/pkginfo_internal.h diff --git a/aul/socket/client.cc b/src/aul/socket/client.cc similarity index 100% rename from aul/socket/client.cc rename to src/aul/socket/client.cc diff --git a/aul/socket/client.hh b/src/aul/socket/client.hh similarity index 100% rename from aul/socket/client.hh rename to src/aul/socket/client.hh diff --git a/aul/socket/client_socket.cc b/src/aul/socket/client_socket.cc similarity index 100% rename from aul/socket/client_socket.cc rename to src/aul/socket/client_socket.cc diff --git a/aul/socket/client_socket.hh b/src/aul/socket/client_socket.hh similarity index 100% rename from aul/socket/client_socket.hh rename to src/aul/socket/client_socket.hh diff --git a/aul/socket/packet.cc b/src/aul/socket/packet.cc similarity index 100% rename from aul/socket/packet.cc rename to src/aul/socket/packet.cc diff --git a/aul/socket/packet.hh b/src/aul/socket/packet.hh similarity index 100% rename from aul/socket/packet.hh rename to src/aul/socket/packet.hh diff --git a/aul/socket/server_socket.cc b/src/aul/socket/server_socket.cc similarity index 100% rename from aul/socket/server_socket.cc rename to src/aul/socket/server_socket.cc diff --git a/aul/socket/server_socket.hh b/src/aul/socket/server_socket.hh similarity index 100% rename from aul/socket/server_socket.hh rename to src/aul/socket/server_socket.hh diff --git a/aul/socket/socket.cc b/src/aul/socket/socket.cc similarity index 100% rename from aul/socket/socket.cc rename to src/aul/socket/socket.cc diff --git a/aul/socket/socket.hh b/src/aul/socket/socket.hh similarity index 100% rename from aul/socket/socket.hh rename to src/aul/socket/socket.hh diff --git a/src/status.cc b/src/aul/status.cc similarity index 97% rename from src/status.cc rename to src/aul/status.cc index 6e36738..4d419d0 100644 --- a/src/status.cc +++ b/src/aul/status.cc @@ -14,27 +14,24 @@ * limitations under the License. */ -#include "include/aul.h" - +#include #include #include -#include - #include #include #include -#include "aul_api.h" -#include "aul_util.h" -#include "include/aul_app_com.h" -#include "include/aul_error.h" -#include "include/aul_sock.h" -#include "launch.h" - -#include "app_request.h" +#include "aul/app_request.h" +#include "aul/aul_api.h" +#include "aul/aul_util.h" #include "aul/common/exception.hh" -#include "pkginfo_internal.h" +#include "aul/include/aul.h" +#include "aul/include/aul_app_com.h" +#include "aul/include/aul_error.h" +#include "aul/include/aul_sock.h" +#include "aul/launch.h" +#include "aul/pkginfo_internal.h" using namespace aul::internal; diff --git a/src/widget.c b/src/aul/widget.c similarity index 100% rename from src/widget.c rename to src/aul/widget.c diff --git a/src/aul_cmd.c b/src/aul_cmd.c deleted file mode 100644 index bb279a0..0000000 --- a/src/aul_cmd.c +++ /dev/null @@ -1,235 +0,0 @@ -/* - * Copyright (c) 2018 - 2020 Samsung Electronics Co., Ltd. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#define _GNU_SOURCE -#include - -#include "aul_api.h" -#include "aul_cmd.h" - -API const char *aul_cmd_convert_to_string(int cmd) -{ - static const char *cmd_string_table[] = { - "APP_START", - - "APP_OPEN", - "APP_RESUME", - "APP_RESUME_BY_PID", - "APP_TERM_BY_PID", - "APP_TERM_BY_PID_WITHOUT_RESTART", - "APP_RESULT", - "APP_START_RES", - "APP_CANCEL", - "APP_KILL_BY_PID", - "APP_UPDATE_RUA_STAT", - - "APP_ADD_HISTORY", - "APP_REMOVE_HISTORY", - "APP_RUNNING_INFO", - "APP_RUNNING_INFO_RESULT", - "APP_IS_RUNNING", - "APP_GET_APPID_BYPID", - "APP_GET_PKGID_BYPID", - "APP_GET_INFO_OK", - "APP_GET_INFO_ERROR", - "APP_KEY_EVENT", - - "APP_KEY_RESERVE", - "APP_KEY_RELEASE", - "APP_STATUS_UPDATE", - "APP_RUNNING_LIST_UPDATE", - "APP_TERM_REQ_BY_PID", - "APP_TERM_BY_PID_ASYNC", - "APP_TERM_BGAPP_BY_PID", - "APP_PAUSE", - "APP_PAUSE_BY_PID", - "APP_GROUP_GET_WINDOW", - - "APP_GROUP_SET_WINDOW", - "APP_GROUP_GET_FG", - "APP_GROUP_GET_LEADER_PID", - "APP_GROUP_GET_LEADER_PIDS", - "APP_GROUP_GET_GROUP_PIDS", - "APP_GROUP_GET_IDLE_PIDS", - "APP_GROUP_LOWER", - "APP_GROUP_CLEAR_TOP", - "APP_GROUP_ACTIVATE_BELOW", - "APP_GET_STATUS", - - "APP_ADD_LOADER", - "APP_REMOVE_LOADER", - "APP_GET_PID", - "APP_GET_DC_SOCKET_PAIR", - "APP_GET_MP_SOCKET_PAIR", - "APP_COM_CREATE", - "APP_COM_JOIN", - "APP_COM_SEND", - "APP_COM_LEAVE", - "APP_COM_MESSAGE", - - "WIDGET_ADD", - "WIDGET_DEL", - "WIDGET_LIST", - "WIDGET_UPDATE", - "WIDGET_COUNT", - "WIDGET_GET_CONTENT", - "APP_REGISTER_PID", - "APP_WAKE", - "APP_SUSPEND", - "AMD_RELOAD_APPINFO", - - "LAUNCHPAD_DEAD_SIGNAL", - "APP_ALL_RUNNING_INFO", - "APP_SET_APP_CONTROL_DEFAULT_APP", - "APP_UNSET_APP_CONTROL_DEFAULT_APP", - "APP_START_ASYNC", - "APP_SET_PROCESS_GROUP", - "APP_PREPARE_CANDIDATE_PROCESS", - "APP_TERM_BY_PID_SYNC", - "APP_GET_STATUS_BY_APPID", - "APP_GET_LAST_CALLER_PID", - - "APP_TERM_BY_PID_SYNC_WITHOUT_RESTART", - "APP_RESUME_BY_PID_ASYNC", - "APP_SET_ALIAS_APPID", - "APP_UNSET_ALIAS_APPID", - "APP_ENABLE_ALIAS_INFO", - "APP_DISABLE_ALIAS_INFO", - "APP_GROUP_ACTIVATE_ABOVE", - "ADD_APP_SCREEN", - "REMOVE_APP_SCREEN", - "APP_UPDATE_REQUESTED", - - "ADD_SCREEN_VIEWER", - "REMOVE_SCREEN_VIEWER", - "LAUNCHPAD_LAUNCH_SIGNAL", - "APP_RUNNING_INSTANCE_INFO", - "APP_GET_INSTANCE_ID_BYPID", - "APP_SET_CACHE", - "APP_GET_APPID_FROM_CACHE", - "APP_INVALIDATE_CACHE", - "APP_STARTUP_SIGNAL", - "APP_WINDOW_ATTACH", - - "APP_WINDOW_DETACH", - "APP_START_RES_ASYNC", - "APP_NOTIFY_EXIT", - "APP_GET_APPID_BY_SURFACE_ID", - "APP_GET_INSTANCE_ID_BY_SURFACE_ID", - "UPDATE_SCREEN_VIEWER_STATUS", - "WIDGET_RUNNING_INFO", - "JOB_STATUS_UPDATE", - "WIDGET_CHANGE_STATUS", - "RPC_PORT_PREPARE_STUB", - - "RPC_PORT_CREATE_SOCKET_PAIR", - "RPC_PORT_NOTIFY_RPC_FINISHED", - "COMPLICATION_UPDATE_REQUEST", - "APP_NOTIFY_START", - "WATCHDOG_ENABLE", - "WATCHDOG_DISABLE", - "WATCHDOG_PING", - "WATCHDOG_KICK", - "APP_SEND_LAUNCH_REQUEST", - "APP_SEND_LAUNCH_REQUEST_SYNC", - - "COMP_NOTIFY_START", - "COMP_NOTIFY_EXIT", - "COMP_STATUS_UPDATE", - "APP_TERM_INSTANCE_ASYNC", - "APP_GROUP_SET_WINDOW_V2", - "APP_GROUP_LOWER_V2", - "APP_GROUP_GET_LEADER_IDS", - "APP_GROUP_GET_GROUP_INFO", - "APP_GROUP_GET_IDLE_INFO", - "COMP_CONTEXT_FOREACH", - - "COMP_CONTEXT_GET", - "COMP_CONTEXT_IS_RUNNING", - "COMP_CONTEXT_RESUME", - "COMP_CONTEXT_PAUSE", - "COMP_CONTEXT_TERMINATE_BG_COMP", - "COMP_CONTEXT_TERMINATE", - "APP_RESUME_INSTANCE", - "APP_PAUSE_INSTANCE", - "APP_TERM_BG_INSTANCE", - "LAUNCHPAD_CHILD_PROCESS", /* unused */ - - "COMP_INFO_GET", - "COMP_INFO_FOREACH", - "APP_TERMINATE", - "APP_IS_RUNNING_V2", - "ANR_NOTIFY", - "APP_GET_RUNNING_CONTEXT", - "LAUNCHER_SERVICE_NOTIFY_ANIMATION_STARTED", - "LAUNCHER_SERVICE_NOTIFY_ANIMATION_FINISHED", - "APP_SEND_RESUME_REQUEST", - "APP_PREPARE_APP_DEFINED_LOADER", - - "WIDGET_DISABLE", - "TRIGGER_APP_SCREEN_FOCUSED_FORCE", - "WIDGET_EVENT", - "SET_PRIVATE_SHARING", - "UNSET_PRIVATE_SHARING", - "APP_CONTEXT_GET", - "APP_CONTEXT_GET_BY_INSTANCE_ID", - "APP_CONTEXT_GET_BY_PID", - "APP_GROUP_ADD", - "APP_GROUP_REMOVE", - - "APP_GET_APPID_LIST", - "COMP_PORT_EXIST", - "COMP_PORT_CREATE", - "COMP_PORT_DESTROY", - "APP_LIFECYCLE_UPDATE_STATE", - - "APP_STATUS_UPDATE_V2", - "APP_GET_APP_CONTROL_DEFAULT_APPS", - "APP_GET_APPID_BY_ALIAS_APPID", - "APP_GET_APP_CONTROL_DEFAULT_APP", - "APP_LIFECYCLE_GET_STATE", - - "PROC_REGISTER", - "PROC_DEREGISTER", - "PROC_GET_NAME", - "PROC_GET_EXTRA", - "RPC_PORT_CREATE", - - "RPC_PORT_DESTROY", - "RPC_PORT_EXIST", - "APP_WINDOW_ATTACH_BELOW", - "PROC_GROUP_ADD", - "PROC_GROUP_REMOVE", - - "APP_CONNECT", - "APP_SET_AUTO_RESTART", - "BOOT_SEQUENCE_START_APP", - "BOOT_SEQUENCE_GET_APPINFO_LIST", - "BOOT_SEQUENCE_RELOAD", - - "PKG_PRE_EVENT_SEND", - "PROC_GROUP_FOREACH", - "PROC_GROUP_GET", - - "CUSTOM_COMMAND" - }; - - if (cmd < 0 || cmd >= APP_CMD_MAX) - return cmd_string_table[APP_CMD_MAX]; - - return cmd_string_table[cmd]; -} diff --git a/src/aul_error.c b/src/aul_error.c deleted file mode 100644 index 162698d..0000000 --- a/src/aul_error.c +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#define _GNU_SOURCE -#include - -#include "aul_util.h" -#include "aul_error.h" -#include "aul_sock.h" -#include "aul.h" - -int aul_error_convert(int res) -{ - int ret; - - switch (res) { - case -ENOMEM: - ret = AUL_R_ENOMEM; - break; - case -EREJECTED: - ret = AUL_R_EREJECTED; - break; - case -ENOENT: - ret = AUL_R_ENOAPP; - break; - case -ETERMINATING: - ret = AUL_R_ETERMINATING; - break; - case -EILLEGALACCESS: - ret = AUL_R_EILLACC; - break; - case -ELOCALLAUNCH_ID: - ret = AUL_R_LOCAL; - break; - case -EAGAIN: - ret = AUL_R_ETIMEOUT; - break; - case -EINVAL: - ret = AUL_R_EINVAL; - break; - case -ECOMM: - ret = AUL_R_ECOMM; - break; - case -ECANCELED: - ret = AUL_R_ECANCELED; - break; - default: - ret = AUL_R_ERROR; - break; - } - - return ret; -} - diff --git a/parser/CMakeLists.txt b/src/parser/CMakeLists.txt similarity index 100% rename from parser/CMakeLists.txt rename to src/parser/CMakeLists.txt diff --git a/parser/boot-sequencer/CMakeLists.txt b/src/parser/boot-sequencer/CMakeLists.txt similarity index 100% rename from parser/boot-sequencer/CMakeLists.txt rename to src/parser/boot-sequencer/CMakeLists.txt diff --git a/parser/boot-sequencer/app_info.cc b/src/parser/boot-sequencer/app_info.cc similarity index 100% rename from parser/boot-sequencer/app_info.cc rename to src/parser/boot-sequencer/app_info.cc diff --git a/parser/boot-sequencer/app_info.hh b/src/parser/boot-sequencer/app_info.hh similarity index 100% rename from parser/boot-sequencer/app_info.hh rename to src/parser/boot-sequencer/app_info.hh diff --git a/parser/boot-sequencer/appsvc_db.cc b/src/parser/boot-sequencer/appsvc_db.cc similarity index 100% rename from parser/boot-sequencer/appsvc_db.cc rename to src/parser/boot-sequencer/appsvc_db.cc diff --git a/parser/boot-sequencer/appsvc_db.hh b/src/parser/boot-sequencer/appsvc_db.hh similarity index 100% rename from parser/boot-sequencer/appsvc_db.hh rename to src/parser/boot-sequencer/appsvc_db.hh diff --git a/parser/boot-sequencer/cert_checker.cc b/src/parser/boot-sequencer/cert_checker.cc similarity index 100% rename from parser/boot-sequencer/cert_checker.cc rename to src/parser/boot-sequencer/cert_checker.cc diff --git a/parser/boot-sequencer/cert_checker.hh b/src/parser/boot-sequencer/cert_checker.hh similarity index 100% rename from parser/boot-sequencer/cert_checker.hh rename to src/parser/boot-sequencer/cert_checker.hh diff --git a/parser/boot-sequencer/data/boot-sequencer.info b/src/parser/boot-sequencer/data/boot-sequencer.info similarity index 100% rename from parser/boot-sequencer/data/boot-sequencer.info rename to src/parser/boot-sequencer/data/boot-sequencer.info diff --git a/parser/boot-sequencer/database.cc b/src/parser/boot-sequencer/database.cc similarity index 100% rename from parser/boot-sequencer/database.cc rename to src/parser/boot-sequencer/database.cc diff --git a/parser/boot-sequencer/database.hh b/src/parser/boot-sequencer/database.hh similarity index 100% rename from parser/boot-sequencer/database.hh rename to src/parser/boot-sequencer/database.hh diff --git a/parser/boot-sequencer/event_type.hh b/src/parser/boot-sequencer/event_type.hh similarity index 100% rename from parser/boot-sequencer/event_type.hh rename to src/parser/boot-sequencer/event_type.hh diff --git a/parser/boot-sequencer/exception.cc b/src/parser/boot-sequencer/exception.cc similarity index 100% rename from parser/boot-sequencer/exception.cc rename to src/parser/boot-sequencer/exception.cc diff --git a/parser/boot-sequencer/exception.hh b/src/parser/boot-sequencer/exception.hh similarity index 100% rename from parser/boot-sequencer/exception.hh rename to src/parser/boot-sequencer/exception.hh diff --git a/parser/boot-sequencer/log_private.hh b/src/parser/boot-sequencer/log_private.hh similarity index 100% rename from parser/boot-sequencer/log_private.hh rename to src/parser/boot-sequencer/log_private.hh diff --git a/parser/boot-sequencer/package_event_args.cc b/src/parser/boot-sequencer/package_event_args.cc similarity index 100% rename from parser/boot-sequencer/package_event_args.cc rename to src/parser/boot-sequencer/package_event_args.cc diff --git a/parser/boot-sequencer/package_event_args.hh b/src/parser/boot-sequencer/package_event_args.hh similarity index 100% rename from parser/boot-sequencer/package_event_args.hh rename to src/parser/boot-sequencer/package_event_args.hh diff --git a/parser/boot-sequencer/parser_plugin.cc b/src/parser/boot-sequencer/parser_plugin.cc similarity index 100% rename from parser/boot-sequencer/parser_plugin.cc rename to src/parser/boot-sequencer/parser_plugin.cc diff --git a/parser/boot-sequencer/parser_plugin.hh b/src/parser/boot-sequencer/parser_plugin.hh similarity index 100% rename from parser/boot-sequencer/parser_plugin.hh rename to src/parser/boot-sequencer/parser_plugin.hh diff --git a/parser/boot-sequencer/pkgmgr_interface.cc b/src/parser/boot-sequencer/pkgmgr_interface.cc similarity index 100% rename from parser/boot-sequencer/pkgmgr_interface.cc rename to src/parser/boot-sequencer/pkgmgr_interface.cc diff --git a/parser/component/CMakeLists.txt b/src/parser/component/CMakeLists.txt similarity index 100% rename from parser/component/CMakeLists.txt rename to src/parser/component/CMakeLists.txt diff --git a/parser/component/data/component.info b/src/parser/component/data/component.info similarity index 100% rename from parser/component/data/component.info rename to src/parser/component/data/component.info diff --git a/parser/component/data/component_db.sql.in b/src/parser/component/data/component_db.sql.in similarity index 100% rename from parser/component/data/component_db.sql.in rename to src/parser/component/data/component_db.sql.in diff --git a/parser/component/inc/component_plugin_parser.h b/src/parser/component/inc/component_plugin_parser.h similarity index 100% rename from parser/component/inc/component_plugin_parser.h rename to src/parser/component/inc/component_plugin_parser.h diff --git a/parser/component/inc/component_plugin_parser_db.h b/src/parser/component/inc/component_plugin_parser_db.h similarity index 100% rename from parser/component/inc/component_plugin_parser_db.h rename to src/parser/component/inc/component_plugin_parser_db.h diff --git a/parser/component/inc/component_plugin_parser_handler.h b/src/parser/component/inc/component_plugin_parser_handler.h similarity index 100% rename from parser/component/inc/component_plugin_parser_handler.h rename to src/parser/component/inc/component_plugin_parser_handler.h diff --git a/parser/component/inc/component_plugin_parser_private.h b/src/parser/component/inc/component_plugin_parser_private.h similarity index 100% rename from parser/component/inc/component_plugin_parser_private.h rename to src/parser/component/inc/component_plugin_parser_private.h diff --git a/parser/component/inc/component_plugin_parser_type.h b/src/parser/component/inc/component_plugin_parser_type.h similarity index 100% rename from parser/component/inc/component_plugin_parser_type.h rename to src/parser/component/inc/component_plugin_parser_type.h diff --git a/parser/component/script/14_component-add.post.in b/src/parser/component/script/14_component-add.post.in similarity index 100% rename from parser/component/script/14_component-add.post.in rename to src/parser/component/script/14_component-add.post.in diff --git a/parser/component/script/501.component_upgrade.sh.in b/src/parser/component/script/501.component_upgrade.sh.in similarity index 100% rename from parser/component/script/501.component_upgrade.sh.in rename to src/parser/component/script/501.component_upgrade.sh.in diff --git a/parser/component/script/upgrade/1_component_db_upgrade.sh.in b/src/parser/component/script/upgrade/1_component_db_upgrade.sh.in similarity index 100% rename from parser/component/script/upgrade/1_component_db_upgrade.sh.in rename to src/parser/component/script/upgrade/1_component_db_upgrade.sh.in diff --git a/parser/component/src/component_plugin_parser.c b/src/parser/component/src/component_plugin_parser.c similarity index 100% rename from parser/component/src/component_plugin_parser.c rename to src/parser/component/src/component_plugin_parser.c diff --git a/parser/component/src/component_plugin_parser_db.c b/src/parser/component/src/component_plugin_parser_db.c similarity index 100% rename from parser/component/src/component_plugin_parser_db.c rename to src/parser/component/src/component_plugin_parser_db.c diff --git a/parser/component/src/component_plugin_parser_handler.c b/src/parser/component/src/component_plugin_parser_handler.c similarity index 100% rename from parser/component/src/component_plugin_parser_handler.c rename to src/parser/component/src/component_plugin_parser_handler.c diff --git a/parser/component/src/component_plugin_parser_pkgmgr_interface.c b/src/parser/component/src/component_plugin_parser_pkgmgr_interface.c similarity index 100% rename from parser/component/src/component_plugin_parser_pkgmgr_interface.c rename to src/parser/component/src/component_plugin_parser_pkgmgr_interface.c diff --git a/parser/exec-checker/CMakeLists.txt b/src/parser/exec-checker/CMakeLists.txt similarity index 100% rename from parser/exec-checker/CMakeLists.txt rename to src/parser/exec-checker/CMakeLists.txt diff --git a/parser/exec-checker/data/exec-checker.info b/src/parser/exec-checker/data/exec-checker.info similarity index 100% rename from parser/exec-checker/data/exec-checker.info rename to src/parser/exec-checker/data/exec-checker.info diff --git a/parser/exec-checker/inc/exec_checker.hh b/src/parser/exec-checker/inc/exec_checker.hh similarity index 100% rename from parser/exec-checker/inc/exec_checker.hh rename to src/parser/exec-checker/inc/exec_checker.hh diff --git a/parser/exec-checker/inc/exec_checker_private.hh b/src/parser/exec-checker/inc/exec_checker_private.hh similarity index 100% rename from parser/exec-checker/inc/exec_checker_private.hh rename to src/parser/exec-checker/inc/exec_checker_private.hh diff --git a/parser/exec-checker/inc/plugin_manager.hh b/src/parser/exec-checker/inc/plugin_manager.hh similarity index 100% rename from parser/exec-checker/inc/plugin_manager.hh rename to src/parser/exec-checker/inc/plugin_manager.hh diff --git a/parser/exec-checker/src/exec_checker.cc b/src/parser/exec-checker/src/exec_checker.cc similarity index 100% rename from parser/exec-checker/src/exec_checker.cc rename to src/parser/exec-checker/src/exec_checker.cc diff --git a/parser/exec-checker/src/exec_checker_plugin_interface.cc b/src/parser/exec-checker/src/exec_checker_plugin_interface.cc similarity index 100% rename from parser/exec-checker/src/exec_checker_plugin_interface.cc rename to src/parser/exec-checker/src/exec_checker_plugin_interface.cc diff --git a/parser/exec-checker/src/plugin_manager.cc b/src/parser/exec-checker/src/plugin_manager.cc similarity index 100% rename from parser/exec-checker/src/plugin_manager.cc rename to src/parser/exec-checker/src/plugin_manager.cc diff --git a/parser/metadata/CMakeLists.txt b/src/parser/metadata/CMakeLists.txt similarity index 100% rename from parser/metadata/CMakeLists.txt rename to src/parser/metadata/CMakeLists.txt diff --git a/parser/metadata/alias-appid/CMakeLists.txt b/src/parser/metadata/alias-appid/CMakeLists.txt similarity index 100% rename from parser/metadata/alias-appid/CMakeLists.txt rename to src/parser/metadata/alias-appid/CMakeLists.txt diff --git a/parser/metadata/alias-appid/alias_info.hh b/src/parser/metadata/alias-appid/alias_info.hh similarity index 100% rename from parser/metadata/alias-appid/alias_info.hh rename to src/parser/metadata/alias-appid/alias_info.hh diff --git a/parser/metadata/alias-appid/appsvc_db.cc b/src/parser/metadata/alias-appid/appsvc_db.cc similarity index 100% rename from parser/metadata/alias-appid/appsvc_db.cc rename to src/parser/metadata/alias-appid/appsvc_db.cc diff --git a/parser/metadata/alias-appid/appsvc_db.hh b/src/parser/metadata/alias-appid/appsvc_db.hh similarity index 100% rename from parser/metadata/alias-appid/appsvc_db.hh rename to src/parser/metadata/alias-appid/appsvc_db.hh diff --git a/parser/metadata/alias-appid/data/alias-appid.info b/src/parser/metadata/alias-appid/data/alias-appid.info similarity index 100% rename from parser/metadata/alias-appid/data/alias-appid.info rename to src/parser/metadata/alias-appid/data/alias-appid.info diff --git a/parser/metadata/alias-appid/pkgmgr_interface.cc b/src/parser/metadata/alias-appid/pkgmgr_interface.cc similarity index 100% rename from parser/metadata/alias-appid/pkgmgr_interface.cc rename to src/parser/metadata/alias-appid/pkgmgr_interface.cc diff --git a/parser/metadata/alias-appid/plugin_manager.cc b/src/parser/metadata/alias-appid/plugin_manager.cc similarity index 100% rename from parser/metadata/alias-appid/plugin_manager.cc rename to src/parser/metadata/alias-appid/plugin_manager.cc diff --git a/parser/metadata/alias-appid/plugin_manager.hh b/src/parser/metadata/alias-appid/plugin_manager.hh similarity index 100% rename from parser/metadata/alias-appid/plugin_manager.hh rename to src/parser/metadata/alias-appid/plugin_manager.hh diff --git a/parser/metadata/allowed-appid/CMakeLists.txt b/src/parser/metadata/allowed-appid/CMakeLists.txt similarity index 100% rename from parser/metadata/allowed-appid/CMakeLists.txt rename to src/parser/metadata/allowed-appid/CMakeLists.txt diff --git a/parser/metadata/allowed-appid/allowed_info.hh b/src/parser/metadata/allowed-appid/allowed_info.hh similarity index 100% rename from parser/metadata/allowed-appid/allowed_info.hh rename to src/parser/metadata/allowed-appid/allowed_info.hh diff --git a/parser/metadata/allowed-appid/appsvc_db.cc b/src/parser/metadata/allowed-appid/appsvc_db.cc similarity index 100% rename from parser/metadata/allowed-appid/appsvc_db.cc rename to src/parser/metadata/allowed-appid/appsvc_db.cc diff --git a/parser/metadata/allowed-appid/appsvc_db.hh b/src/parser/metadata/allowed-appid/appsvc_db.hh similarity index 100% rename from parser/metadata/allowed-appid/appsvc_db.hh rename to src/parser/metadata/allowed-appid/appsvc_db.hh diff --git a/parser/metadata/allowed-appid/data/allowed-appid.info b/src/parser/metadata/allowed-appid/data/allowed-appid.info similarity index 100% rename from parser/metadata/allowed-appid/data/allowed-appid.info rename to src/parser/metadata/allowed-appid/data/allowed-appid.info diff --git a/parser/metadata/allowed-appid/pkgmgr_interface.cc b/src/parser/metadata/allowed-appid/pkgmgr_interface.cc similarity index 100% rename from parser/metadata/allowed-appid/pkgmgr_interface.cc rename to src/parser/metadata/allowed-appid/pkgmgr_interface.cc diff --git a/parser/metadata/allowed-appid/plugin_manager.cc b/src/parser/metadata/allowed-appid/plugin_manager.cc similarity index 100% rename from parser/metadata/allowed-appid/plugin_manager.cc rename to src/parser/metadata/allowed-appid/plugin_manager.cc diff --git a/parser/metadata/allowed-appid/plugin_manager.hh b/src/parser/metadata/allowed-appid/plugin_manager.hh similarity index 100% rename from parser/metadata/allowed-appid/plugin_manager.hh rename to src/parser/metadata/allowed-appid/plugin_manager.hh diff --git a/parser/metadata/common/app_event_args.hh b/src/parser/metadata/common/app_event_args.hh similarity index 100% rename from parser/metadata/common/app_event_args.hh rename to src/parser/metadata/common/app_event_args.hh diff --git a/parser/metadata/common/database.cc b/src/parser/metadata/common/database.cc similarity index 100% rename from parser/metadata/common/database.cc rename to src/parser/metadata/common/database.cc diff --git a/parser/metadata/common/database.hh b/src/parser/metadata/common/database.hh similarity index 100% rename from parser/metadata/common/database.hh rename to src/parser/metadata/common/database.hh diff --git a/parser/metadata/common/event_type.hh b/src/parser/metadata/common/event_type.hh similarity index 100% rename from parser/metadata/common/event_type.hh rename to src/parser/metadata/common/event_type.hh diff --git a/parser/metadata/common/exception.hh b/src/parser/metadata/common/exception.hh similarity index 100% rename from parser/metadata/common/exception.hh rename to src/parser/metadata/common/exception.hh diff --git a/parser/metadata/common/log_private.hh b/src/parser/metadata/common/log_private.hh similarity index 100% rename from parser/metadata/common/log_private.hh rename to src/parser/metadata/common/log_private.hh diff --git a/parser/metadata/common/metadata.hh b/src/parser/metadata/common/metadata.hh similarity index 100% rename from parser/metadata/common/metadata.hh rename to src/parser/metadata/common/metadata.hh diff --git a/parser/metadata/common/metadata_plugin.cc b/src/parser/metadata/common/metadata_plugin.cc similarity index 100% rename from parser/metadata/common/metadata_plugin.cc rename to src/parser/metadata/common/metadata_plugin.cc diff --git a/parser/metadata/common/metadata_plugin.hh b/src/parser/metadata/common/metadata_plugin.hh similarity index 100% rename from parser/metadata/common/metadata_plugin.hh rename to src/parser/metadata/common/metadata_plugin.hh diff --git a/parser/metadata/common/metadata_type.hh b/src/parser/metadata/common/metadata_type.hh similarity index 100% rename from parser/metadata/common/metadata_type.hh rename to src/parser/metadata/common/metadata_type.hh diff --git a/server/CMakeLists.txt b/src/server/CMakeLists.txt similarity index 100% rename from server/CMakeLists.txt rename to src/server/CMakeLists.txt diff --git a/server/api/aul_boot_sequence.cc b/src/server/api/aul_boot_sequence.cc similarity index 100% rename from server/api/aul_boot_sequence.cc rename to src/server/api/aul_boot_sequence.cc diff --git a/server/api/aul_boot_sequence.h b/src/server/api/aul_boot_sequence.h similarity index 100% rename from server/api/aul_boot_sequence.h rename to src/server/api/aul_boot_sequence.h diff --git a/server/api/aul_comp_info_internal.cc b/src/server/api/aul_comp_info_internal.cc similarity index 100% rename from server/api/aul_comp_info_internal.cc rename to src/server/api/aul_comp_info_internal.cc diff --git a/server/api/aul_comp_info_internal.h b/src/server/api/aul_comp_info_internal.h similarity index 100% rename from server/api/aul_comp_info_internal.h rename to src/server/api/aul_comp_info_internal.h diff --git a/server/api/aul_service.cc b/src/server/api/aul_service.cc similarity index 100% rename from server/api/aul_service.cc rename to src/server/api/aul_service.cc diff --git a/server/api/aul_service.h b/src/server/api/aul_service.h similarity index 100% rename from server/api/aul_service.h rename to src/server/api/aul_service.h diff --git a/server/api/aul_types.h b/src/server/api/aul_types.h similarity index 100% rename from server/api/aul_types.h rename to src/server/api/aul_types.h diff --git a/server/api/aul_widget_service.cc b/src/server/api/aul_widget_service.cc similarity index 100% rename from server/api/aul_widget_service.cc rename to src/server/api/aul_widget_service.cc diff --git a/server/api/aul_widget_service.h b/src/server/api/aul_widget_service.h similarity index 100% rename from server/api/aul_widget_service.h rename to src/server/api/aul_widget_service.h diff --git a/server/aul-server.pc.in b/src/server/aul-server.pc.in similarity index 100% rename from server/aul-server.pc.in rename to src/server/aul-server.pc.in diff --git a/server/boot_sequence.cc b/src/server/boot_sequence.cc similarity index 100% rename from server/boot_sequence.cc rename to src/server/boot_sequence.cc diff --git a/server/boot_sequence.hh b/src/server/boot_sequence.hh similarity index 100% rename from server/boot_sequence.hh rename to src/server/boot_sequence.hh diff --git a/server/common_private.hh b/src/server/common_private.hh similarity index 100% rename from server/common_private.hh rename to src/server/common_private.hh diff --git a/server/component_info.cc b/src/server/component_info.cc similarity index 100% rename from server/component_info.cc rename to src/server/component_info.cc diff --git a/server/component_info.hh b/src/server/component_info.hh similarity index 100% rename from server/component_info.hh rename to src/server/component_info.hh diff --git a/server/database.cc b/src/server/database.cc similarity index 100% rename from server/database.cc rename to src/server/database.cc diff --git a/server/database.hh b/src/server/database.hh similarity index 100% rename from server/database.hh rename to src/server/database.hh diff --git a/server/exception.cc b/src/server/exception.cc similarity index 100% rename from server/exception.cc rename to src/server/exception.cc diff --git a/server/exception.hh b/src/server/exception.hh similarity index 100% rename from server/exception.hh rename to src/server/exception.hh diff --git a/server/localized_info.cc b/src/server/localized_info.cc similarity index 100% rename from server/localized_info.cc rename to src/server/localized_info.cc diff --git a/server/localized_info.hh b/src/server/localized_info.hh similarity index 100% rename from server/localized_info.hh rename to src/server/localized_info.hh diff --git a/server/log_private.hh b/src/server/log_private.hh similarity index 100% rename from server/log_private.hh rename to src/server/log_private.hh diff --git a/tool/CMakeLists.txt b/src/tool/CMakeLists.txt similarity index 100% rename from tool/CMakeLists.txt rename to src/tool/CMakeLists.txt diff --git a/src/tool/app_com_tool/CMakeLists.txt b/src/tool/app_com_tool/CMakeLists.txt new file mode 100644 index 0000000..81228fc --- /dev/null +++ b/src/tool/app_com_tool/CMakeLists.txt @@ -0,0 +1,16 @@ +SET(TARGET_APP_COM_TOOL "app_com_tool") + +ADD_EXECUTABLE(${TARGET_APP_COM_TOOL} + ${CMAKE_CURRENT_SOURCE_DIR}/app_com_tool.c) + +SET_TARGET_PROPERTIES(${TARGET_APP_COM_TOOL} PROPERTIES + COMPILE_FLAGS ${CFLAGS} "-fPIE") +SET_TARGET_PROPERTIES(${TARGET_APP_COM_TOOL} PROPERTIES + LINK_FLAGS "-pie") +TARGET_LINK_LIBRARIES(${TARGET_APP_COM_TOOL} PRIVATE ${TARGET_AUL}) + +TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_COM_TOOL} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) + +INSTALL(TARGETS ${TARGET_APP_COM_TOOL} DESTINATION bin) diff --git a/tool/app_com_tool/app_com_tool.c b/src/tool/app_com_tool/app_com_tool.c similarity index 100% rename from tool/app_com_tool/app_com_tool.c rename to src/tool/app_com_tool/app_com_tool.c diff --git a/tool/app_launcher/CMakeLists.txt b/src/tool/app_launcher/CMakeLists.txt similarity index 53% rename from tool/app_launcher/CMakeLists.txt rename to src/tool/app_launcher/CMakeLists.txt index 659f58a..16050f0 100644 --- a/tool/app_launcher/CMakeLists.txt +++ b/src/tool/app_launcher/CMakeLists.txt @@ -7,13 +7,17 @@ IF(_TIZEN_FEATURE_PRELINK) MESSAGE(STATUS "[__PRELINK__] Enable") ELSE(_TIZEN_FEATURE_PRELINK) MESSAGE(STATUS "[__PRELINK__] Disable") -SET_TARGET_PROPERTIES(${TARGET_APP_LAUNCHER} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") -SET_TARGET_PROPERTIES(${TARGET_APP_LAUNCHER} PROPERTIES LINK_FLAGS "-pie") +SET_TARGET_PROPERTIES(${TARGET_APP_LAUNCHER} PROPERTIES + COMPILE_FLAGS ${CFLAGS} "-fPIE") +SET_TARGET_PROPERTIES(${TARGET_APP_LAUNCHER} PROPERTIES + LINK_FLAGS "-pie") ENDIF(_TIZEN_FEATURE_PRELINK) TARGET_LINK_LIBRARIES(${TARGET_APP_LAUNCHER} PRIVATE ${TARGET_AUL}) -TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_LAUNCHER} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_LAUNCHER} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) +TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_LAUNCHER} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul) +TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_LAUNCHER} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) INSTALL(TARGETS ${TARGET_APP_LAUNCHER} DESTINATION bin) diff --git a/tool/app_launcher/app_launcher.c b/src/tool/app_launcher/app_launcher.c similarity index 100% rename from tool/app_launcher/app_launcher.c rename to src/tool/app_launcher/app_launcher.c diff --git a/src/tool/appgroup_info/CMakeLists.txt b/src/tool/appgroup_info/CMakeLists.txt new file mode 100644 index 0000000..2c2d326 --- /dev/null +++ b/src/tool/appgroup_info/CMakeLists.txt @@ -0,0 +1,16 @@ +SET(TARGET_APP_GROUP_INFO "appgroup_info") + +ADD_EXECUTABLE(${TARGET_APP_GROUP_INFO} + ${CMAKE_CURRENT_SOURCE_DIR}/app_group_info.c) + +SET_TARGET_PROPERTIES(${TARGET_APP_GROUP_INFO} PROPERTIES + COMPILE_FLAGS ${CFLAGS} "-fPIE") +SET_TARGET_PROPERTIES(${TARGET_APP_GROUP_INFO} PROPERTIES + LINK_FLAGS "-pie") +TARGET_LINK_LIBRARIES(${TARGET_APP_GROUP_INFO} PRIVATE ${TARGET_AUL}) + +TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_GROUP_INFO} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) + +INSTALL(TARGETS ${TARGET_APP_GROUP_INFO} DESTINATION bin) diff --git a/tool/appgroup_info/app_group_info.c b/src/tool/appgroup_info/app_group_info.c similarity index 100% rename from tool/appgroup_info/app_group_info.c rename to src/tool/appgroup_info/app_group_info.c diff --git a/src/tool/appid2pid/CMakeLists.txt b/src/tool/appid2pid/CMakeLists.txt new file mode 100644 index 0000000..62b397e --- /dev/null +++ b/src/tool/appid2pid/CMakeLists.txt @@ -0,0 +1,16 @@ +SET(TARGET_APPID2PID "appid2pid") + +ADD_EXECUTABLE(${TARGET_APPID2PID} + ${CMAKE_CURRENT_SOURCE_DIR}/appid2pid.c) + +SET_TARGET_PROPERTIES(${TARGET_APPID2PID} PROPERTIES + COMPILE_FLAGS ${CFLAGS} "-fPIE") +SET_TARGET_PROPERTIES(${TARGET_APPID2PID} PROPERTIES + LINK_FLAGS "-pie") +TARGET_LINK_LIBRARIES(${TARGET_APPID2PID} PRIVATE ${TARGET_AUL}) + +TARGET_INCLUDE_DIRECTORIES(${TARGET_APPID2PID} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) + +INSTALL(TARGETS ${TARGET_APPID2PID} DESTINATION bin) diff --git a/tool/appid2pid/appid2pid.c b/src/tool/appid2pid/appid2pid.c similarity index 100% rename from tool/appid2pid/appid2pid.c rename to src/tool/appid2pid/appid2pid.c diff --git a/tool/aul_test/CMakeLists.txt b/src/tool/aul_test/CMakeLists.txt similarity index 78% rename from tool/aul_test/CMakeLists.txt rename to src/tool/aul_test/CMakeLists.txt index a4b7062..cd39f86 100644 --- a/tool/aul_test/CMakeLists.txt +++ b/src/tool/aul_test/CMakeLists.txt @@ -16,10 +16,10 @@ TARGET_LINK_LIBRARIES(${TARGET_AUL_TEST} PRIVATE ${TARGET_AUL}) TARGET_INCLUDE_DIRECTORIES(${TARGET_AUL_TEST} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/ - ${CMAKE_CURRENT_SOURCE_DIR}/../../ - ${CMAKE_CURRENT_SOURCE_DIR}/../../aul/api - ${CMAKE_CURRENT_SOURCE_DIR}/../../include - ${CMAKE_CURRENT_SOURCE_DIR}/../../src + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/ + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/api + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include ) INSTALL(TARGETS ${TARGET_AUL_TEST} DESTINATION bin) diff --git a/tool/aul_test/aul_test.cc b/src/tool/aul_test/aul_test.cc similarity index 100% rename from tool/aul_test/aul_test.cc rename to src/tool/aul_test/aul_test.cc diff --git a/tool/aul_test/aul_test.hh b/src/tool/aul_test/aul_test.hh similarity index 100% rename from tool/aul_test/aul_test.hh rename to src/tool/aul_test/aul_test.hh diff --git a/tool/aul_test/aul_test_private.hh b/src/tool/aul_test/aul_test_private.hh similarity index 100% rename from tool/aul_test/aul_test_private.hh rename to src/tool/aul_test/aul_test_private.hh diff --git a/tool/aul_test/log_private.hh b/src/tool/aul_test/log_private.hh similarity index 100% rename from tool/aul_test/log_private.hh rename to src/tool/aul_test/log_private.hh diff --git a/tool/aul_test/main.cc b/src/tool/aul_test/main.cc similarity index 100% rename from tool/aul_test/main.cc rename to src/tool/aul_test/main.cc diff --git a/tool/aul_test/tests/aul_app_get_all_running_app_info_for_uid_test.cc b/src/tool/aul_test/tests/aul_app_get_all_running_app_info_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_all_running_app_info_for_uid_test.cc rename to src/tool/aul_test/tests/aul_app_get_all_running_app_info_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_all_running_app_info_test.cc b/src/tool/aul_test/tests/aul_app_get_all_running_app_info_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_all_running_app_info_test.cc rename to src/tool/aul_test/tests/aul_app_get_all_running_app_info_test.cc diff --git a/tool/aul_test/tests/aul_app_get_appid_bypid_async_test.cc b/src/tool/aul_test/tests/aul_app_get_appid_bypid_async_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_appid_bypid_async_test.cc rename to src/tool/aul_test/tests/aul_app_get_appid_bypid_async_test.cc diff --git a/tool/aul_test/tests/aul_app_get_appid_bypid_test.cc b/src/tool/aul_test/tests/aul_app_get_appid_bypid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_appid_bypid_test.cc rename to src/tool/aul_test/tests/aul_app_get_appid_bypid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_last_caller_pid_for_uid_test.cc b/src/tool/aul_test/tests/aul_app_get_last_caller_pid_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_last_caller_pid_for_uid_test.cc rename to src/tool/aul_test/tests/aul_app_get_last_caller_pid_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_last_caller_pid_test.cc b/src/tool/aul_test/tests/aul_app_get_last_caller_pid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_last_caller_pid_test.cc rename to src/tool/aul_test/tests/aul_app_get_last_caller_pid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_pid_for_uid_test.cc b/src/tool/aul_test/tests/aul_app_get_pid_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_pid_for_uid_test.cc rename to src/tool/aul_test/tests/aul_app_get_pid_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_pid_test.cc b/src/tool/aul_test/tests/aul_app_get_pid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_pid_test.cc rename to src/tool/aul_test/tests/aul_app_get_pid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_pkgid_bypid_test.cc b/src/tool/aul_test/tests/aul_app_get_pkgid_bypid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_pkgid_bypid_test.cc rename to src/tool/aul_test/tests/aul_app_get_pkgid_bypid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_running_app_info_for_uid_test.cc b/src/tool/aul_test/tests/aul_app_get_running_app_info_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_running_app_info_for_uid_test.cc rename to src/tool/aul_test/tests/aul_app_get_running_app_info_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_running_app_info_test.cc b/src/tool/aul_test/tests/aul_app_get_running_app_info_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_running_app_info_test.cc rename to src/tool/aul_test/tests/aul_app_get_running_app_info_test.cc diff --git a/tool/aul_test/tests/aul_app_get_status_bypid_for_uid_test.cc b/src/tool/aul_test/tests/aul_app_get_status_bypid_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_status_bypid_for_uid_test.cc rename to src/tool/aul_test/tests/aul_app_get_status_bypid_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_status_bypid_test.cc b/src/tool/aul_test/tests/aul_app_get_status_bypid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_status_bypid_test.cc rename to src/tool/aul_test/tests/aul_app_get_status_bypid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_status_for_uid_test.cc b/src/tool/aul_test/tests/aul_app_get_status_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_status_for_uid_test.cc rename to src/tool/aul_test/tests/aul_app_get_status_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_app_get_status_test.cc b/src/tool/aul_test/tests/aul_app_get_status_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_get_status_test.cc rename to src/tool/aul_test/tests/aul_app_get_status_test.cc diff --git a/tool/aul_test/tests/aul_app_is_running_test.cc b/src/tool/aul_test/tests/aul_app_is_running_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_is_running_test.cc rename to src/tool/aul_test/tests/aul_app_is_running_test.cc diff --git a/tool/aul_test/tests/aul_app_lifecycle_get_state_test.cc b/src/tool/aul_test/tests/aul_app_lifecycle_get_state_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_lifecycle_get_state_test.cc rename to src/tool/aul_test/tests/aul_app_lifecycle_get_state_test.cc diff --git a/tool/aul_test/tests/aul_app_lifecycle_register_state_changed_cb_test.cc b/src/tool/aul_test/tests/aul_app_lifecycle_register_state_changed_cb_test.cc similarity index 100% rename from tool/aul_test/tests/aul_app_lifecycle_register_state_changed_cb_test.cc rename to src/tool/aul_test/tests/aul_app_lifecycle_register_state_changed_cb_test.cc diff --git a/tool/aul_test/tests/aul_disable_alias_info_test.cc b/src/tool/aul_test/tests/aul_disable_alias_info_test.cc similarity index 100% rename from tool/aul_test/tests/aul_disable_alias_info_test.cc rename to src/tool/aul_test/tests/aul_disable_alias_info_test.cc diff --git a/tool/aul_test/tests/aul_enable_alias_info_test.cc b/src/tool/aul_test/tests/aul_enable_alias_info_test.cc similarity index 100% rename from tool/aul_test/tests/aul_enable_alias_info_test.cc rename to src/tool/aul_test/tests/aul_enable_alias_info_test.cc diff --git a/tool/aul_test/tests/aul_get_app_info_from_db_by_pkgname_test.cc b/src/tool/aul_test/tests/aul_get_app_info_from_db_by_pkgname_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_app_info_from_db_by_pkgname_test.cc rename to src/tool/aul_test/tests/aul_get_app_info_from_db_by_pkgname_test.cc diff --git a/tool/aul_test/tests/aul_get_defapp_from_mime_test.cc b/src/tool/aul_test/tests/aul_get_defapp_from_mime_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_defapp_from_mime_test.cc rename to src/tool/aul_test/tests/aul_get_defapp_from_mime_test.cc diff --git a/tool/aul_test/tests/aul_get_default_app_test.cc b/src/tool/aul_test/tests/aul_get_default_app_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_default_app_test.cc rename to src/tool/aul_test/tests/aul_get_default_app_test.cc diff --git a/tool/aul_test/tests/aul_get_mime_description_test.cc b/src/tool/aul_test/tests/aul_get_mime_description_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_mime_description_test.cc rename to src/tool/aul_test/tests/aul_get_mime_description_test.cc diff --git a/tool/aul_test/tests/aul_get_mime_extension_test.cc b/src/tool/aul_test/tests/aul_get_mime_extension_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_mime_extension_test.cc rename to src/tool/aul_test/tests/aul_get_mime_extension_test.cc diff --git a/tool/aul_test/tests/aul_get_mime_from_content_test.cc b/src/tool/aul_test/tests/aul_get_mime_from_content_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_mime_from_content_test.cc rename to src/tool/aul_test/tests/aul_get_mime_from_content_test.cc diff --git a/tool/aul_test/tests/aul_get_mime_from_file_test.cc b/src/tool/aul_test/tests/aul_get_mime_from_file_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_mime_from_file_test.cc rename to src/tool/aul_test/tests/aul_get_mime_from_file_test.cc diff --git a/tool/aul_test/tests/aul_get_mime_icon_test.cc b/src/tool/aul_test/tests/aul_get_mime_icon_test.cc similarity index 100% rename from tool/aul_test/tests/aul_get_mime_icon_test.cc rename to src/tool/aul_test/tests/aul_get_mime_icon_test.cc diff --git a/tool/aul_test/tests/aul_kill_loader_test.cc b/src/tool/aul_test/tests/aul_kill_loader_test.cc similarity index 100% rename from tool/aul_test/tests/aul_kill_loader_test.cc rename to src/tool/aul_test/tests/aul_kill_loader_test.cc diff --git a/tool/aul_test/tests/aul_kill_pid_async_test.cc b/src/tool/aul_test/tests/aul_kill_pid_async_test.cc similarity index 100% rename from tool/aul_test/tests/aul_kill_pid_async_test.cc rename to src/tool/aul_test/tests/aul_kill_pid_async_test.cc diff --git a/tool/aul_test/tests/aul_launch_app_async_for_uid_test.cc b/src/tool/aul_test/tests/aul_launch_app_async_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_launch_app_async_for_uid_test.cc rename to src/tool/aul_test/tests/aul_launch_app_async_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_launch_app_async_test.cc b/src/tool/aul_test/tests/aul_launch_app_async_test.cc similarity index 100% rename from tool/aul_test/tests/aul_launch_app_async_test.cc rename to src/tool/aul_test/tests/aul_launch_app_async_test.cc diff --git a/tool/aul_test/tests/aul_launch_app_for_uid_test.cc b/src/tool/aul_test/tests/aul_launch_app_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_launch_app_for_uid_test.cc rename to src/tool/aul_test/tests/aul_launch_app_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_launch_app_test.cc b/src/tool/aul_test/tests/aul_launch_app_test.cc similarity index 100% rename from tool/aul_test/tests/aul_launch_app_test.cc rename to src/tool/aul_test/tests/aul_launch_app_test.cc diff --git a/tool/aul_test/tests/aul_listen_app_dead_signal_test.cc b/src/tool/aul_test/tests/aul_listen_app_dead_signal_test.cc similarity index 100% rename from tool/aul_test/tests/aul_listen_app_dead_signal_test.cc rename to src/tool/aul_test/tests/aul_listen_app_dead_signal_test.cc diff --git a/tool/aul_test/tests/aul_listen_app_launch_signal_test.cc b/src/tool/aul_test/tests/aul_listen_app_launch_signal_test.cc similarity index 100% rename from tool/aul_test/tests/aul_listen_app_launch_signal_test.cc rename to src/tool/aul_test/tests/aul_listen_app_launch_signal_test.cc diff --git a/tool/aul_test/tests/aul_listen_app_launch_signal_v2_test.cc b/src/tool/aul_test/tests/aul_listen_app_launch_signal_v2_test.cc similarity index 100% rename from tool/aul_test/tests/aul_listen_app_launch_signal_v2_test.cc rename to src/tool/aul_test/tests/aul_listen_app_launch_signal_v2_test.cc diff --git a/tool/aul_test/tests/aul_listen_app_status_for_uid_test.cc b/src/tool/aul_test/tests/aul_listen_app_status_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_listen_app_status_for_uid_test.cc rename to src/tool/aul_test/tests/aul_listen_app_status_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_listen_app_status_signal_test.cc b/src/tool/aul_test/tests/aul_listen_app_status_signal_test.cc similarity index 100% rename from tool/aul_test/tests/aul_listen_app_status_signal_test.cc rename to src/tool/aul_test/tests/aul_listen_app_status_signal_test.cc diff --git a/tool/aul_test/tests/aul_listen_app_status_test.cc b/src/tool/aul_test/tests/aul_listen_app_status_test.cc similarity index 100% rename from tool/aul_test/tests/aul_listen_app_status_test.cc rename to src/tool/aul_test/tests/aul_listen_app_status_test.cc diff --git a/tool/aul_test/tests/aul_open_app_for_uid_test.cc b/src/tool/aul_test/tests/aul_open_app_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_open_app_for_uid_test.cc rename to src/tool/aul_test/tests/aul_open_app_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_open_app_test.cc b/src/tool/aul_test/tests/aul_open_app_test.cc similarity index 100% rename from tool/aul_test/tests/aul_open_app_test.cc rename to src/tool/aul_test/tests/aul_open_app_test.cc diff --git a/tool/aul_test/tests/aul_open_content_test.cc b/src/tool/aul_test/tests/aul_open_content_test.cc similarity index 100% rename from tool/aul_test/tests/aul_open_content_test.cc rename to src/tool/aul_test/tests/aul_open_content_test.cc diff --git a/tool/aul_test/tests/aul_open_file_test.cc b/src/tool/aul_test/tests/aul_open_file_test.cc similarity index 100% rename from tool/aul_test/tests/aul_open_file_test.cc rename to src/tool/aul_test/tests/aul_open_file_test.cc diff --git a/tool/aul_test/tests/aul_pause_app_for_uid_test.cc b/src/tool/aul_test/tests/aul_pause_app_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_pause_app_for_uid_test.cc rename to src/tool/aul_test/tests/aul_pause_app_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_pause_app_test.cc b/src/tool/aul_test/tests/aul_pause_app_test.cc similarity index 100% rename from tool/aul_test/tests/aul_pause_app_test.cc rename to src/tool/aul_test/tests/aul_pause_app_test.cc diff --git a/tool/aul_test/tests/aul_pause_pid_for_uid_test.cc b/src/tool/aul_test/tests/aul_pause_pid_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_pause_pid_for_uid_test.cc rename to src/tool/aul_test/tests/aul_pause_pid_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_pause_pid_test.cc b/src/tool/aul_test/tests/aul_pause_pid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_pause_pid_test.cc rename to src/tool/aul_test/tests/aul_pause_pid_test.cc diff --git a/tool/aul_test/tests/aul_proc_get_extra_test.cc b/src/tool/aul_test/tests/aul_proc_get_extra_test.cc similarity index 100% rename from tool/aul_test/tests/aul_proc_get_extra_test.cc rename to src/tool/aul_test/tests/aul_proc_get_extra_test.cc diff --git a/tool/aul_test/tests/aul_proc_get_name_test.cc b/src/tool/aul_test/tests/aul_proc_get_name_test.cc similarity index 100% rename from tool/aul_test/tests/aul_proc_get_name_test.cc rename to src/tool/aul_test/tests/aul_proc_get_name_test.cc diff --git a/tool/aul_test/tests/aul_proc_group_add_test.cc b/src/tool/aul_test/tests/aul_proc_group_add_test.cc similarity index 100% rename from tool/aul_test/tests/aul_proc_group_add_test.cc rename to src/tool/aul_test/tests/aul_proc_group_add_test.cc diff --git a/tool/aul_test/tests/aul_proc_group_foreach_test.cc b/src/tool/aul_test/tests/aul_proc_group_foreach_test.cc similarity index 100% rename from tool/aul_test/tests/aul_proc_group_foreach_test.cc rename to src/tool/aul_test/tests/aul_proc_group_foreach_test.cc diff --git a/tool/aul_test/tests/aul_proc_group_get_test.cc b/src/tool/aul_test/tests/aul_proc_group_get_test.cc similarity index 100% rename from tool/aul_test/tests/aul_proc_group_get_test.cc rename to src/tool/aul_test/tests/aul_proc_group_get_test.cc diff --git a/tool/aul_test/tests/aul_proc_group_remove_test.cc b/src/tool/aul_test/tests/aul_proc_group_remove_test.cc similarity index 100% rename from tool/aul_test/tests/aul_proc_group_remove_test.cc rename to src/tool/aul_test/tests/aul_proc_group_remove_test.cc diff --git a/tool/aul_test/tests/aul_proc_register_test.cc b/src/tool/aul_test/tests/aul_proc_register_test.cc similarity index 100% rename from tool/aul_test/tests/aul_proc_register_test.cc rename to src/tool/aul_test/tests/aul_proc_register_test.cc diff --git a/tool/aul_test/tests/aul_reload_appinfo_test.cc b/src/tool/aul_test/tests/aul_reload_appinfo_test.cc similarity index 100% rename from tool/aul_test/tests/aul_reload_appinfo_test.cc rename to src/tool/aul_test/tests/aul_reload_appinfo_test.cc diff --git a/tool/aul_test/tests/aul_restart_loader_test.cc b/src/tool/aul_test/tests/aul_restart_loader_test.cc similarity index 100% rename from tool/aul_test/tests/aul_restart_loader_test.cc rename to src/tool/aul_test/tests/aul_restart_loader_test.cc diff --git a/tool/aul_test/tests/aul_resume_app_for_uid_test.cc b/src/tool/aul_test/tests/aul_resume_app_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_resume_app_for_uid_test.cc rename to src/tool/aul_test/tests/aul_resume_app_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_resume_app_test.cc b/src/tool/aul_test/tests/aul_resume_app_test.cc similarity index 100% rename from tool/aul_test/tests/aul_resume_app_test.cc rename to src/tool/aul_test/tests/aul_resume_app_test.cc diff --git a/tool/aul_test/tests/aul_resume_pid_async_for_uid_test.cc b/src/tool/aul_test/tests/aul_resume_pid_async_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_resume_pid_async_for_uid_test.cc rename to src/tool/aul_test/tests/aul_resume_pid_async_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_resume_pid_async_test.cc b/src/tool/aul_test/tests/aul_resume_pid_async_test.cc similarity index 100% rename from tool/aul_test/tests/aul_resume_pid_async_test.cc rename to src/tool/aul_test/tests/aul_resume_pid_async_test.cc diff --git a/tool/aul_test/tests/aul_resume_pid_for_uid_test.cc b/src/tool/aul_test/tests/aul_resume_pid_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_resume_pid_for_uid_test.cc rename to src/tool/aul_test/tests/aul_resume_pid_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_resume_pid_test.cc b/src/tool/aul_test/tests/aul_resume_pid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_resume_pid_test.cc rename to src/tool/aul_test/tests/aul_resume_pid_test.cc diff --git a/tool/aul_test/tests/aul_set_alias_appid_test.cc b/src/tool/aul_test/tests/aul_set_alias_appid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_set_alias_appid_test.cc rename to src/tool/aul_test/tests/aul_set_alias_appid_test.cc diff --git a/tool/aul_test/tests/aul_set_defapp_with_mime_test.cc b/src/tool/aul_test/tests/aul_set_defapp_with_mime_test.cc similarity index 100% rename from tool/aul_test/tests/aul_set_defapp_with_mime_test.cc rename to src/tool/aul_test/tests/aul_set_defapp_with_mime_test.cc diff --git a/tool/aul_test/tests/aul_set_default_app_by_operation_test.cc b/src/tool/aul_test/tests/aul_set_default_app_by_operation_test.cc similarity index 100% rename from tool/aul_test/tests/aul_set_default_app_by_operation_test.cc rename to src/tool/aul_test/tests/aul_set_default_app_by_operation_test.cc diff --git a/tool/aul_test/tests/aul_subapp_terminate_request_pid_test.cc b/src/tool/aul_test/tests/aul_subapp_terminate_request_pid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_subapp_terminate_request_pid_test.cc rename to src/tool/aul_test/tests/aul_subapp_terminate_request_pid_test.cc diff --git a/tool/aul_test/tests/aul_terminate_app_async_test.cc b/src/tool/aul_test/tests/aul_terminate_app_async_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_app_async_test.cc rename to src/tool/aul_test/tests/aul_terminate_app_async_test.cc diff --git a/tool/aul_test/tests/aul_terminate_bgapp_pid_test.cc b/src/tool/aul_test/tests/aul_terminate_bgapp_pid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_bgapp_pid_test.cc rename to src/tool/aul_test/tests/aul_terminate_bgapp_pid_test.cc diff --git a/tool/aul_test/tests/aul_terminate_pid_async_for_uid_test.cc b/src/tool/aul_test/tests/aul_terminate_pid_async_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_pid_async_for_uid_test.cc rename to src/tool/aul_test/tests/aul_terminate_pid_async_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_terminate_pid_async_v2_test.cc b/src/tool/aul_test/tests/aul_terminate_pid_async_v2_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_pid_async_v2_test.cc rename to src/tool/aul_test/tests/aul_terminate_pid_async_v2_test.cc diff --git a/tool/aul_test/tests/aul_terminate_pid_for_uid_test.cc b/src/tool/aul_test/tests/aul_terminate_pid_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_pid_for_uid_test.cc rename to src/tool/aul_test/tests/aul_terminate_pid_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_terminate_pid_sync_for_uid_test.cc b/src/tool/aul_test/tests/aul_terminate_pid_sync_for_uid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_pid_sync_for_uid_test.cc rename to src/tool/aul_test/tests/aul_terminate_pid_sync_for_uid_test.cc diff --git a/tool/aul_test/tests/aul_terminate_pid_sync_test.cc b/src/tool/aul_test/tests/aul_terminate_pid_sync_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_pid_sync_test.cc rename to src/tool/aul_test/tests/aul_terminate_pid_sync_test.cc diff --git a/tool/aul_test/tests/aul_terminate_pid_test.cc b/src/tool/aul_test/tests/aul_terminate_pid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_pid_test.cc rename to src/tool/aul_test/tests/aul_terminate_pid_test.cc diff --git a/tool/aul_test/tests/aul_terminate_pid_without_restart_test.cc b/src/tool/aul_test/tests/aul_terminate_pid_without_restart_test.cc similarity index 100% rename from tool/aul_test/tests/aul_terminate_pid_without_restart_test.cc rename to src/tool/aul_test/tests/aul_terminate_pid_without_restart_test.cc diff --git a/tool/aul_test/tests/aul_unset_alias_appid_test.cc b/src/tool/aul_test/tests/aul_unset_alias_appid_test.cc similarity index 100% rename from tool/aul_test/tests/aul_unset_alias_appid_test.cc rename to src/tool/aul_test/tests/aul_unset_alias_appid_test.cc diff --git a/tool/aul_window/CMakeLists.txt b/src/tool/aul_window/CMakeLists.txt similarity index 87% rename from tool/aul_window/CMakeLists.txt rename to src/tool/aul_window/CMakeLists.txt index e8bd4e4..23454e6 100644 --- a/tool/aul_window/CMakeLists.txt +++ b/src/tool/aul_window/CMakeLists.txt @@ -12,8 +12,8 @@ TARGET_LINK_LIBRARIES(${TARGET_AUL_WINDOW} PRIVATE TARGET_INCLUDE_DIRECTORIES(${TARGET_AUL_WINDOW} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../ - ${CMAKE_CURRENT_SOURCE_DIR}/../../src - ${CMAKE_CURRENT_SOURCE_DIR}/../../include) + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) APPLY_PKG_CONFIG(${TARGET_AUL_WINDOW} PUBLIC GLIB_DEPS diff --git a/tool/aul_window/aul_window.cc b/src/tool/aul_window/aul_window.cc similarity index 100% rename from tool/aul_window/aul_window.cc rename to src/tool/aul_window/aul_window.cc diff --git a/tool/aulctl/CMakeLists.txt b/src/tool/aulctl/CMakeLists.txt similarity index 90% rename from tool/aulctl/CMakeLists.txt rename to src/tool/aulctl/CMakeLists.txt index 1ef41b2..f2c71d7 100644 --- a/tool/aulctl/CMakeLists.txt +++ b/src/tool/aulctl/CMakeLists.txt @@ -21,8 +21,8 @@ TARGET_LINK_LIBRARIES(${TARGET_AULCTL} PRIVATE TARGET_INCLUDE_DIRECTORIES(${TARGET_AULCTL} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../../ - ${CMAKE_CURRENT_SOURCE_DIR}/../../src - ${CMAKE_CURRENT_SOURCE_DIR}/../../include + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include ) APPLY_PKG_CONFIG(${TARGET_AULCTL} PUBLIC diff --git a/tool/aulctl/aulctl.cc b/src/tool/aulctl/aulctl.cc similarity index 100% rename from tool/aulctl/aulctl.cc rename to src/tool/aulctl/aulctl.cc diff --git a/tool/aulctl/boot_sequence/app_info.cc b/src/tool/aulctl/boot_sequence/app_info.cc similarity index 99% rename from tool/aulctl/boot_sequence/app_info.cc rename to src/tool/aulctl/boot_sequence/app_info.cc index fa188cc..82bb9f4 100644 --- a/tool/aulctl/boot_sequence/app_info.cc +++ b/src/tool/aulctl/boot_sequence/app_info.cc @@ -18,8 +18,8 @@ #include -#include "include/aul_key.h" -#include "src/aul_util.h" +#include "aul/aul_util.h" +#include "aul/include/aul_key.h" namespace aul::internal { namespace boot_sequence { diff --git a/tool/aulctl/boot_sequence/app_info.hh b/src/tool/aulctl/boot_sequence/app_info.hh similarity index 100% rename from tool/aulctl/boot_sequence/app_info.hh rename to src/tool/aulctl/boot_sequence/app_info.hh diff --git a/tool/aulctl/boot_sequence/boot_sequence_manager.cc b/src/tool/aulctl/boot_sequence/boot_sequence_manager.cc similarity index 95% rename from tool/aulctl/boot_sequence/boot_sequence_manager.cc rename to src/tool/aulctl/boot_sequence/boot_sequence_manager.cc index fa9ba1b..67e5093 100644 --- a/tool/aulctl/boot_sequence/boot_sequence_manager.cc +++ b/src/tool/aulctl/boot_sequence/boot_sequence_manager.cc @@ -20,10 +20,10 @@ #include -#include "common/file_descriptor.hh" -#include "include/aul_sock.h" -#include "src/app_request.h" -#include "src/aul_util.h" +#include "aul/app_request.h" +#include "aul/aul_util.h" +#include "aul/common/file_descriptor.hh" +#include "aul/include/aul_sock.h" namespace aul::internal { namespace boot_sequence { diff --git a/tool/aulctl/boot_sequence/boot_sequence_manager.hh b/src/tool/aulctl/boot_sequence/boot_sequence_manager.hh similarity index 100% rename from tool/aulctl/boot_sequence/boot_sequence_manager.hh rename to src/tool/aulctl/boot_sequence/boot_sequence_manager.hh diff --git a/tool/aulctl/operation/help_operation.cc b/src/tool/aulctl/operation/help_operation.cc similarity index 100% rename from tool/aulctl/operation/help_operation.cc rename to src/tool/aulctl/operation/help_operation.cc diff --git a/tool/aulctl/operation/help_operation.hh b/src/tool/aulctl/operation/help_operation.hh similarity index 100% rename from tool/aulctl/operation/help_operation.hh rename to src/tool/aulctl/operation/help_operation.hh diff --git a/tool/aulctl/operation/is_active_operation.cc b/src/tool/aulctl/operation/is_active_operation.cc similarity index 100% rename from tool/aulctl/operation/is_active_operation.cc rename to src/tool/aulctl/operation/is_active_operation.cc diff --git a/tool/aulctl/operation/is_active_operation.hh b/src/tool/aulctl/operation/is_active_operation.hh similarity index 100% rename from tool/aulctl/operation/is_active_operation.hh rename to src/tool/aulctl/operation/is_active_operation.hh diff --git a/tool/aulctl/operation/list_apps_operation.cc b/src/tool/aulctl/operation/list_apps_operation.cc similarity index 100% rename from tool/aulctl/operation/list_apps_operation.cc rename to src/tool/aulctl/operation/list_apps_operation.cc diff --git a/tool/aulctl/operation/list_apps_operation.hh b/src/tool/aulctl/operation/list_apps_operation.hh similarity index 100% rename from tool/aulctl/operation/list_apps_operation.hh rename to src/tool/aulctl/operation/list_apps_operation.hh diff --git a/tool/aulctl/operation/list_dependencies_operation.cc b/src/tool/aulctl/operation/list_dependencies_operation.cc similarity index 100% rename from tool/aulctl/operation/list_dependencies_operation.cc rename to src/tool/aulctl/operation/list_dependencies_operation.cc diff --git a/tool/aulctl/operation/list_dependencies_operation.hh b/src/tool/aulctl/operation/list_dependencies_operation.hh similarity index 100% rename from tool/aulctl/operation/list_dependencies_operation.hh rename to src/tool/aulctl/operation/list_dependencies_operation.hh diff --git a/tool/aulctl/operation/operation.hh b/src/tool/aulctl/operation/operation.hh similarity index 100% rename from tool/aulctl/operation/operation.hh rename to src/tool/aulctl/operation/operation.hh diff --git a/tool/aulctl/operation/operation_factory.cc b/src/tool/aulctl/operation/operation_factory.cc similarity index 100% rename from tool/aulctl/operation/operation_factory.cc rename to src/tool/aulctl/operation/operation_factory.cc diff --git a/tool/aulctl/operation/operation_factory.hh b/src/tool/aulctl/operation/operation_factory.hh similarity index 100% rename from tool/aulctl/operation/operation_factory.hh rename to src/tool/aulctl/operation/operation_factory.hh diff --git a/tool/aulctl/operation/reload_operation.cc b/src/tool/aulctl/operation/reload_operation.cc similarity index 100% rename from tool/aulctl/operation/reload_operation.cc rename to src/tool/aulctl/operation/reload_operation.cc diff --git a/tool/aulctl/operation/reload_operation.hh b/src/tool/aulctl/operation/reload_operation.hh similarity index 100% rename from tool/aulctl/operation/reload_operation.hh rename to src/tool/aulctl/operation/reload_operation.hh diff --git a/tool/aulctl/operation/start_operation.cc b/src/tool/aulctl/operation/start_operation.cc similarity index 100% rename from tool/aulctl/operation/start_operation.cc rename to src/tool/aulctl/operation/start_operation.cc diff --git a/tool/aulctl/operation/start_operation.hh b/src/tool/aulctl/operation/start_operation.hh similarity index 100% rename from tool/aulctl/operation/start_operation.hh rename to src/tool/aulctl/operation/start_operation.hh diff --git a/tool/aulctl/operation/status_all_operation.cc b/src/tool/aulctl/operation/status_all_operation.cc similarity index 100% rename from tool/aulctl/operation/status_all_operation.cc rename to src/tool/aulctl/operation/status_all_operation.cc diff --git a/tool/aulctl/operation/status_all_operation.hh b/src/tool/aulctl/operation/status_all_operation.hh similarity index 100% rename from tool/aulctl/operation/status_all_operation.hh rename to src/tool/aulctl/operation/status_all_operation.hh diff --git a/tool/aulctl/operation/status_once_operation.cc b/src/tool/aulctl/operation/status_once_operation.cc similarity index 100% rename from tool/aulctl/operation/status_once_operation.cc rename to src/tool/aulctl/operation/status_once_operation.cc diff --git a/tool/aulctl/operation/status_once_operation.hh b/src/tool/aulctl/operation/status_once_operation.hh similarity index 100% rename from tool/aulctl/operation/status_once_operation.hh rename to src/tool/aulctl/operation/status_once_operation.hh diff --git a/tool/aulctl/operation/stop_operation.cc b/src/tool/aulctl/operation/stop_operation.cc similarity index 100% rename from tool/aulctl/operation/stop_operation.cc rename to src/tool/aulctl/operation/stop_operation.cc diff --git a/tool/aulctl/operation/stop_operation.hh b/src/tool/aulctl/operation/stop_operation.hh similarity index 100% rename from tool/aulctl/operation/stop_operation.hh rename to src/tool/aulctl/operation/stop_operation.hh diff --git a/src/tool/compmgr_tool/CMakeLists.txt b/src/tool/compmgr_tool/CMakeLists.txt new file mode 100644 index 0000000..a25c978 --- /dev/null +++ b/src/tool/compmgr_tool/CMakeLists.txt @@ -0,0 +1,15 @@ +SET(TARGET_COMPMGR_TOOL "compmgr_tool") + +ADD_EXECUTABLE(${TARGET_COMPMGR_TOOL} + ${CMAKE_CURRENT_SOURCE_DIR}/compmgr_tool.c) + +SET_TARGET_PROPERTIES(${TARGET_COMPMGR_TOOL} PROPERTIES + COMPILE_FLAGS ${CFLAGS} "-fPIE") +SET_TARGET_PROPERTIES(${TARGET_COMPMGR_TOOL} PROPERTIES LINK_FLAGS "-pie") +TARGET_LINK_LIBRARIES(${TARGET_COMPMGR_TOOL} PRIVATE ${TARGET_AUL}) + +TARGET_INCLUDE_DIRECTORIES(${TARGET_COMPMGR_TOOL} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) + +INSTALL(TARGETS ${TARGET_COMPMGR_TOOL} DESTINATION bin) diff --git a/tool/compmgr_tool/compmgr_tool.c b/src/tool/compmgr_tool/compmgr_tool.c similarity index 100% rename from tool/compmgr_tool/compmgr_tool.c rename to src/tool/compmgr_tool/compmgr_tool.c diff --git a/src/tool/launch_app/CMakeLists.txt b/src/tool/launch_app/CMakeLists.txt new file mode 100644 index 0000000..a5f3694 --- /dev/null +++ b/src/tool/launch_app/CMakeLists.txt @@ -0,0 +1,14 @@ +SET(TARGET_LAUNCH_APP "launch_app") + +ADD_EXECUTABLE(${TARGET_LAUNCH_APP} + ${CMAKE_CURRENT_SOURCE_DIR}/launch_app.c) +SET_TARGET_PROPERTIES(${TARGET_LAUNCH_APP} PROPERTIES + COMPILE_FLAGS ${CFLAGS} "-fPIE") +SET_TARGET_PROPERTIES(${TARGET_LAUNCH_APP} PROPERTIES LINK_FLAGS "-pie") +TARGET_LINK_LIBRARIES(${TARGET_LAUNCH_APP} PRIVATE ${TARGET_AUL}) + +TARGET_INCLUDE_DIRECTORIES(${TARGET_LAUNCH_APP} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) + +INSTALL(TARGETS ${TARGET_LAUNCH_APP} DESTINATION bin) diff --git a/tool/launch_app/launch_app.c b/src/tool/launch_app/launch_app.c similarity index 100% rename from tool/launch_app/launch_app.c rename to src/tool/launch_app/launch_app.c diff --git a/tool/launch_debug/CMakeLists.txt b/src/tool/launch_debug/CMakeLists.txt similarity index 50% rename from tool/launch_debug/CMakeLists.txt rename to src/tool/launch_debug/CMakeLists.txt index 2d476ba..7e80689 100644 --- a/tool/launch_debug/CMakeLists.txt +++ b/src/tool/launch_debug/CMakeLists.txt @@ -1,11 +1,14 @@ SET(TARGET_LAUNCH_DEBUG "launch_debug") -ADD_EXECUTABLE(${TARGET_LAUNCH_DEBUG} ${CMAKE_CURRENT_SOURCE_DIR}/launch_debug.c) -SET_TARGET_PROPERTIES(${TARGET_LAUNCH_DEBUG} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") +ADD_EXECUTABLE(${TARGET_LAUNCH_DEBUG} + ${CMAKE_CURRENT_SOURCE_DIR}/launch_debug.c) +SET_TARGET_PROPERTIES(${TARGET_LAUNCH_DEBUG} PROPERTIES COMPILE_FLAGS + ${CFLAGS} "-fPIE") SET_TARGET_PROPERTIES(${TARGET_LAUNCH_DEBUG} PROPERTIES LINK_FLAGS "-pie") TARGET_LINK_LIBRARIES(${TARGET_LAUNCH_DEBUG} PRIVATE ${TARGET_AUL}) -TARGET_INCLUDE_DIRECTORIES(${TARGET_LAUNCH_DEBUG} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_LAUNCH_DEBUG} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) +TARGET_INCLUDE_DIRECTORIES(${TARGET_LAUNCH_DEBUG} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) INSTALL(TARGETS ${TARGET_LAUNCH_DEBUG} DESTINATION bin) diff --git a/tool/launch_debug/launch_debug.c b/src/tool/launch_debug/launch_debug.c similarity index 100% rename from tool/launch_debug/launch_debug.c rename to src/tool/launch_debug/launch_debug.c diff --git a/tool/open_app/CMakeLists.txt b/src/tool/open_app/CMakeLists.txt similarity index 52% rename from tool/open_app/CMakeLists.txt rename to src/tool/open_app/CMakeLists.txt index 4723411..b240fde 100644 --- a/tool/open_app/CMakeLists.txt +++ b/src/tool/open_app/CMakeLists.txt @@ -1,11 +1,13 @@ SET(TARGET_OPEN_APP "open_app") ADD_EXECUTABLE(${TARGET_OPEN_APP} ${CMAKE_CURRENT_SOURCE_DIR}/open_app.c) -SET_TARGET_PROPERTIES(${TARGET_OPEN_APP} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") +SET_TARGET_PROPERTIES(${TARGET_OPEN_APP} PROPERTIES + COMPILE_FLAGS ${CFLAGS} "-fPIE") SET_TARGET_PROPERTIES(${TARGET_OPEN_APP} PROPERTIES LINK_FLAGS "-pie") TARGET_LINK_LIBRARIES(${TARGET_OPEN_APP} PRIVATE ${TARGET_AUL}) -TARGET_INCLUDE_DIRECTORIES(${TARGET_OPEN_APP} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_OPEN_APP} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) +TARGET_INCLUDE_DIRECTORIES(${TARGET_OPEN_APP} PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/../aul + ${CMAKE_CURRENT_SOURCE_DIR}/../aul/include) INSTALL(TARGETS ${TARGET_OPEN_APP} DESTINATION bin) diff --git a/tool/open_app/open_app.c b/src/tool/open_app/open_app.c similarity index 100% rename from tool/open_app/open_app.c rename to src/tool/open_app/open_app.c diff --git a/tool/recovery/CMakeLists.txt b/src/tool/recovery/CMakeLists.txt similarity index 100% rename from tool/recovery/CMakeLists.txt rename to src/tool/recovery/CMakeLists.txt diff --git a/tool/recovery/appsvc_db_recovery.c b/src/tool/recovery/appsvc_db_recovery.c similarity index 100% rename from tool/recovery/appsvc_db_recovery.c rename to src/tool/recovery/appsvc_db_recovery.c diff --git a/tool/recovery/component_db_recovery.c b/src/tool/recovery/component_db_recovery.c similarity index 100% rename from tool/recovery/component_db_recovery.c rename to src/tool/recovery/component_db_recovery.c diff --git a/tool/recovery/db_internal.c b/src/tool/recovery/db_internal.c similarity index 100% rename from tool/recovery/db_internal.c rename to src/tool/recovery/db_internal.c diff --git a/tool/recovery/db_internal.h b/src/tool/recovery/db_internal.h similarity index 100% rename from tool/recovery/db_internal.h rename to src/tool/recovery/db_internal.h diff --git a/test/app_control_tests/CMakeLists.txt b/test/app_control_tests/CMakeLists.txt index e5ac85f..dbedebd 100644 --- a/test/app_control_tests/CMakeLists.txt +++ b/test/app_control_tests/CMakeLists.txt @@ -5,10 +5,10 @@ ADD_EXECUTABLE(${TARGET_APP_CONTROL_TESTS} ${APP_CONTROL_TESTS_SRCS}) TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_CONTROL_TESTS} PUBLIC - "${CMAKE_CURRENT_SOURCE_DIR}/mock" - "${CMAKE_CURRENT_SOURCE_DIR}/../" - "${CMAKE_CURRENT_SOURCE_DIR}/../../include" - "${CMAKE_CURRENT_SOURCE_DIR}/../../src" + ${CMAKE_CURRENT_SOURCE_DIR}/mock + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aul/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aul ) APPLY_PKG_CONFIG(${TARGET_APP_CONTROL_TESTS} PUBLIC diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt index 3bbc0f5..d0e5e55 100644 --- a/test/unit_tests/CMakeLists.txt +++ b/test/unit_tests/CMakeLists.txt @@ -7,12 +7,11 @@ ADD_EXECUTABLE(${TARGET_AUL_UNIT_TESTS} ) TARGET_INCLUDE_DIRECTORIES(${TARGET_AUL_UNIT_TESTS} PUBLIC - "${CMAKE_CURRENT_SOURCE_DIR}/../" - "${CMAKE_CURRENT_SOURCE_DIR}/../../" - "${CMAKE_CURRENT_SOURCE_DIR}/../../include" - "${CMAKE_CURRENT_SOURCE_DIR}/../../src" - "${CMAKE_CURRENT_SOURCE_DIR}/../../aul" - "${CMAKE_CURRENT_SOURCE_DIR}/../../aul/api" + ${CMAKE_CURRENT_SOURCE_DIR}/../ + ${CMAKE_CURRENT_SOURCE_DIR}/../../ + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aul/include + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aul + ${CMAKE_CURRENT_SOURCE_DIR}/../../src/aul/api ) APPLY_PKG_CONFIG(${TARGET_AUL_UNIT_TESTS} PUBLIC diff --git a/test/unit_tests/test_app_com.cc b/test/unit_tests/test_app_com.cc index 7ccbb80..f568beb 100644 --- a/test/unit_tests/test_app_com.cc +++ b/test/unit_tests/test_app_com.cc @@ -18,16 +18,15 @@ #include #include #include -#include - #include +#include #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_app_group.cc b/test/unit_tests/test_app_group.cc index 593c00c..615b185 100644 --- a/test/unit_tests/test_app_group.cc +++ b/test/unit_tests/test_app_group.cc @@ -18,18 +18,17 @@ #include #include #include +#include #include #include -#include - #include #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_comp_context.cc b/test/unit_tests/test_comp_context.cc index 902fb29..8118289 100644 --- a/test/unit_tests/test_comp_context.cc +++ b/test/unit_tests/test_comp_context.cc @@ -14,21 +14,20 @@ * limitations under the License. */ -#include #include +#include #include +#include #include #include -#include - #include #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_comp_info.cc b/test/unit_tests/test_comp_info.cc index 6cfa4cd..bb500c2 100644 --- a/test/unit_tests/test_comp_info.cc +++ b/test/unit_tests/test_comp_info.cc @@ -18,19 +18,18 @@ #include #include #include +#include #include #include -#include - #include #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" #include "mock/vconf_mock.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_comp_status.cc b/test/unit_tests/test_comp_status.cc index e8445fa..c6af750 100644 --- a/test/unit_tests/test_comp_status.cc +++ b/test/unit_tests/test_comp_status.cc @@ -18,18 +18,17 @@ #include #include #include +#include #include #include -#include - #include #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_complication.cc b/test/unit_tests/test_complication.cc index 648dcc6..a95fc77 100644 --- a/test/unit_tests/test_complication.cc +++ b/test/unit_tests/test_complication.cc @@ -18,15 +18,14 @@ #include #include #include +#include #include #include -#include - +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_job_scheduler.cc b/test/unit_tests/test_job_scheduler.cc index 873f4d3..9614b3c 100644 --- a/test/unit_tests/test_job_scheduler.cc +++ b/test/unit_tests/test_job_scheduler.cc @@ -18,18 +18,17 @@ #include #include #include +#include #include #include -#include - #include #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_launch.cc b/test/unit_tests/test_launch.cc index 612f77e..68c7f95 100644 --- a/test/unit_tests/test_launch.cc +++ b/test/unit_tests/test_launch.cc @@ -14,17 +14,17 @@ * limitations under the License. */ +#include +#include +#include #include #include #include #include #include -#include -#include -#include -#include "launch.h" +#include "aul/launch.h" #include "mock/dbus_mock.h" #include "mock/glib_mock.h" #include "mock/mock_hook.h" diff --git a/test/unit_tests/test_launch_with_result.cc b/test/unit_tests/test_launch_with_result.cc index 16decc7..08a625b 100644 --- a/test/unit_tests/test_launch_with_result.cc +++ b/test/unit_tests/test_launch_with_result.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include +#include +#include +#include +#include #include +#include -#include #include #include -#include -#include -#include -#include "launch.h" +#include "aul/launch.h" #include "mock/dbus_mock.h" #include "mock/glib_mock.h" #include "mock/mock_hook.h" diff --git a/test/unit_tests/test_launcher_service.cc b/test/unit_tests/test_launcher_service.cc index 67c00a3..336bb13 100644 --- a/test/unit_tests/test_launcher_service.cc +++ b/test/unit_tests/test_launcher_service.cc @@ -18,17 +18,16 @@ #include #include #include +#include #include #include -#include - #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_pkginfo.cc b/test/unit_tests/test_pkginfo.cc index c7beece..7f2c89a 100644 --- a/test/unit_tests/test_pkginfo.cc +++ b/test/unit_tests/test_pkginfo.cc @@ -17,19 +17,18 @@ #include #include #include +#include #include #include -#include - #include #include -#include "mock/mock_hook.h" +#include "aul/launch.h" #include "mock/glib_mock.h" +#include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_status.cc b/test/unit_tests/test_status.cc index 4e90299..75ba264 100644 --- a/test/unit_tests/test_status.cc +++ b/test/unit_tests/test_status.cc @@ -17,14 +17,13 @@ #include #include #include -#include - #include +#include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/test/unit_tests/test_watchdog.cc b/test/unit_tests/test_watchdog.cc index 60587b3..afc568d 100644 --- a/test/unit_tests/test_watchdog.cc +++ b/test/unit_tests/test_watchdog.cc @@ -15,21 +15,20 @@ */ #include -#include #include #include +#include +#include #include #include -#include - #include #include +#include "aul/launch.h" #include "mock/mock_hook.h" #include "mock/socket_mock.h" #include "mock/test_fixture.h" -#include "src/launch.h" using ::testing::_; using ::testing::DoAll; diff --git a/tool/app_com_tool/CMakeLists.txt b/tool/app_com_tool/CMakeLists.txt deleted file mode 100644 index e87ac76..0000000 --- a/tool/app_com_tool/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -SET(TARGET_APP_COM_TOOL "app_com_tool") - -ADD_EXECUTABLE(${TARGET_APP_COM_TOOL} ${CMAKE_CURRENT_SOURCE_DIR}/app_com_tool.c) -SET_TARGET_PROPERTIES(${TARGET_APP_COM_TOOL} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") -SET_TARGET_PROPERTIES(${TARGET_APP_COM_TOOL} PROPERTIES LINK_FLAGS "-pie") -TARGET_LINK_LIBRARIES(${TARGET_APP_COM_TOOL} PRIVATE ${TARGET_AUL}) - -TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_COM_TOOL} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_COM_TOOL} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) - -INSTALL(TARGETS ${TARGET_APP_COM_TOOL} DESTINATION bin) diff --git a/tool/appgroup_info/CMakeLists.txt b/tool/appgroup_info/CMakeLists.txt deleted file mode 100644 index 8c485eb..0000000 --- a/tool/appgroup_info/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -SET(TARGET_APP_GROUP_INFO "appgroup_info") - -ADD_EXECUTABLE(${TARGET_APP_GROUP_INFO} ${CMAKE_CURRENT_SOURCE_DIR}/app_group_info.c) -SET_TARGET_PROPERTIES(${TARGET_APP_GROUP_INFO} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") -SET_TARGET_PROPERTIES(${TARGET_APP_GROUP_INFO} PROPERTIES LINK_FLAGS "-pie") -TARGET_LINK_LIBRARIES(${TARGET_APP_GROUP_INFO} PRIVATE ${TARGET_AUL}) - -TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_GROUP_INFO} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_APP_GROUP_INFO} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) - -INSTALL(TARGETS ${TARGET_APP_GROUP_INFO} DESTINATION bin) diff --git a/tool/appid2pid/CMakeLists.txt b/tool/appid2pid/CMakeLists.txt deleted file mode 100644 index 613f6bc..0000000 --- a/tool/appid2pid/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -SET(TARGET_APPID2PID "appid2pid") - -ADD_EXECUTABLE(${TARGET_APPID2PID} ${CMAKE_CURRENT_SOURCE_DIR}/appid2pid.c) -SET_TARGET_PROPERTIES(${TARGET_APPID2PID} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") -SET_TARGET_PROPERTIES(${TARGET_APPID2PID} PROPERTIES LINK_FLAGS "-pie") -TARGET_LINK_LIBRARIES(${TARGET_APPID2PID} PRIVATE ${TARGET_AUL}) - -TARGET_INCLUDE_DIRECTORIES(${TARGET_APPID2PID} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_APPID2PID} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) - -INSTALL(TARGETS ${TARGET_APPID2PID} DESTINATION bin) diff --git a/tool/compmgr_tool/CMakeLists.txt b/tool/compmgr_tool/CMakeLists.txt deleted file mode 100644 index ff48301..0000000 --- a/tool/compmgr_tool/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -SET(TARGET_COMPMGR_TOOL "compmgr_tool") - -ADD_EXECUTABLE(${TARGET_COMPMGR_TOOL} ${CMAKE_CURRENT_SOURCE_DIR}/compmgr_tool.c) -SET_TARGET_PROPERTIES(${TARGET_COMPMGR_TOOL} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") -SET_TARGET_PROPERTIES(${TARGET_COMPMGR_TOOL} PROPERTIES LINK_FLAGS "-pie") -TARGET_LINK_LIBRARIES(${TARGET_COMPMGR_TOOL} PRIVATE ${TARGET_AUL}) - -TARGET_INCLUDE_DIRECTORIES(${TARGET_COMPMGR_TOOL} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_COMPMGR_TOOL} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) - -INSTALL(TARGETS ${TARGET_COMPMGR_TOOL} DESTINATION bin) diff --git a/tool/launch_app/CMakeLists.txt b/tool/launch_app/CMakeLists.txt deleted file mode 100644 index e857e2e..0000000 --- a/tool/launch_app/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -SET(TARGET_LAUNCH_APP "launch_app") - -ADD_EXECUTABLE(${TARGET_LAUNCH_APP} ${CMAKE_CURRENT_SOURCE_DIR}/launch_app.c) -SET_TARGET_PROPERTIES(${TARGET_LAUNCH_APP} PROPERTIES COMPILE_FLAGS ${CFLAGS} "-fPIE") -SET_TARGET_PROPERTIES(${TARGET_LAUNCH_APP} PROPERTIES LINK_FLAGS "-pie") -TARGET_LINK_LIBRARIES(${TARGET_LAUNCH_APP} PRIVATE ${TARGET_AUL}) - -TARGET_INCLUDE_DIRECTORIES(${TARGET_LAUNCH_APP} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../src) -TARGET_INCLUDE_DIRECTORIES(${TARGET_LAUNCH_APP} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../include) - -INSTALL(TARGETS ${TARGET_LAUNCH_APP} DESTINATION bin) -- 2.7.4