From: Youngjae Shin Date: Fri, 4 Dec 2020 05:05:42 +0000 (+0900) Subject: revise minor mistakes X-Git-Tag: submit/tizen/20210705.233613^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_6.5;p=platform%2Fcore%2Fsystem%2Fmodes.git revise minor mistakes --- diff --git a/Definitions.cmake b/Definitions.cmake index 604bfd3..da4a19b 100644 --- a/Definitions.cmake +++ b/Definitions.cmake @@ -20,7 +20,10 @@ IF(NOT DEFINED MODES_DEFAULT_RW_DIR) MESSAGE("No MODES_DEFAULT_RW_DIR. Check build system") SET(MODES_DEFAULT_RW_DIR "/var/lib/modes") ENDIF(NOT DEFINED MODES_DEFAULT_RW_DIR) +ADD_DEFINITIONS("-DMODES_DEFAULT_RW_DIR=\"${MODES_DEFAULT_RW_DIR}\"") SET(MODES_CUSTOM_MODE_DEFAULT_DIR ${MODES_DEFAULT_RW_DIR}/custom-mode) ADD_DEFINITIONS("-DMODES_CUSTOM_MODE_DEFAULT_DIR=\"${MODES_CUSTOM_MODE_DEFAULT_DIR}\"") SET(MODES_UNDO_INFO_DEFAULT_DIR ${MODES_DEFAULT_RW_DIR}/undo-info) ADD_DEFINITIONS("-DMODES_UNDO_INFO_DEFAULT_DIR=\"${MODES_UNDO_INFO_DEFAULT_DIR}\"") + +ADD_DEFINITIONS("-DMODES_VERSION=\"${FULLVER}\"") diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index ae93c0c..bb9cc7a 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -13,6 +13,7 @@ ADD_DEFINITIONS("-DMDS_CLIENT") ADD_LIBRARY(${CLIENT} SHARED ${CLIENT_SRCS}) ADD_DEPENDENCIES(${CLIENT} GENERATED_DBUS_CODE) TARGET_LINK_LIBRARIES(${CLIENT} ${client_pkgs_LIBRARIES}) +TARGET_COMPILE_OPTIONS(${CLIENT} PUBLIC ${client_pkgs_CFLAGS_OTHER}) SET_TARGET_PROPERTIES(${CLIENT} PROPERTIES VERSION ${FULLVER} SOVERSION ${MAJORVER}) INSTALL(TARGETS ${CLIENT} DESTINATION ${LIB_INSTALL_DIR}) diff --git a/common/definitions.h b/common/definitions.h index 6c93841..c12368d 100644 --- a/common/definitions.h +++ b/common/definitions.h @@ -40,6 +40,11 @@ #warning "MODES_DEFAULT_RO_DIR is redefined" #endif +#ifndef MODES_VERSION +#define MODES_VERSION "N/A" +#warning "No MODES_VERSION definition" +#endif + #define MODES_MODE_DEFAULT_DIR MODES_DEFAULT_RO_DIR "/mode" #define MODES_MODE_FILE_SUFFIX "_mode.xml" diff --git a/include/modes.h b/include/modes.h index d189e34..12244b9 100644 --- a/include/modes.h +++ b/include/modes.h @@ -16,6 +16,8 @@ #ifndef __MODE_SUPERVISOR_H__ #define __MODE_SUPERVISOR_H__ +// Never use outside of Tizen::Unified(Tizen Platform) + #ifdef __cplusplus extern "C" { #endif diff --git a/include/modes_types.h b/include/modes_types.h index d33df2a..ce723be 100644 --- a/include/modes_types.h +++ b/include/modes_types.h @@ -59,7 +59,7 @@ typedef struct mds_mode_handle* modes_mode_h; /** * @brief The mds_action_handle type values action handle. - * @details @a action_h is an opaque data structure. + * @details @a modes_action_h is an opaque data structure. * @since_tizen 6.0 */ typedef struct mds_action_handle* modes_action_h; @@ -72,13 +72,14 @@ typedef struct mds_action_handle* modes_action_h; typedef struct mds_list_data_handle* mode_list_data_h; /** - * @brief Specifies the type of function passed to modes_noti_connect(). + * @brief Specifies the type of function passed to modes_subscribe_mode_changes(). * @details When the Modes apply/undo a mode, it is called, immediately. * @since_tizen 6.0 * @param[in] mode_name The name of mode which was changed state + * @param[in] state The state of mode, 1 if the mode has been appling * @param[in] user_data The user data to pass to the function * - * @pre The callback must be registered using modes_noti_connect() + * @pre The callback must be registered using modes_subscribe_mode_changes() * * @see modes_subscribe_mode_changes() * @see modes_unsubscribe_mode_changes() diff --git a/packaging/modes.spec b/packaging/modes.spec index b40dec2..f37827b 100644 --- a/packaging/modes.spec +++ b/packaging/modes.spec @@ -5,7 +5,7 @@ Summary: Mode Supervisor Group: System/Management License: Apache-2.0 -URL : https://review.tizen.org/gerrit +URL : https://review.tizen.org/gerrit/gitweb?p=platform/core/system/modes.git Source0: %{name}-%{version}.tar.gz Source1001: %{name}.manifest diff --git a/supervisor/ArgumentParser.cpp b/supervisor/ArgumentParser.cpp index 21c08f2..63ac025 100644 --- a/supervisor/ArgumentParser.cpp +++ b/supervisor/ArgumentParser.cpp @@ -78,6 +78,7 @@ ArgumentParser::ArgumentParser() ModesConfig ArgumentParser::parse(int argc, char **argv) { + argp_program_version = "mode-supervisor " MODES_VERSION; argp_parse(&argp_input, argc, argv, 0, 0, this); ModesConfig config;