Compare commits
37 Commits
297b04bd56
...
master
Author | SHA1 | Date | |
---|---|---|---|
ece9b7cf70 | |||
bb580c0938 | |||
547a127956 | |||
554ab7efdf | |||
7319a202c3 | |||
c1235edaa9 | |||
a4ea9864be | |||
347ef3d46d | |||
b21def5945 | |||
cfe4fe8a2e | |||
11c572a96c | |||
e3d5243f80 | |||
3f633ee15c | |||
458dcd82c6 | |||
a4b181a838 | |||
2261982479 | |||
d159417bbb | |||
66ddb8a1fb | |||
dd1010a826 | |||
35ad2e1db8 | |||
7d0c2f68d6 | |||
7396f77054 | |||
3d3690ca64 | |||
105ed96f5f | |||
5645c5ea31 | |||
e63e6a4c8a | |||
a017ca6814 | |||
8114675c1c | |||
d839fa6ed4 | |||
a368091252 | |||
9468f95dd3 | |||
56a0b595d2 | |||
716545e49c | |||
b575634554 | |||
299dabf295 | |||
a29cea6f61 | |||
360b2b41d1 |
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -10,6 +10,3 @@
|
|||||||
[submodule "cmake/generators"]
|
[submodule "cmake/generators"]
|
||||||
path = cmake/generators
|
path = cmake/generators
|
||||||
url = ../../f1x1t/cmake-generators
|
url = ../../f1x1t/cmake-generators
|
||||||
[submodule "cmake/doc"]
|
|
||||||
path = cmake/doc
|
|
||||||
url = ../../f1x1t/cmake-doc
|
|
||||||
|
@ -11,13 +11,15 @@ set(CMLIB_AUTHOR_NAME "Андрей Астафьев" CACHE STRING "")
|
|||||||
set(CMLIB_AUTHOR_EMAIL "dev@246060.ru" CACHE STRING "")
|
set(CMLIB_AUTHOR_EMAIL "dev@246060.ru" CACHE STRING "")
|
||||||
set(CMLIB_DESCRIPTION "Разные функции" CACHE STRING "")
|
set(CMLIB_DESCRIPTION "Разные функции" CACHE STRING "")
|
||||||
|
|
||||||
# В каталоге cmake/lib находятся файлы с библиотечными функциями
|
# В каталоге cmake/cmlib находятся файлы с библиотечными функциями
|
||||||
if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/cmlib)
|
if(NOT DEFINED CMLIB_MAIN_DIR)
|
||||||
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/cmlib)
|
set(CMLIB_MAIN_DIR "${CMAKE_SOURCE_DIR}/cmake/cmlib")
|
||||||
else()
|
endif()
|
||||||
message(FATAL_ERROR "CMake library directory not exists")
|
if(IS_DIRECTORY "${CMLIB_MAIN_DIR}" AND EXISTS "${CMLIB_MAIN_DIR}/CMLibCommon.cmake")
|
||||||
|
list(INSERT CMAKE_MODULE_PATH 0 "${CMLIB_MAIN_DIR}")
|
||||||
|
else()
|
||||||
|
message(FATAL_ERROR "CMLib main directory ${CMLIB_MAIN_DIR} does not exists")
|
||||||
endif()
|
endif()
|
||||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/find)
|
|
||||||
|
|
||||||
if(NOT DEFINED MYXLIB_MASTER_PROJECT)
|
if(NOT DEFINED MYXLIB_MASTER_PROJECT)
|
||||||
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
|
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
|
||||||
@ -52,6 +54,9 @@ add_subdirectory(src/myx/core)
|
|||||||
add_subdirectory(src/myx/filesystem)
|
add_subdirectory(src/myx/filesystem)
|
||||||
add_subdirectory(src/myx/qt)
|
add_subdirectory(src/myx/qt)
|
||||||
|
|
||||||
|
# Цель, используемая только для установки заголовочных файлов без компиляции проекта
|
||||||
|
add_custom_target(myxlib-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P
|
||||||
|
"${CMAKE_BINARY_DIR}/cmake_install.cmake")
|
||||||
# Примеры
|
# Примеры
|
||||||
if(MYXLIB_BUILD_EXAMPLES)
|
if(MYXLIB_BUILD_EXAMPLES)
|
||||||
add_subdirectory(examples/core)
|
add_subdirectory(examples/core)
|
||||||
@ -62,4 +67,5 @@ if(MYXLIB_BUILD_EXAMPLES)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Документация
|
# Документация
|
||||||
add_subdirectory(cmake/doc)
|
add_breathe_target(doc-breathe)
|
||||||
|
add_doxygen_target(doc-doxygen LATEX YES HTML YES)
|
||||||
|
78
cmake/FindMyxlib.cmake
Normal file
78
cmake/FindMyxlib.cmake
Normal file
@ -0,0 +1,78 @@
|
|||||||
|
#[=======================================================================[.rst:
|
||||||
|
FindMyxlib
|
||||||
|
--------
|
||||||
|
|
||||||
|
Поиск библиотеки Myxlib
|
||||||
|
|
||||||
|
Входные переменные
|
||||||
|
^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
``MYXLIB_PREFIX``
|
||||||
|
корневой каталог установленной библиотеки.
|
||||||
|
``MYXLIB_INCLUDE_DIR``
|
||||||
|
каталог, в котором производится поиск заголовочных файлов.
|
||||||
|
``MYXLIB_LIBRARY_DIR``
|
||||||
|
каталог, в котором производится поиск библиотек.
|
||||||
|
|
||||||
|
Выходные переменные
|
||||||
|
^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
``MYXLIB_FOUND``
|
||||||
|
true, если MYXLIB найдена
|
||||||
|
``MYXLIB_INCLUDE_DIRS``
|
||||||
|
каталог с найденными заголовочными файлами
|
||||||
|
``MYXLIB_LIBRARIES``
|
||||||
|
каталог с найденными библиотеками
|
||||||
|
|
||||||
|
#]=======================================================================]
|
||||||
|
|
||||||
|
if(NOT MYXLIB_IS_EXTERNAL_PROJECT)
|
||||||
|
set(MYXLIB_PREFIX "" CACHE PATH "The path to the prefix of an myxlib installation")
|
||||||
|
set(MYXLIB_INCLUDE_DIR "" CACHE PATH "The path to the headers of an myxlib installation")
|
||||||
|
set(MYXLIB_LIBRARY_DIR "" CACHE PATH "The path to the library of an myxlib installation")
|
||||||
|
|
||||||
|
set(_search_paths "")
|
||||||
|
if(MYXLIB_INCLUDE_DIR AND EXISTS ${MYXLIB_INCLUDE_DIR})
|
||||||
|
list(APPEND _search_paths ${MYXLIB_INCLUDE_DIR})
|
||||||
|
endif()
|
||||||
|
if(MYXLIB_PREFIX AND EXISTS ${MYXLIB_PREFIX})
|
||||||
|
list(APPEND _search_paths "${MYXLIB_PREFIX}/include")
|
||||||
|
endif()
|
||||||
|
find_path(
|
||||||
|
MYXLIB_INCLUDE_DIRS
|
||||||
|
NAMES myx/core/config.hpp
|
||||||
|
PATHS ${_search_paths})
|
||||||
|
|
||||||
|
set(_search_paths "")
|
||||||
|
if(MYXLIB_LIBRARY_DIR AND EXISTS ${MYXLIB_LIBRARY_DIR})
|
||||||
|
list(APPEND _search_paths ${MYXLIB_LIBRARY_DIR})
|
||||||
|
endif()
|
||||||
|
if(MYXLIB_PREFIX AND EXISTS ${MYXLIB_PREFIX})
|
||||||
|
list(APPEND _search_paths "${MYXLIB_PREFIX}/lib")
|
||||||
|
endif()
|
||||||
|
find_library(
|
||||||
|
MYXLIB_QT_LIBRARIES
|
||||||
|
NAMES myx-qt
|
||||||
|
PATHS ${_search_paths})
|
||||||
|
find_library(
|
||||||
|
MYXLIB_FILESYSTEM_LIBRARIES
|
||||||
|
NAMES myx-filesystem
|
||||||
|
PATHS ${_search_paths})
|
||||||
|
unset(_search_paths)
|
||||||
|
set(MYXLIB_LIBRARIES ${MYXLIB_QT_LIBRARIES} ${MYXLIB_FILESYSTEM_LIBRARIES})
|
||||||
|
|
||||||
|
if(MYXLIB_INCLUDE_DIRS AND MYXLIB_LIBRARIES)
|
||||||
|
set(MYXLIB_FOUND TRUE)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(MYXLIB_FOUND)
|
||||||
|
if(NOT MYXLIB_FIND_QUIETLY)
|
||||||
|
message(STATUS "Found myxlib")
|
||||||
|
endif()
|
||||||
|
set(HAVE_MYXLIB 1)
|
||||||
|
elseif(MYXLIB_FOUND)
|
||||||
|
if(MYXLIB_FIND_REQUIRED)
|
||||||
|
message(FATAL_ERROR "Could not find myxlib")
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
endif()
|
47
cmake/FindMyxlibThirdparty.cmake
Normal file
47
cmake/FindMyxlibThirdparty.cmake
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
# Подключение внешних проектов
|
||||||
|
include(ExternalProject)
|
||||||
|
|
||||||
|
# cmake-format: off
|
||||||
|
list(APPEND _ext_project_args
|
||||||
|
myxlib
|
||||||
|
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/myxlib
|
||||||
|
INSTALL_DIR ${CMAKE_BINARY_DIR}
|
||||||
|
CMAKE_ARGS ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
|
||||||
|
<SOURCE_DIR>)
|
||||||
|
if(MyxlibThirdparty_FIND_COMPONENTS STREQUAL "headers")
|
||||||
|
list(APPEND _ext_project_args
|
||||||
|
BUILD_COMMAND true
|
||||||
|
INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} myxlib-install-headers)
|
||||||
|
else()
|
||||||
|
list(APPEND _ext_project_args
|
||||||
|
BUILD_BYPRODUCTS ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a)
|
||||||
|
endif()
|
||||||
|
ExternalProject_Add(${_ext_project_args})
|
||||||
|
unset(_ext_project_args)
|
||||||
|
|
||||||
|
set(MYXLIB_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
|
||||||
|
# cmake-format: on
|
||||||
|
|
||||||
|
set(MYXLIB_PREFIX
|
||||||
|
${CMAKE_BINARY_DIR}
|
||||||
|
CACHE FILEPATH "" FORCE)
|
||||||
|
set(MYXLIB_INCLUDE_DIR
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
|
||||||
|
CACHE PATH "" FORCE)
|
||||||
|
set(MYXLIB_INCLUDE_DIRS
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
|
||||||
|
CACHE PATH "" FORCE)
|
||||||
|
set(MYXLIB_LIBRARY_DIR
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}
|
||||||
|
CACHE PATH "" FORCE)
|
||||||
|
set(MYXLIB_QT_LIBRARIES
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
|
||||||
|
CACHE FILEPATH "" FORCE)
|
||||||
|
set(MYXLIB_FILESYSTEM_LIBRARIES
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a
|
||||||
|
CACHE FILEPATH "" FORCE)
|
||||||
|
set(MYXLIB_LIBRARIES
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-qt.a
|
||||||
|
${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}/libmyx-filesystem.a
|
||||||
|
CACHE FILEPATH "" FORCE)
|
@ -1 +1 @@
|
|||||||
Subproject commit 5e600ab490fc789667062e998bb48effb9bf35a0
|
Subproject commit 5708fcd5e464b870a4e3c82931b0b25296c5c569
|
@ -1 +0,0 @@
|
|||||||
Subproject commit dc9622f57e78939b5cb482723ddfcef41fccf889
|
|
@ -1 +1 @@
|
|||||||
Subproject commit bb640e3cf2f287643db784df519d23ddf0a6f1f4
|
Subproject commit c2b09e5cb222c44d7c5f3b3770365de10bbf32f5
|
51
examples/core/02_current-system/CMakeLists.txt
Normal file
51
examples/core/02_current-system/CMakeLists.txt
Normal file
@ -0,0 +1,51 @@
|
|||||||
|
# Название основной цели в текущем каталоге
|
||||||
|
set(TRGT example-core-current-system)
|
||||||
|
|
||||||
|
# Список файлов исходных текстов
|
||||||
|
set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/current_system.cpp)
|
||||||
|
|
||||||
|
if(MYXLIB_BUILD_EXAMPLES)
|
||||||
|
# Путь поиска библиотек внутри проекта
|
||||||
|
link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
||||||
|
# Цель для создания исполняемого файла
|
||||||
|
add_executable(${TRGT} ${TRGT_cpp} ${TRGT_qrc})
|
||||||
|
common_target_properties(${TRGT})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой clang-tidy
|
||||||
|
add_clang_tidy_check(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой clang-analyze
|
||||||
|
add_clang_analyze_check(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой clazy
|
||||||
|
add_clazy_check(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой pvs-studio
|
||||||
|
add_pvs_check(${TRGT})
|
||||||
|
|
||||||
|
# Создание цели для автоматического форматирования кода
|
||||||
|
add_format_sources(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Qt5
|
||||||
|
target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
||||||
|
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
||||||
|
add_dependencies(${TRGT} core)
|
||||||
|
|
||||||
|
target_link_libraries(${TRGT} Qt5::Core)
|
||||||
|
target_link_libraries(${TRGT} Threads::Threads)
|
||||||
|
|
||||||
|
# Имя выходного файла для цели
|
||||||
|
set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME current-system-minimal)
|
||||||
|
|
||||||
|
add_sanitizers(${TRGT})
|
||||||
|
|
||||||
|
cotire(${TRGT})
|
||||||
|
|
||||||
|
add_dependencies(${TRGT} create_auxilary_symlinks)
|
||||||
|
|
||||||
|
# Правила для установки
|
||||||
|
# install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
|
endif()
|
23
examples/core/02_current-system/current_system.cpp
Normal file
23
examples/core/02_current-system/current_system.cpp
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
#include <myx/core/config.hpp>
|
||||||
|
#include <myx/core/current_system.hpp>
|
||||||
|
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
//NOLINTNEXTLINE
|
||||||
|
#define CMLIB_PROJECT_NAME "myxlib"
|
||||||
|
|
||||||
|
namespace MC = myx::core;
|
||||||
|
|
||||||
|
int main( int argc, char** argv )
|
||||||
|
{
|
||||||
|
(void)argc;
|
||||||
|
(void)argv;
|
||||||
|
|
||||||
|
MC::CurrentSystem& currentSystem = MC::CurrentSystem::instance();
|
||||||
|
qDebug() << "Current OS: " << QString::fromStdString( currentSystem.os() );
|
||||||
|
qDebug() << "OS distrib: " << QString::fromStdString( currentSystem.distribution() );
|
||||||
|
qDebug() << "OS variant: " << QString::fromStdString( currentSystem.variant() );
|
||||||
|
qDebug() << "OS version: " << QString::fromStdString( currentSystem.version() );
|
||||||
|
|
||||||
|
return( 0 );
|
||||||
|
} // main
|
@ -1 +1,2 @@
|
|||||||
add_subdirectory(01_endian)
|
add_subdirectory(01_endian)
|
||||||
|
add_subdirectory(02_current-system)
|
||||||
|
@ -18,19 +18,19 @@ int main( int argc, char** argv )
|
|||||||
QCoreApplication::setApplicationName( QStringLiteral( CMLIB_PROJECT_NAME ) );
|
QCoreApplication::setApplicationName( QStringLiteral( CMLIB_PROJECT_NAME ) );
|
||||||
MF::Paths& paths = MF::Paths::instance();
|
MF::Paths& paths = MF::Paths::instance();
|
||||||
|
|
||||||
paths.init();
|
|
||||||
|
|
||||||
qDebug() << "prefixDirectory : " << paths.projectDirectory();
|
qDebug() << "prefixDirectory : " << paths.projectDirectory();
|
||||||
|
|
||||||
qDebug() << "executableName : " << paths.executableName();
|
qDebug() << "executableName : " << paths.executableName();
|
||||||
qDebug() << "executableFilePath : " << paths.executableFilePath();
|
qDebug() << "executableFilePath : " << paths.executableFilePath();
|
||||||
qDebug() << "executableDirectory : " << paths.executableDirectory();
|
qDebug() << "executableDirectory : " << paths.executableDirectory() << endl;
|
||||||
|
|
||||||
|
qDebug() << "systemThemeDirectory : " << paths.systemThemeDirectory();
|
||||||
qDebug() << "systemConfigDirectory : " << paths.systemConfigDirectory();
|
qDebug() << "systemConfigDirectory : " << paths.systemConfigDirectory();
|
||||||
qDebug() << "systemConstDataDirectory : " << paths.systemConstDataDirectory();
|
qDebug() << "systemConstDataDirectory : " << paths.systemConstDataDirectory();
|
||||||
qDebug() << "systemVarDataDirectory : " << paths.systemVarDataDirectory();
|
qDebug() << "systemVarDataDirectory : " << paths.systemVarDataDirectory();
|
||||||
qDebug() << "systemLogDirectory : " << paths.systemLogDirectory();
|
qDebug() << "systemLogDirectory : " << paths.systemLogDirectory() << endl;
|
||||||
|
|
||||||
|
qDebug() << "userThemeDirectory : " << paths.userThemeDirectory();
|
||||||
qDebug() << "userConfigDirectory : " << paths.userConfigDirectory();
|
qDebug() << "userConfigDirectory : " << paths.userConfigDirectory();
|
||||||
qDebug() << "userConstDataDirectory : " << paths.userConstDataDirectory();
|
qDebug() << "userConstDataDirectory : " << paths.userConstDataDirectory();
|
||||||
qDebug() << "userVarDataDirectory : " << paths.userVarDataDirectory();
|
qDebug() << "userVarDataDirectory : " << paths.userVarDataDirectory();
|
||||||
|
53
examples/qt/03_message-logger/CMakeLists.txt
Normal file
53
examples/qt/03_message-logger/CMakeLists.txt
Normal file
@ -0,0 +1,53 @@
|
|||||||
|
# Название основной цели в текущем каталоге
|
||||||
|
set(TRGT example-qt-message-logger)
|
||||||
|
|
||||||
|
# Список файлов исходных текстов
|
||||||
|
set(TRGT_cpp ${CMAKE_CURRENT_SOURCE_DIR}/message_logger.cpp)
|
||||||
|
|
||||||
|
if(MYXLIB_BUILD_EXAMPLES)
|
||||||
|
# Путь поиска библиотек внутри проекта
|
||||||
|
link_directories(${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
|
||||||
|
|
||||||
|
# Цель для создания исполняемого файла
|
||||||
|
add_executable(${TRGT} ${TRGT_cpp})
|
||||||
|
common_target_properties(${TRGT})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой clang-tidy
|
||||||
|
add_clang_tidy_check(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой clang-analyze
|
||||||
|
add_clang_analyze_check(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой clazy
|
||||||
|
add_clazy_check(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Создание цели для проверки утилитой pvs-studio
|
||||||
|
add_pvs_check(${TRGT})
|
||||||
|
|
||||||
|
# Создание цели для автоматического форматирования кода
|
||||||
|
add_format_sources(${TRGT} ${TRGT_cpp})
|
||||||
|
|
||||||
|
# Qt5
|
||||||
|
target_include_directories(${TRGT} PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
||||||
|
target_include_directories(${TRGT} SYSTEM PUBLIC ${Qt5Core_INCLUDE_DIRS})
|
||||||
|
|
||||||
|
target_include_directories(${TRGT} SYSTEM PRIVATE ${CMAKE_SOURCE_DIR}/src)
|
||||||
|
add_dependencies(${TRGT} core qt)
|
||||||
|
|
||||||
|
target_link_libraries(${TRGT} qt_static)
|
||||||
|
|
||||||
|
target_link_libraries(${TRGT} Qt5::Core)
|
||||||
|
target_link_libraries(${TRGT} Threads::Threads)
|
||||||
|
|
||||||
|
# Имя выходного файла для цели
|
||||||
|
set_target_properties(${TRGT} PROPERTIES OUTPUT_NAME qt-message-logger)
|
||||||
|
|
||||||
|
add_sanitizers(${TRGT})
|
||||||
|
|
||||||
|
cotire(${TRGT})
|
||||||
|
|
||||||
|
add_dependencies(${TRGT} create_auxilary_symlinks)
|
||||||
|
|
||||||
|
# Правила для установки
|
||||||
|
# install(TARGETS ${TRGT} COMPONENT examples RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
|
endif()
|
29
examples/qt/03_message-logger/message_logger.cpp
Normal file
29
examples/qt/03_message-logger/message_logger.cpp
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
#include <myx/qt/message_logger_default.hpp>
|
||||||
|
#include <myx/qt/message_logger_handler.hpp>
|
||||||
|
#include <myx/qt/message_logger_syslog.hpp>
|
||||||
|
|
||||||
|
#include <QCoreApplication>
|
||||||
|
#include <QDebug>
|
||||||
|
|
||||||
|
namespace MQ = myx::qt;
|
||||||
|
int main( int argc, char* argv[] )
|
||||||
|
{
|
||||||
|
QCoreApplication app( argc, argv );
|
||||||
|
|
||||||
|
auto mld = QSharedPointer< MQ::MessageLoggerDefault >( new MQ::MessageLoggerDefault );
|
||||||
|
MQ::messageLoggersList.append( mld );
|
||||||
|
MQ::messageLoggersList.append( mld );
|
||||||
|
auto mls = QSharedPointer< MQ::MessageLoggerSyslog >( new MQ::MessageLoggerSyslog );
|
||||||
|
MQ::messageLoggersList.append( mls );
|
||||||
|
qInstallMessageHandler( MQ::message_logger_handler );
|
||||||
|
|
||||||
|
qDebug() << "Hello from process:" << QCoreApplication::applicationPid();
|
||||||
|
qWarning() << "Warning";
|
||||||
|
|
||||||
|
qInstallMessageHandler( 0 );
|
||||||
|
|
||||||
|
qDebug() << "Reset user handlers";
|
||||||
|
qWarning() << "Goodbye";
|
||||||
|
|
||||||
|
return( 0 );
|
||||||
|
}
|
@ -1,2 +1,3 @@
|
|||||||
add_subdirectory(01_translators)
|
add_subdirectory(01_translators)
|
||||||
add_subdirectory(02_posix-signal-watcher)
|
add_subdirectory(02_posix-signal-watcher)
|
||||||
|
add_subdirectory(03_message-logger)
|
||||||
|
@ -9,6 +9,7 @@ set(TRGT_cpp)
|
|||||||
set(TRGT_hpp
|
set(TRGT_hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/config.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/config.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/limits.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/limits.hpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/current_system.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/endian_types.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/endian_types.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/enum_bitmask_operations.hpp)
|
${CMAKE_CURRENT_SOURCE_DIR}/enum_bitmask_operations.hpp)
|
||||||
|
|
||||||
|
109
src/myx/core/current_system.hpp
Normal file
109
src/myx/core/current_system.hpp
Normal file
@ -0,0 +1,109 @@
|
|||||||
|
#ifndef MYX_CORE_CURRENT_SYSTEM_HPP_
|
||||||
|
#define MYX_CORE_CURRENT_SYSTEM_HPP_
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <limits>
|
||||||
|
#include <fstream>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace core {
|
||||||
|
|
||||||
|
class CurrentSystem
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
CurrentSystem( const CurrentSystem& ) = delete;
|
||||||
|
CurrentSystem& operator=( const CurrentSystem& ) = delete;
|
||||||
|
CurrentSystem( CurrentSystem&& ) = delete;
|
||||||
|
CurrentSystem& operator=( CurrentSystem&& ) = delete;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief instance
|
||||||
|
* @return Уникальный экземпляр класса CurrentSystem
|
||||||
|
*/
|
||||||
|
static CurrentSystem& instance()
|
||||||
|
{
|
||||||
|
static CurrentSystem sCurrentSystem;
|
||||||
|
return( sCurrentSystem );
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string os() const { return( m_os ); }
|
||||||
|
std::string distribution() const { return( m_distribution ); }
|
||||||
|
std::string variant() const { return( m_variant ); }
|
||||||
|
std::string version() const { return( m_version ); }
|
||||||
|
|
||||||
|
protected:
|
||||||
|
CurrentSystem() :
|
||||||
|
m_os
|
||||||
|
(
|
||||||
|
#if defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __NT__ )
|
||||||
|
"windows"
|
||||||
|
#elif __linux__
|
||||||
|
"linux"
|
||||||
|
#else
|
||||||
|
#error "Unknown OS"
|
||||||
|
#endif
|
||||||
|
)
|
||||||
|
{
|
||||||
|
#if defined( __e2k__ )
|
||||||
|
m_distribution = "debian";
|
||||||
|
m_variant = "elbrus";
|
||||||
|
std::ifstream file( "/etc/mcst_version" );
|
||||||
|
if ( file.is_open() )
|
||||||
|
{
|
||||||
|
std::getline( file, m_version );
|
||||||
|
file.close();
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
std::ifstream file( "/etc/os-release" );
|
||||||
|
if ( file.is_open() )
|
||||||
|
{
|
||||||
|
std::string line;
|
||||||
|
while ( std::getline( file, line ) )
|
||||||
|
{
|
||||||
|
std::size_t pos = line.find( "ID=" );
|
||||||
|
if ( pos == 0 )
|
||||||
|
{
|
||||||
|
m_distribution = line.replace( pos, sizeof( "ID=" ) - 1, "" );
|
||||||
|
}
|
||||||
|
|
||||||
|
pos = line.find( "VARIANT_ID=" );
|
||||||
|
if ( pos != std::string::npos )
|
||||||
|
{
|
||||||
|
m_variant = line.replace( pos, sizeof( "VARIANT_ID=" ) - 1, "" );
|
||||||
|
}
|
||||||
|
|
||||||
|
pos = line.find( "VERSION_ID=" );
|
||||||
|
if ( pos != std::string::npos )
|
||||||
|
{
|
||||||
|
m_version = line.replace( pos, sizeof( "VERSION_ID=" ) - 1, "" );
|
||||||
|
while ( ( pos = m_version.find( '"' ) ) != std::string::npos )
|
||||||
|
{
|
||||||
|
m_version.erase( pos, sizeof( '"' ) );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
file.close();
|
||||||
|
}
|
||||||
|
#endif // if defined( __e2k__ )
|
||||||
|
}
|
||||||
|
|
||||||
|
~CurrentSystem() = default;
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string m_os;
|
||||||
|
std::string m_distribution;
|
||||||
|
std::string m_variant;
|
||||||
|
std::string m_version;
|
||||||
|
}; // class CurrentSystem
|
||||||
|
|
||||||
|
// class CurrentSystem
|
||||||
|
|
||||||
|
} // namespace core
|
||||||
|
|
||||||
|
} // namespace myx
|
||||||
|
|
||||||
|
#endif // MYX_CORE_CURRENT_SYSTEM_HPP_
|
@ -14,14 +14,17 @@ namespace myx {
|
|||||||
namespace filesystem {
|
namespace filesystem {
|
||||||
|
|
||||||
MYXLIB_INLINE Paths::Paths() :
|
MYXLIB_INLINE Paths::Paths() :
|
||||||
m_binDirRegex ( "/s*bin$" ),
|
m_binDirRegex ( QStringLiteral( "/s*bin$" ) ),
|
||||||
m_unityBinDirRegex( "/bin/unity$" )
|
m_unityBinDirRegex( QStringLiteral( "/bin/unity$" ) )
|
||||||
{
|
{
|
||||||
QFileInfo procSelfExe( QStringLiteral( "/proc/self/exe" ) );
|
QFileInfo procSelfExe( QStringLiteral( "/proc/self/exe" ) );
|
||||||
QFileInfo currentExecutable = procSelfExe.canonicalFilePath();
|
QFileInfo currentExecutable = procSelfExe.canonicalFilePath();
|
||||||
m_executableName = currentExecutable.fileName();
|
m_executableName = currentExecutable.fileName();
|
||||||
m_executableFilePath = currentExecutable.absoluteFilePath();
|
m_executableFilePath = currentExecutable.absoluteFilePath();
|
||||||
m_executableDirectory = currentExecutable.absolutePath();
|
m_executableDirectory = currentExecutable.absolutePath();
|
||||||
|
|
||||||
|
// Инициализация значениями по умолчанию
|
||||||
|
init();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -54,61 +57,66 @@ MYXLIB_INLINE bool Paths::init( bool autodetect )
|
|||||||
} // Paths::init
|
} // Paths::init
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultProjectDirectory,
|
MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& projectDir,
|
||||||
const QString& defaultEtcDirectory,
|
const QString& etcDir,
|
||||||
const QString& defaultConstDataDirectory,
|
const QString& constDataDir,
|
||||||
const QString& defaultVarDataDirectory,
|
const QString& varDataDir,
|
||||||
const QString& defaultLogDirectory )
|
const QString& logDir )
|
||||||
{
|
{
|
||||||
QFileInfo prefixDirInfo { defaultProjectDirectory };
|
QFileInfo prefixDirInfo { projectDir };
|
||||||
if ( prefixDirInfo.isDir() && prefixDirInfo.isReadable() )
|
if ( prefixDirInfo.isDir() && prefixDirInfo.isReadable() )
|
||||||
{
|
{
|
||||||
m_projectDirectory = defaultProjectDirectory;
|
m_projectDirectory = projectDir;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_projectDirectory = QStringLiteral( "." );
|
m_projectDirectory = QStringLiteral( "." );
|
||||||
}
|
}
|
||||||
|
|
||||||
QFileInfo etcDirInfo { defaultEtcDirectory };
|
QFileInfo etcDirInfo { etcDir };
|
||||||
if ( etcDirInfo.isDir() && etcDirInfo.isReadable() )
|
if ( etcDirInfo.isDir() && etcDirInfo.isReadable() )
|
||||||
{
|
{
|
||||||
m_systemConfigDirectory = defaultEtcDirectory;
|
m_systemConfigDirectory = etcDir;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_systemConfigDirectory = m_userConfigDirectory;
|
m_systemConfigDirectory = m_userConfigDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
QFileInfo constDataDirInfo { defaultConstDataDirectory };
|
QFileInfo constDataDirInfo { constDataDir };
|
||||||
if ( constDataDirInfo.isDir() && constDataDirInfo.isReadable() )
|
if ( constDataDirInfo.isDir() && constDataDirInfo.isReadable() )
|
||||||
{
|
{
|
||||||
m_systemConstDataDirectory = defaultConstDataDirectory;
|
m_systemConstDataDirectory = constDataDir;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_systemConstDataDirectory = m_userConstDataDirectory;
|
m_systemConstDataDirectory = m_userConstDataDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
QFileInfo varDataDirInfo { defaultVarDataDirectory };
|
QFileInfo varDataDirInfo { varDataDir };
|
||||||
if ( varDataDirInfo.isDir() && varDataDirInfo.isWritable() )
|
if ( varDataDirInfo.isDir() && varDataDirInfo.isWritable() )
|
||||||
{
|
{
|
||||||
m_systemVarDataDirectory = defaultVarDataDirectory;
|
m_systemVarDataDirectory = varDataDir;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_systemVarDataDirectory = m_userVarDataDirectory;
|
m_systemVarDataDirectory = m_userVarDataDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
QFileInfo logDirInfo { defaultLogDirectory };
|
QFileInfo logDirInfo { logDir };
|
||||||
if ( logDirInfo.isDir() && logDirInfo.isWritable() )
|
if ( logDirInfo.isDir() && logDirInfo.isWritable() )
|
||||||
{
|
{
|
||||||
m_systemLogDirectory = defaultLogDirectory;
|
m_systemLogDirectory = logDir;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
m_systemLogDirectory = m_userLogDirectory;
|
m_systemLogDirectory = m_userLogDirectory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( !m_organizationName.isEmpty() && !m_themeName.isEmpty() )
|
||||||
|
{
|
||||||
|
m_systemThemeDirectory = "/opt/" + m_organizationName + "-" + m_themeName;
|
||||||
|
}
|
||||||
} // Paths::setupSystemDirectories
|
} // Paths::setupSystemDirectories
|
||||||
|
|
||||||
|
|
||||||
@ -118,7 +126,11 @@ MYXLIB_INLINE void Paths::setupUserDirectories()
|
|||||||
if ( !m_organizationName.isEmpty() )
|
if ( !m_organizationName.isEmpty() )
|
||||||
{
|
{
|
||||||
prefix = "/" + m_organizationName;
|
prefix = "/" + m_organizationName;
|
||||||
if ( !m_themeName.isEmpty() ) { prefix.append( "-" + m_themeName ); }
|
if ( !m_themeName.isEmpty() )
|
||||||
|
{
|
||||||
|
prefix.append( "-" + m_themeName );
|
||||||
|
m_userThemeDirectory = m_dataDirectory + prefix;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
prefix.append( "/" + m_projectName );
|
prefix.append( "/" + m_projectName );
|
||||||
m_userConfigDirectory = m_configDirectory + prefix;
|
m_userConfigDirectory = m_configDirectory + prefix;
|
||||||
@ -211,11 +223,11 @@ MYXLIB_INLINE void Paths::calculatePaths( HierarchyType hType )
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case HierarchyType::kHome:
|
case HierarchyType::kHome:
|
||||||
m_projectDirectory = m_homeDirectory;
|
setupSystemDirectories( m_homeDirectory,
|
||||||
m_systemConfigDirectory = m_userConfigDirectory;
|
m_userConfigDirectory,
|
||||||
m_systemConstDataDirectory = m_userConstDataDirectory;
|
m_userConstDataDirectory,
|
||||||
m_systemVarDataDirectory = m_userVarDataDirectory;
|
m_userVarDataDirectory,
|
||||||
m_systemLogDirectory = m_userLogDirectory;
|
m_userLogDirectory );
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case HierarchyType::kDevelopment:
|
case HierarchyType::kDevelopment:
|
||||||
@ -241,30 +253,28 @@ MYXLIB_INLINE void Paths::processOptHierarhy()
|
|||||||
|
|
||||||
if ( m_autodetect )
|
if ( m_autodetect )
|
||||||
{
|
{
|
||||||
QRegularExpression regex( "^/opt/(.+?)-(.+?)/(.+?)/" );
|
QRegularExpression regex( QStringLiteral( "^/opt/(.+?)/(.+?)/" ) );
|
||||||
QRegularExpressionMatch match = regex.match( m_executableDirectory );
|
QRegularExpressionMatch match = regex.match( m_executableDirectory );
|
||||||
if ( match.hasMatch() )
|
|
||||||
{
|
|
||||||
m_organizationName = match.captured( 1 );
|
|
||||||
m_themeName = match.captured( 2 );
|
|
||||||
m_projectName = match.captured( 3 );
|
|
||||||
|
|
||||||
QRegularExpression vr( "(.+?)\\.(.+)" );
|
|
||||||
QRegularExpressionMatch vm = vr.match( m_themeName );
|
|
||||||
if ( vm.hasMatch() )
|
|
||||||
{
|
|
||||||
m_themeName = vm.captured( 1 );
|
|
||||||
m_version = vm.captured( 2 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
regex.setPattern( "^/opt/(.+?)/(.+?)/" );
|
|
||||||
match = regex.match( m_executableDirectory );
|
|
||||||
if ( match.hasMatch() )
|
if ( match.hasMatch() )
|
||||||
{
|
{
|
||||||
m_organizationName = match.captured( 1 );
|
m_organizationName = match.captured( 1 );
|
||||||
m_projectName = match.captured( 2 );
|
m_projectName = match.captured( 2 );
|
||||||
|
|
||||||
|
QRegularExpression themeRegex( QStringLiteral( "(.+?)-(.+)" ) );
|
||||||
|
QRegularExpressionMatch themeMatch = themeRegex.match( m_organizationName );
|
||||||
|
if ( themeMatch.hasMatch() )
|
||||||
|
{
|
||||||
|
m_themeName = themeMatch.captured( 2 );
|
||||||
|
m_organizationName = themeMatch.captured( 1 );
|
||||||
|
}
|
||||||
|
|
||||||
|
QRegularExpression versionRegex( QStringLiteral( "(.+?)\\.(.+)" ) );
|
||||||
|
QRegularExpressionMatch versionMatch = versionRegex.match( m_projectName );
|
||||||
|
if ( versionMatch.hasMatch() )
|
||||||
|
{
|
||||||
|
m_projectName = versionMatch.captured( 1 );
|
||||||
|
m_version = versionMatch.captured( 2 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -284,10 +294,10 @@ MYXLIB_INLINE bool Paths::makeDefaultSystemDirectories()
|
|||||||
bool status = true;
|
bool status = true;
|
||||||
QDir dir;
|
QDir dir;
|
||||||
|
|
||||||
if ( !dir.mkpath( m_systemConfigDirectory ) ) { status = false; }
|
|
||||||
if ( !dir.mkpath( m_systemVarDataDirectory ) ) { status = false; }
|
|
||||||
if ( !dir.mkpath( m_systemConstDataDirectory ) ) { status = false; }
|
if ( !dir.mkpath( m_systemConstDataDirectory ) ) { status = false; }
|
||||||
if ( !dir.mkpath( m_systemLogDirectory ) ) { status = false; }
|
if ( !dir.mkpath( m_systemLogDirectory ) ) { status = false; }
|
||||||
|
if ( !dir.mkpath( m_systemConfigDirectory ) ) { status = false; }
|
||||||
|
if ( !dir.mkpath( m_systemVarDataDirectory ) ) { status = false; }
|
||||||
|
|
||||||
return( status );
|
return( status );
|
||||||
}
|
}
|
||||||
@ -298,10 +308,10 @@ MYXLIB_INLINE bool Paths::makeDefaultUserDirectories()
|
|||||||
bool status = true;
|
bool status = true;
|
||||||
QDir dir;
|
QDir dir;
|
||||||
|
|
||||||
if ( !dir.mkpath( m_userConfigDirectory ) ) { status = false; }
|
|
||||||
if ( !dir.mkpath( m_userVarDataDirectory ) ) { status = false; }
|
|
||||||
if ( !dir.mkpath( m_userConstDataDirectory ) ) { status = false; }
|
if ( !dir.mkpath( m_userConstDataDirectory ) ) { status = false; }
|
||||||
if ( !dir.mkpath( m_userLogDirectory ) ) { status = false; }
|
if ( !dir.mkpath( m_userLogDirectory ) ) { status = false; }
|
||||||
|
if ( !dir.mkpath( m_userConfigDirectory ) ) { status = false; }
|
||||||
|
if ( !dir.mkpath( m_userVarDataDirectory ) ) { status = false; }
|
||||||
|
|
||||||
return( status );
|
return( status );
|
||||||
}
|
}
|
||||||
@ -349,6 +359,18 @@ MYXLIB_INLINE const QString& Paths::systemConfigDirectory() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MYXLIB_INLINE const QString& Paths::userThemeDirectory() const
|
||||||
|
{
|
||||||
|
return( m_userThemeDirectory );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MYXLIB_INLINE const QString& Paths::systemThemeDirectory() const
|
||||||
|
{
|
||||||
|
return( m_systemThemeDirectory );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE const QString& Paths::userVarDataDirectory() const
|
MYXLIB_INLINE const QString& Paths::userVarDataDirectory() const
|
||||||
{
|
{
|
||||||
return( m_userVarDataDirectory );
|
return( m_userVarDataDirectory );
|
||||||
|
@ -91,6 +91,12 @@ public:
|
|||||||
/** @brief Полный путь к каталогу с исполняемым файлом */
|
/** @brief Полный путь к каталогу с исполняемым файлом */
|
||||||
const QString& executableDirectory() const;
|
const QString& executableDirectory() const;
|
||||||
|
|
||||||
|
/** @brief Путь к общему пользовательскому каталогу для файлов работы (темы) */
|
||||||
|
const QString& userThemeDirectory() const;
|
||||||
|
|
||||||
|
/** @brief Путь к общему системному каталогу для файлов работы (темы) */
|
||||||
|
const QString& systemThemeDirectory() const;
|
||||||
|
|
||||||
/** @brief Полный путь к пользовательскому каталогу с файлами настройки */
|
/** @brief Полный путь к пользовательскому каталогу с файлами настройки */
|
||||||
const QString& userConfigDirectory() const;
|
const QString& userConfigDirectory() const;
|
||||||
|
|
||||||
@ -121,9 +127,6 @@ public:
|
|||||||
/** @brief Полный путь к домашнему каталогу текущего пользователя */
|
/** @brief Полный путь к домашнему каталогу текущего пользователя */
|
||||||
const QString& homeDirectory() const;
|
const QString& homeDirectory() const;
|
||||||
|
|
||||||
/** @brief Имя каталога для работы (темы) */
|
|
||||||
const QString& themeDirectory() const;
|
|
||||||
|
|
||||||
/** @brief Имя каталога для проекта */
|
/** @brief Имя каталога для проекта */
|
||||||
const QString& projectDirectory() const;
|
const QString& projectDirectory() const;
|
||||||
|
|
||||||
@ -170,9 +173,6 @@ private:
|
|||||||
QString m_executableFilePath;
|
QString m_executableFilePath;
|
||||||
QString m_executableDirectory;
|
QString m_executableDirectory;
|
||||||
|
|
||||||
/** @brief Общий каталог для файлов работы (темы) */
|
|
||||||
QString m_themeDirectory;
|
|
||||||
|
|
||||||
/** @brief Общий каталог для файлов проекта */
|
/** @brief Общий каталог для файлов проекта */
|
||||||
QString m_projectDirectory;
|
QString m_projectDirectory;
|
||||||
|
|
||||||
@ -185,6 +185,11 @@ private:
|
|||||||
/** @brief Путь к общему пользовательскому каталогу данных */
|
/** @brief Путь к общему пользовательскому каталогу данных */
|
||||||
QString m_dataDirectory;
|
QString m_dataDirectory;
|
||||||
|
|
||||||
|
/** @brief Путь к общему пользовательскому каталогу для файлов работы (темы) */
|
||||||
|
QString m_userThemeDirectory;
|
||||||
|
/** @brief Путь к общему системному каталогу для файлов работы (темы) */
|
||||||
|
QString m_systemThemeDirectory;
|
||||||
|
|
||||||
/** @brief Путь к пользовательскому каталогу с изменяемыми файлами */
|
/** @brief Путь к пользовательскому каталогу с изменяемыми файлами */
|
||||||
QString m_userVarDataDirectory;
|
QString m_userVarDataDirectory;
|
||||||
/** @brief Путь к системному каталогу с изменяемыми файлами */
|
/** @brief Путь к системному каталогу с изменяемыми файлами */
|
||||||
@ -208,11 +213,11 @@ private:
|
|||||||
QRegularExpression m_binDirRegex;
|
QRegularExpression m_binDirRegex;
|
||||||
QRegularExpression m_unityBinDirRegex;
|
QRegularExpression m_unityBinDirRegex;
|
||||||
|
|
||||||
void setupSystemDirectories( const QString& defaultProjectDirectory,
|
void setupSystemDirectories( const QString& projectDir,
|
||||||
const QString& defaultEtcDirectory,
|
const QString& etcDir,
|
||||||
const QString& defaultConstDataDirectory,
|
const QString& constDataDir,
|
||||||
const QString& defaultVarDataDirectory,
|
const QString& varDataDir,
|
||||||
const QString& defaultLogDirectory );
|
const QString& logDir );
|
||||||
void setupUserDirectories();
|
void setupUserDirectories();
|
||||||
|
|
||||||
HierarchyType getHierarchyType();
|
HierarchyType getHierarchyType();
|
||||||
|
@ -6,6 +6,9 @@ set(TRGT qt)
|
|||||||
set(TRGT_cpp
|
set(TRGT_cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/posix_signal_watcher.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/posix_signal_watcher.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/translators.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/message_logger_default.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/message_logger_handler.cpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/message_logger_syslog.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(TRGT_moc_hpp
|
set(TRGT_moc_hpp
|
||||||
@ -18,6 +21,10 @@ set(TRGT_moc_private_hpp
|
|||||||
|
|
||||||
set(TRGT_hpp
|
set(TRGT_hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/translators.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/translators.hpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/message_logger.hpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/message_logger_default.hpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/message_logger_handler.hpp
|
||||||
|
${CMAKE_CURRENT_SOURCE_DIR}/message_logger_syslog.hpp
|
||||||
)
|
)
|
||||||
|
|
||||||
set(TRGT_headers ${TRGT_moc_hpp} ${TRGT_hpp})
|
set(TRGT_headers ${TRGT_moc_hpp} ${TRGT_hpp})
|
||||||
|
44
src/myx/qt/message_logger.hpp
Normal file
44
src/myx/qt/message_logger.hpp
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
#ifndef MYX_QT_MESSAGE_LOGGER_HPP_
|
||||||
|
#define MYX_QT_MESSAGE_LOGGER_HPP_
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <myx/backports/qt/common.hpp>
|
||||||
|
#include <myx/core/config.hpp>
|
||||||
|
|
||||||
|
#include <QList>
|
||||||
|
#include <QMessageLogContext>
|
||||||
|
#include <QSharedPointer>
|
||||||
|
#include <QString>
|
||||||
|
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace qt {
|
||||||
|
|
||||||
|
class MessageLogger
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual ~MessageLogger() noexcept ( true ) = default;
|
||||||
|
|
||||||
|
virtual void debug( const QMessageLogContext& context, const QString& ) = 0;
|
||||||
|
virtual void info( const QMessageLogContext& context, const QString& ) = 0;
|
||||||
|
virtual void warning( const QMessageLogContext& context, const QString& ) = 0;
|
||||||
|
virtual void critical( const QMessageLogContext& context, const QString& ) = 0;
|
||||||
|
virtual void fatal( const QMessageLogContext& context, const QString& ) = 0;
|
||||||
|
|
||||||
|
void setEnabled( bool v = true ) { m_enabled = v; }
|
||||||
|
bool isEnabled() { return( m_enabled ); }
|
||||||
|
|
||||||
|
protected:
|
||||||
|
bool m_enabled { true };
|
||||||
|
};
|
||||||
|
|
||||||
|
using MessageLoggersList = QList< QSharedPointer< MessageLogger > >;
|
||||||
|
extern MessageLoggersList messageLoggersList;
|
||||||
|
|
||||||
|
} // namespace qt
|
||||||
|
|
||||||
|
} // namespace myx
|
||||||
|
|
||||||
|
#endif // ifndef MYX_QT_MESSAGE_LOGGER_HPP_
|
46
src/myx/qt/message_logger_default.cpp
Normal file
46
src/myx/qt/message_logger_default.cpp
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
#include <myx/backports/qt/common.hpp>
|
||||||
|
#include <myx/core/config.hpp>
|
||||||
|
|
||||||
|
#include <myx/qt/message_logger_default.hpp>
|
||||||
|
|
||||||
|
#include <QtDebug>
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace qt {
|
||||||
|
|
||||||
|
void MessageLoggerDefault::debug( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
fprintf( stderr, "D: %s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerDefault::info( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
fprintf( stderr, "I: %s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerDefault::warning( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
fprintf( stderr, "W: %s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerDefault::critical( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerDefault::fatal( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace qt
|
||||||
|
|
||||||
|
} // namespace myx
|
31
src/myx/qt/message_logger_default.hpp
Normal file
31
src/myx/qt/message_logger_default.hpp
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
#ifndef MYX_QT_MESSAGE_LOGGER_DEFAULT_HPP_
|
||||||
|
#define MYX_QT_MESSAGE_LOGGER_DEFAULT_HPP_
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <myx/backports/qt/common.hpp>
|
||||||
|
#include <myx/core/config.hpp>
|
||||||
|
#include <myx/qt/message_logger.hpp>
|
||||||
|
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace qt {
|
||||||
|
|
||||||
|
class MessageLoggerDefault : public MessageLogger
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual ~MessageLoggerDefault() noexcept ( true ) = default;
|
||||||
|
|
||||||
|
void debug( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void info( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void warning( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void critical( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void fatal( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace qt
|
||||||
|
|
||||||
|
} // namespace myx
|
||||||
|
|
||||||
|
#endif // ifndef MYX_QT_MESSAGE_LOGGER_DEFAULT_HPP_
|
81
src/myx/qt/message_logger_handler.cpp
Normal file
81
src/myx/qt/message_logger_handler.cpp
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
#include <myx/backports/qt/common.hpp>
|
||||||
|
#include <myx/core/config.hpp>
|
||||||
|
|
||||||
|
#include <myx/qt/message_logger.hpp>
|
||||||
|
|
||||||
|
#include <QtDebug>
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace qt {
|
||||||
|
|
||||||
|
MessageLoggersList messageLoggersList;
|
||||||
|
|
||||||
|
void message_logger_handler( QtMsgType type, const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
if ( messageLoggersList.isEmpty() )
|
||||||
|
{
|
||||||
|
QByteArray localMsg = msg.toLocal8Bit();
|
||||||
|
const char* file = context.file ? context.file : "";
|
||||||
|
const char* function = context.function ? context.function : "";
|
||||||
|
switch ( type )
|
||||||
|
{
|
||||||
|
case QtDebugMsg:
|
||||||
|
#ifndef QT_NO_DEBUG_OUTPUT
|
||||||
|
// fprintf( stderr, "Debug: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function );
|
||||||
|
fprintf( stderr, "%s\n", localMsg.constData() );
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
case QtInfoMsg:
|
||||||
|
#ifndef QT_NO_INFO_OUTPUT
|
||||||
|
// fprintf( stderr, "Info: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function );
|
||||||
|
fprintf( stderr, "%s\n", localMsg.constData() );
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
case QtWarningMsg:
|
||||||
|
#ifndef QT_NO_WARNING_OUTPUT
|
||||||
|
// fprintf( stderr, "Warning: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function );
|
||||||
|
fprintf( stderr, "%s\n", localMsg.constData() );
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
case QtCriticalMsg:
|
||||||
|
// fprintf( stderr, "Critical: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function );
|
||||||
|
fprintf( stderr, "%s\n", localMsg.constData() );
|
||||||
|
break;
|
||||||
|
case QtFatalMsg:
|
||||||
|
// fprintf( stderr, "Fatal: %s (%s:%u, %s)\n", localMsg.constData(), file, context.line, function );
|
||||||
|
fprintf( stderr, "%s\n", localMsg.constData() );
|
||||||
|
break;
|
||||||
|
} // switch
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
switch ( type )
|
||||||
|
{
|
||||||
|
case QtDebugMsg:
|
||||||
|
for ( auto& m: qAsConst( messageLoggersList ) )
|
||||||
|
{ if ( m->isEnabled() ) { m->debug( context, msg ); } }
|
||||||
|
break;
|
||||||
|
case QtInfoMsg:
|
||||||
|
for ( auto& m: qAsConst( messageLoggersList ) )
|
||||||
|
{ if ( m->isEnabled() ) { m->info( context, msg ); } }
|
||||||
|
break;
|
||||||
|
case QtWarningMsg:
|
||||||
|
for ( auto& m: qAsConst( messageLoggersList ) )
|
||||||
|
{ if ( m->isEnabled() ) { m->warning( context, msg ); } }
|
||||||
|
break;
|
||||||
|
case QtCriticalMsg:
|
||||||
|
for ( auto& m: qAsConst( messageLoggersList ) )
|
||||||
|
{ if ( m->isEnabled() ) { m->critical( context, msg ); } }
|
||||||
|
break;
|
||||||
|
case QtFatalMsg:
|
||||||
|
for ( auto& m: qAsConst( messageLoggersList ) )
|
||||||
|
{ if ( m->isEnabled() ) { m->fatal( context, msg ); } }
|
||||||
|
break;
|
||||||
|
} // switch
|
||||||
|
}
|
||||||
|
} // message_logger_handler
|
||||||
|
|
||||||
|
} // namespace qt
|
||||||
|
|
||||||
|
} // namespace myx
|
20
src/myx/qt/message_logger_handler.hpp
Normal file
20
src/myx/qt/message_logger_handler.hpp
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
#ifndef MYX_QT_MESSAGE_LOGGER_HANDLER_HPP_
|
||||||
|
#define MYX_QT_MESSAGE_LOGGER_HANDLER_HPP_
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <myx/backports/qt/common.hpp>
|
||||||
|
#include <myx/core/config.hpp>
|
||||||
|
#include <myx/qt/message_logger.hpp>
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace qt {
|
||||||
|
|
||||||
|
void message_logger_handler( QtMsgType type, const QMessageLogContext& context, const QString& msg );
|
||||||
|
|
||||||
|
} // namespace qt
|
||||||
|
|
||||||
|
} // namespace myx
|
||||||
|
|
||||||
|
#endif // ifndef MYX_QT_MESSAGE_LOGGER_HANDLER_HPP_
|
61
src/myx/qt/message_logger_syslog.cpp
Normal file
61
src/myx/qt/message_logger_syslog.cpp
Normal file
@ -0,0 +1,61 @@
|
|||||||
|
#include <myx/backports/qt/common.hpp>
|
||||||
|
#include <myx/core/config.hpp>
|
||||||
|
|
||||||
|
#include <myx/qt/message_logger_syslog.hpp>
|
||||||
|
|
||||||
|
#include <syslog.h>
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace qt {
|
||||||
|
|
||||||
|
MessageLoggerSyslog::MessageLoggerSyslog() :
|
||||||
|
MessageLogger()
|
||||||
|
{
|
||||||
|
// openlog( nullptr, LOG_ODELAY, LOG_USER );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MessageLoggerSyslog::~MessageLoggerSyslog() noexcept ( true )
|
||||||
|
{
|
||||||
|
closelog();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerSyslog::debug( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
syslog( LOG_DEBUG, "%s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerSyslog::info( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
syslog( LOG_INFO, "%s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerSyslog::warning( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
syslog( LOG_WARNING, "%s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerSyslog::critical( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
syslog( LOG_CRIT, "%s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void MessageLoggerSyslog::fatal( const QMessageLogContext& context, const QString& msg )
|
||||||
|
{
|
||||||
|
Q_UNUSED( context )
|
||||||
|
syslog( LOG_EMERG, "%s\n", msg.toUtf8().data() );
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace qt
|
||||||
|
|
||||||
|
} // namespace myx
|
32
src/myx/qt/message_logger_syslog.hpp
Normal file
32
src/myx/qt/message_logger_syslog.hpp
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
#ifndef MYX_QT_MESSAGE_LOGGER_SYSLOG_HPP_
|
||||||
|
#define MYX_QT_MESSAGE_LOGGER_SYSLOG_HPP_
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <myx/backports/qt/common.hpp>
|
||||||
|
#include <myx/core/config.hpp>
|
||||||
|
#include <myx/qt/message_logger.hpp>
|
||||||
|
|
||||||
|
|
||||||
|
namespace myx {
|
||||||
|
|
||||||
|
namespace qt {
|
||||||
|
|
||||||
|
class MessageLoggerSyslog : public MessageLogger
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
MessageLoggerSyslog();
|
||||||
|
virtual ~MessageLoggerSyslog() noexcept ( true );
|
||||||
|
|
||||||
|
void debug( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void info( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void warning( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void critical( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
void fatal( const QMessageLogContext& context, const QString& msg ) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace qt
|
||||||
|
|
||||||
|
} // namespace myx
|
||||||
|
|
||||||
|
#endif // ifndef MYX_QT_MESSAGE_LOGGER_SYSLOG_HPP_
|
Loading…
Reference in New Issue
Block a user