Compare commits
No commits in common. "297b04bd565bc034159d35d9c1d55da1b306e381" and "c1c0325bce727730adfacf9c448d634cdcebcbbf" have entirely different histories.
297b04bd56
...
c1c0325bce
248
.cmake-format.py
248
.cmake-format.py
@ -1,248 +0,0 @@
|
|||||||
#!/usr/bin/env python3
|
|
||||||
|
|
||||||
# ----------------------------------
|
|
||||||
# Options affecting listfile parsing
|
|
||||||
# ----------------------------------
|
|
||||||
with section("parse"):
|
|
||||||
|
|
||||||
# Specify structure for custom cmake functions
|
|
||||||
additional_commands = {
|
|
||||||
'add_doxygen': { 'flags' : [],
|
|
||||||
'kwargs': { 'LATEX': 1,
|
|
||||||
'HTML': 1,
|
|
||||||
'COMMENT': 1}},
|
|
||||||
'add_breathe': { 'flags' : [],
|
|
||||||
'kwargs': { 'COMMENT': 1}},
|
|
||||||
'add_common_library': { 'flags' : [],
|
|
||||||
'kwargs': { 'OUTPUT_NAME': 1,
|
|
||||||
'SOURCES': '*',
|
|
||||||
'TARGET': 1}},
|
|
||||||
'qt5_translation': { 'flags' : [],
|
|
||||||
'kwargs': { 'OUTPUT_DIR': 1,
|
|
||||||
'LANGUAGES': '*',
|
|
||||||
'SOURCES': '*',
|
|
||||||
'BASE_NAME': 1}},
|
|
||||||
'pvs_studio_add_target': { 'flags' : [ 'COMPILE_COMMANDS',
|
|
||||||
'OUTPUT',
|
|
||||||
'HIDE_HELP'],
|
|
||||||
'kwargs': { 'ARGS': '*',
|
|
||||||
'CONFIG': '*',
|
|
||||||
'DEPENDS': '*',
|
|
||||||
'FORMAT': '*',
|
|
||||||
'MODE': '*',
|
|
||||||
'TARGET': 1}},
|
|
||||||
'write_compiler_detection_header': { 'flags' : [],
|
|
||||||
'kwargs': { 'COMPILERS': '*',
|
|
||||||
'FEATURES': '*',
|
|
||||||
'FILE': '*',
|
|
||||||
'PREFIX': '*'}}}
|
|
||||||
|
|
||||||
# Specify variable tags.
|
|
||||||
vartags = []
|
|
||||||
|
|
||||||
# Specify property tags.
|
|
||||||
proptags = []
|
|
||||||
|
|
||||||
# -----------------------------
|
|
||||||
# Options affecting formatting.
|
|
||||||
# -----------------------------
|
|
||||||
with section("format"):
|
|
||||||
|
|
||||||
# How wide to allow formatted cmake files
|
|
||||||
line_width = 110
|
|
||||||
|
|
||||||
# How many spaces to tab for indent
|
|
||||||
tab_size = 2
|
|
||||||
|
|
||||||
# If an argument group contains more than this many sub-groups (parg or kwarg
|
|
||||||
# groups) then force it to a vertical layout.
|
|
||||||
max_subgroups_hwrap = 3
|
|
||||||
|
|
||||||
# If a positional argument group contains more than this many arguments, then
|
|
||||||
# force it to a vertical layout.
|
|
||||||
max_pargs_hwrap = 5
|
|
||||||
|
|
||||||
# If a cmdline positional group consumes more than this many lines without
|
|
||||||
# nesting, then invalidate the layout (and nest)
|
|
||||||
max_rows_cmdline = 2
|
|
||||||
|
|
||||||
# If true, separate flow control names from their parentheses with a space
|
|
||||||
separate_ctrl_name_with_space = False
|
|
||||||
|
|
||||||
# If true, separate function names from parentheses with a space
|
|
||||||
separate_fn_name_with_space = False
|
|
||||||
|
|
||||||
# If a statement is wrapped to more than one line, than dangle the closing
|
|
||||||
# parenthesis on its own line.
|
|
||||||
dangle_parens = False
|
|
||||||
|
|
||||||
# If the trailing parenthesis must be 'dangled' on its on line, then align it
|
|
||||||
# to this reference: `prefix`: the start of the statement, `prefix-indent`:
|
|
||||||
# the start of the statement, plus one indentation level, `child`: align to
|
|
||||||
# the column of the arguments
|
|
||||||
dangle_align = 'prefix'
|
|
||||||
|
|
||||||
# If the statement spelling length (including space and parenthesis) is
|
|
||||||
# smaller than this amount, then force reject nested layouts.
|
|
||||||
min_prefix_chars = 4
|
|
||||||
|
|
||||||
# If the statement spelling length (including space and parenthesis) is larger
|
|
||||||
# than the tab width by more than this amount, then force reject un-nested
|
|
||||||
# layouts.
|
|
||||||
max_prefix_chars = 2
|
|
||||||
|
|
||||||
# If a candidate layout is wrapped horizontally but it exceeds this many
|
|
||||||
# lines, then reject the layout.
|
|
||||||
max_lines_hwrap = 2
|
|
||||||
|
|
||||||
# What style line endings to use in the output.
|
|
||||||
line_ending = 'unix'
|
|
||||||
|
|
||||||
# Format command names consistently as 'lower' or 'upper' case
|
|
||||||
command_case = 'canonical'
|
|
||||||
|
|
||||||
# Format keywords consistently as 'lower' or 'upper' case
|
|
||||||
keyword_case = 'upper'
|
|
||||||
|
|
||||||
# A list of command names which should always be wrapped
|
|
||||||
always_wrap = []
|
|
||||||
|
|
||||||
# If true, the argument lists which are known to be sortable will be sorted
|
|
||||||
# lexicographicall
|
|
||||||
enable_sort = True
|
|
||||||
|
|
||||||
# If true, the parsers may infer whether or not an argument list is sortable
|
|
||||||
# (without annotation).
|
|
||||||
autosort = False
|
|
||||||
|
|
||||||
# By default, if cmake-format cannot successfully fit everything into the
|
|
||||||
# desired linewidth it will apply the last, most agressive attempt that it
|
|
||||||
# made. If this flag is True, however, cmake-format will print error, exit
|
|
||||||
# with non-zero status code, and write-out nothing
|
|
||||||
require_valid_layout = False
|
|
||||||
|
|
||||||
# A dictionary mapping layout nodes to a list of wrap decisions. See the
|
|
||||||
# documentation for more information.
|
|
||||||
layout_passes = {}
|
|
||||||
|
|
||||||
# ------------------------------------------------
|
|
||||||
# Options affecting comment reflow and formatting.
|
|
||||||
# ------------------------------------------------
|
|
||||||
with section("markup"):
|
|
||||||
|
|
||||||
# What character to use for bulleted lists
|
|
||||||
bullet_char = '*'
|
|
||||||
|
|
||||||
# What character to use as punctuation after numerals in an enumerated list
|
|
||||||
enum_char = '.'
|
|
||||||
|
|
||||||
# If comment markup is enabled, don't reflow the first comment block in each
|
|
||||||
# listfile. Use this to preserve formatting of your copyright/license
|
|
||||||
# statements.
|
|
||||||
first_comment_is_literal = False
|
|
||||||
|
|
||||||
# If comment markup is enabled, don't reflow any comment block which matches
|
|
||||||
# this (regex) pattern. Default is `None` (disabled).
|
|
||||||
literal_comment_pattern = None
|
|
||||||
|
|
||||||
# Regular expression to match preformat fences in comments default=
|
|
||||||
# ``r'^\s*([`~]{3}[`~]*)(.*)$'``
|
|
||||||
fence_pattern = '^\\s*([`~]{3}[`~]*)(.*)$'
|
|
||||||
|
|
||||||
# Regular expression to match rulers in comments default=
|
|
||||||
# ``r'^\s*[^\w\s]{3}.*[^\w\s]{3}$'``
|
|
||||||
ruler_pattern = '^\\s*[^\\w\\s]{3}.*[^\\w\\s]{3}$'
|
|
||||||
|
|
||||||
# If a comment line matches starts with this pattern then it is explicitly a
|
|
||||||
# trailing comment for the preceeding argument. Default is '#<'
|
|
||||||
explicit_trailing_pattern = '#<'
|
|
||||||
|
|
||||||
# If a comment line starts with at least this many consecutive hash
|
|
||||||
# characters, then don't lstrip() them off. This allows for lazy hash rulers
|
|
||||||
# where the first hash char is not separated by space
|
|
||||||
hashruler_min_length = 10
|
|
||||||
|
|
||||||
# If true, then insert a space between the first hash char and remaining hash
|
|
||||||
# chars in a hash ruler, and normalize its length to fill the column
|
|
||||||
canonicalize_hashrulers = True
|
|
||||||
|
|
||||||
# enable comment markup parsing and reflow
|
|
||||||
enable_markup = False
|
|
||||||
|
|
||||||
# ----------------------------
|
|
||||||
# Options affecting the linter
|
|
||||||
# ----------------------------
|
|
||||||
with section("lint"):
|
|
||||||
|
|
||||||
# a list of lint codes to disable
|
|
||||||
disabled_codes = ['C0113']
|
|
||||||
|
|
||||||
# regular expression pattern describing valid function names
|
|
||||||
function_pattern = '[0-9a-z_]+'
|
|
||||||
|
|
||||||
# regular expression pattern describing valid macro names
|
|
||||||
macro_pattern = '[0-9A-Z_]+'
|
|
||||||
|
|
||||||
# regular expression pattern describing valid names for variables with global
|
|
||||||
# scope
|
|
||||||
global_var_pattern = '[0-9A-Z][0-9A-Z_]+'
|
|
||||||
|
|
||||||
# regular expression pattern describing valid names for variables with global
|
|
||||||
# scope (but internal semantic)
|
|
||||||
internal_var_pattern = '_[0-9A-Z][0-9A-Z_]+'
|
|
||||||
|
|
||||||
# regular expression pattern describing valid names for variables with local
|
|
||||||
# scope
|
|
||||||
local_var_pattern = '[0-9a-z_]+'
|
|
||||||
|
|
||||||
# regular expression pattern describing valid names for privatedirectory
|
|
||||||
# variables
|
|
||||||
private_var_pattern = '_[0-9a-z_]+'
|
|
||||||
|
|
||||||
# regular expression pattern describing valid names for publicdirectory
|
|
||||||
# variables
|
|
||||||
public_var_pattern = '[0-9A-Z][0-9A-Z_]+'
|
|
||||||
|
|
||||||
# regular expression pattern describing valid names for keywords used in
|
|
||||||
# functions or macros
|
|
||||||
keyword_pattern = '[0-9A-Z_]+'
|
|
||||||
|
|
||||||
# In the heuristic for C0201, how many conditionals to match within a loop in
|
|
||||||
# before considering the loop a parser.
|
|
||||||
max_conditionals_custom_parser = 2
|
|
||||||
|
|
||||||
# Require at least this many newlines between statements
|
|
||||||
min_statement_spacing = 1
|
|
||||||
|
|
||||||
# Require no more than this many newlines between statements
|
|
||||||
max_statement_spacing = 2
|
|
||||||
max_returns = 6
|
|
||||||
max_branches = 12
|
|
||||||
max_arguments = 5
|
|
||||||
max_localvars = 15
|
|
||||||
max_statements = 50
|
|
||||||
|
|
||||||
# -------------------------------
|
|
||||||
# Options affecting file encoding
|
|
||||||
# -------------------------------
|
|
||||||
with section("encode"):
|
|
||||||
|
|
||||||
# If true, emit the unicode byte-order mark (BOM) at the start of the file
|
|
||||||
emit_byteorder_mark = False
|
|
||||||
|
|
||||||
# Specify the encoding of the input file. Defaults to utf-8
|
|
||||||
input_encoding = 'utf-8'
|
|
||||||
|
|
||||||
# Specify the encoding of the output file. Defaults to utf-8. Note that cmake
|
|
||||||
# only claims to support utf-8 so be careful when using anything else
|
|
||||||
output_encoding = 'utf-8'
|
|
||||||
|
|
||||||
# -------------------------------------
|
|
||||||
# Miscellaneous configurations options.
|
|
||||||
# -------------------------------------
|
|
||||||
with section("misc"):
|
|
||||||
|
|
||||||
# A dictionary containing any per-command configuration overrides. Currently
|
|
||||||
# only `command_case` is supported.
|
|
||||||
per_command = {}
|
|
||||||
|
|
@ -5,12 +5,6 @@ cmake_policy(VERSION 3.0.2..3.7)
|
|||||||
# Название проекта
|
# Название проекта
|
||||||
project(myx VERSION 0.4.0 LANGUAGES C CXX)
|
project(myx VERSION 0.4.0 LANGUAGES C CXX)
|
||||||
|
|
||||||
# Обязательные переменные
|
|
||||||
set(CMLIB_ORGANIZATION_NAME "ECS5" CACHE STRING "")
|
|
||||||
set(CMLIB_AUTHOR_NAME "Андрей Астафьев" CACHE STRING "")
|
|
||||||
set(CMLIB_AUTHOR_EMAIL "dev@246060.ru" CACHE STRING "")
|
|
||||||
set(CMLIB_DESCRIPTION "Разные функции" CACHE STRING "")
|
|
||||||
|
|
||||||
# В каталоге cmake/lib находятся файлы с библиотечными функциями
|
# В каталоге cmake/lib находятся файлы с библиотечными функциями
|
||||||
if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/cmlib)
|
if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/cmlib)
|
||||||
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/cmlib)
|
list(INSERT CMAKE_MODULE_PATH 0 ${CMAKE_SOURCE_DIR}/cmake/cmlib)
|
||||||
|
@ -1 +1 @@
|
|||||||
Subproject commit 5e600ab490fc789667062e998bb48effb9bf35a0
|
Subproject commit dbc0b76a76be90fa9875ad7ab8114dc9d487ee64
|
@ -26,6 +26,9 @@ int main( int argc, char** argv )
|
|||||||
qDebug() << "executableFilePath : " << paths.executableFilePath();
|
qDebug() << "executableFilePath : " << paths.executableFilePath();
|
||||||
qDebug() << "executableDirectory : " << paths.executableDirectory();
|
qDebug() << "executableDirectory : " << paths.executableDirectory();
|
||||||
|
|
||||||
|
qDebug() << "configFileName : " << paths.configFileName();
|
||||||
|
qDebug() << "configFilePath : " << paths.configFilePath();
|
||||||
|
|
||||||
qDebug() << "systemConfigDirectory : " << paths.systemConfigDirectory();
|
qDebug() << "systemConfigDirectory : " << paths.systemConfigDirectory();
|
||||||
qDebug() << "systemConstDataDirectory : " << paths.systemConstDataDirectory();
|
qDebug() << "systemConstDataDirectory : " << paths.systemConstDataDirectory();
|
||||||
qDebug() << "systemVarDataDirectory : " << paths.systemVarDataDirectory();
|
qDebug() << "systemVarDataDirectory : " << paths.systemVarDataDirectory();
|
||||||
|
@ -36,8 +36,6 @@ add_format_sources(${TRGT} ${TRGT_cpp} ${TRGT_headers})
|
|||||||
target_include_directories(${TRGT} INTERFACE ${CMAKE_SOURCE_DIR}/src)
|
target_include_directories(${TRGT} INTERFACE ${CMAKE_SOURCE_DIR}/src)
|
||||||
|
|
||||||
generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
|
generate_pkgconfig(myx-${TRGT} COMPONENT base-dev INSTALL_LIBRARY ${MYXLIB_BUILD_LIBRARIES})
|
||||||
install(FILES ${TRGT_headers} COMPONENT base-dev
|
|
||||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/${TRGT})
|
|
||||||
|
|
||||||
# Цель, используемая только для установки заголовочных файлов без компиляции проекта
|
# Цель, используемая только для установки заголовочных файлов без компиляции проекта
|
||||||
add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P
|
add_custom_target(${TRGT}-install-headers COMMAND "${CMAKE_COMMAND}" -DCMAKE_INSTALL_COMPONENT=base-dev -P
|
||||||
|
@ -9,13 +9,18 @@
|
|||||||
#include <QCoreApplication>
|
#include <QCoreApplication>
|
||||||
#include <QString>
|
#include <QString>
|
||||||
|
|
||||||
|
#ifndef QT_NO_DEBUG
|
||||||
|
#include <QDebug>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace myx {
|
namespace myx {
|
||||||
|
|
||||||
namespace filesystem {
|
namespace filesystem {
|
||||||
|
|
||||||
MYXLIB_INLINE Paths::Paths() :
|
MYXLIB_INLINE Paths::Paths() :
|
||||||
|
m_configFileExtension( ".conf" ),
|
||||||
m_binDirRegex ( "/s*bin$" ),
|
m_binDirRegex ( "/s*bin$" ),
|
||||||
m_unityBinDirRegex( "/bin/unity$" )
|
m_unityBinDirRegex ( "/bin/unity$" )
|
||||||
{
|
{
|
||||||
QFileInfo procSelfExe( QStringLiteral( "/proc/self/exe" ) );
|
QFileInfo procSelfExe( QStringLiteral( "/proc/self/exe" ) );
|
||||||
QFileInfo currentExecutable = procSelfExe.canonicalFilePath();
|
QFileInfo currentExecutable = procSelfExe.canonicalFilePath();
|
||||||
@ -25,9 +30,33 @@ MYXLIB_INLINE Paths::Paths() :
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE bool Paths::init( bool autodetect )
|
MYXLIB_INLINE bool Paths::init()
|
||||||
|
{
|
||||||
|
m_configFileName = m_executableName + m_configFileExtension;
|
||||||
|
return( initCommon() );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//MYXLIB_INLINE bool Paths::init( const QString& configFileName )
|
||||||
|
//{
|
||||||
|
// m_configFileName = configFileName;
|
||||||
|
// return( initCommon() );
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
//MYXLIB_INLINE bool Paths::init( const QString& projectName, const QString& configFileExtension )
|
||||||
|
//{
|
||||||
|
// m_projectName = projectName.isEmpty() ? m_executableName
|
||||||
|
// : projectName;
|
||||||
|
// auto ext = configFileExtension.isEmpty() ? QStringLiteral( "conf" )
|
||||||
|
// : configFileExtension;
|
||||||
|
// m_configFileName = m_projectName + "." + ext;
|
||||||
|
// return( initCommon() );
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
MYXLIB_INLINE bool Paths::initCommon()
|
||||||
{
|
{
|
||||||
m_autodetect = autodetect;
|
|
||||||
m_homeDirectory = QDir::homePath();
|
m_homeDirectory = QDir::homePath();
|
||||||
m_tempDirectory = QDir::tempPath();
|
m_tempDirectory = QDir::tempPath();
|
||||||
|
|
||||||
@ -43,15 +72,13 @@ MYXLIB_INLINE bool Paths::init( bool autodetect )
|
|||||||
m_dataDirectory = m_homeDirectory + "/.local/share";
|
m_dataDirectory = m_homeDirectory + "/.local/share";
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( m_projectName.isEmpty() )
|
|
||||||
{
|
|
||||||
m_projectName = m_executableName;
|
|
||||||
}
|
|
||||||
m_hierarchyType = getHierarchyType();
|
m_hierarchyType = getHierarchyType();
|
||||||
calculatePaths( m_hierarchyType );
|
calculatePaths( m_hierarchyType );
|
||||||
|
|
||||||
|
m_configFilePath = m_systemConfigDirectory + "/" + m_configFileName;
|
||||||
|
|
||||||
return( true );
|
return( true );
|
||||||
} // Paths::init
|
} // Paths::initCommon
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultProjectDirectory,
|
MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultProjectDirectory,
|
||||||
@ -112,19 +139,12 @@ MYXLIB_INLINE void Paths::setupSystemDirectories( const QString& defaultProjectD
|
|||||||
} // Paths::setupSystemDirectories
|
} // Paths::setupSystemDirectories
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE void Paths::setupUserDirectories()
|
MYXLIB_INLINE void Paths::setupUserDirectories( const QString& prefix )
|
||||||
{
|
{
|
||||||
QString prefix;
|
m_userConfigDirectory = m_configDirectory + "/" + prefix;
|
||||||
if ( !m_organizationName.isEmpty() )
|
m_userConstDataDirectory = m_dataDirectory + "/" + prefix + "/share";
|
||||||
{
|
m_userVarDataDirectory = m_dataDirectory + "/" + prefix + "/var";
|
||||||
prefix = "/" + m_organizationName;
|
m_userLogDirectory = m_dataDirectory + "/" + prefix + "/log";
|
||||||
if ( !m_themeName.isEmpty() ) { prefix.append( "-" + m_themeName ); }
|
|
||||||
}
|
|
||||||
prefix.append( "/" + m_projectName );
|
|
||||||
m_userConfigDirectory = m_configDirectory + prefix;
|
|
||||||
m_userConstDataDirectory = m_dataDirectory + prefix + "/share";
|
|
||||||
m_userVarDataDirectory = m_dataDirectory + prefix + "/var";
|
|
||||||
m_userLogDirectory = m_dataDirectory + prefix + "/log";
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -173,81 +193,22 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
|
|||||||
MYXLIB_INLINE void Paths::calculatePaths( HierarchyType hType )
|
MYXLIB_INLINE void Paths::calculatePaths( HierarchyType hType )
|
||||||
{
|
{
|
||||||
auto directory = m_executableDirectory;
|
auto directory = m_executableDirectory;
|
||||||
setupUserDirectories();
|
|
||||||
|
|
||||||
switch ( hType )
|
switch ( hType )
|
||||||
{
|
{
|
||||||
case HierarchyType::kFlat:
|
case HierarchyType::kFlat:
|
||||||
setupSystemDirectories( directory, directory, directory, directory, directory );
|
setupSystemDirectories( directory, directory, directory, directory, directory );
|
||||||
break;
|
return;
|
||||||
|
|
||||||
case HierarchyType::kOpt:
|
case HierarchyType::kOpt:
|
||||||
processOptHierarhy();
|
if ( m_organizationName.isEmpty() || m_themeName.isEmpty() )
|
||||||
break;
|
|
||||||
|
|
||||||
case HierarchyType::kUsr:
|
|
||||||
setupSystemDirectories( QStringLiteral( "/usr" ),
|
|
||||||
"/etc/" + m_projectName,
|
|
||||||
"/usr/share/" + m_projectName,
|
|
||||||
"/var/lib/" + m_projectName,
|
|
||||||
"/var/log/" + m_projectName );
|
|
||||||
break;
|
|
||||||
|
|
||||||
case HierarchyType::kUsrLocal:
|
|
||||||
setupSystemDirectories( QStringLiteral( "/usr/local" ),
|
|
||||||
"/usr/local/etc/" + m_projectName,
|
|
||||||
"/usr/local/share/" + m_projectName,
|
|
||||||
"/var/lib/" + m_projectName,
|
|
||||||
"/var/log/" + m_projectName );
|
|
||||||
break;
|
|
||||||
|
|
||||||
case HierarchyType::kUsrLocalOrg:
|
|
||||||
directory.remove( m_binDirRegex );
|
|
||||||
setupSystemDirectories( directory,
|
|
||||||
directory + "/etc",
|
|
||||||
directory + "/share",
|
|
||||||
directory + "/var",
|
|
||||||
directory + "/log" );
|
|
||||||
break;
|
|
||||||
|
|
||||||
case HierarchyType::kHome:
|
|
||||||
m_projectDirectory = m_homeDirectory;
|
|
||||||
m_systemConfigDirectory = m_userConfigDirectory;
|
|
||||||
m_systemConstDataDirectory = m_userConstDataDirectory;
|
|
||||||
m_systemVarDataDirectory = m_userVarDataDirectory;
|
|
||||||
m_systemLogDirectory = m_userLogDirectory;
|
|
||||||
break;
|
|
||||||
|
|
||||||
case HierarchyType::kDevelopment:
|
|
||||||
directory.remove( m_unityBinDirRegex );
|
|
||||||
directory.remove( m_binDirRegex );
|
|
||||||
setupSystemDirectories( directory,
|
|
||||||
directory + "/etc",
|
|
||||||
directory + "/share",
|
|
||||||
directory + "/var",
|
|
||||||
directory + "/log" );
|
|
||||||
break;
|
|
||||||
|
|
||||||
case HierarchyType::kUndefined:
|
|
||||||
;
|
|
||||||
} // switch
|
|
||||||
setupUserDirectories();
|
|
||||||
} // Paths::calculatePaths
|
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE void Paths::processOptHierarhy()
|
|
||||||
{
|
|
||||||
auto directory = m_executableDirectory;
|
|
||||||
|
|
||||||
if ( m_autodetect )
|
|
||||||
{
|
{
|
||||||
QRegularExpression regex( "^/opt/(.+?)-(.+?)/(.+?)/" );
|
QRegularExpression regex( "^/opt/(.+?)-(.+?)/" );
|
||||||
QRegularExpressionMatch match = regex.match( m_executableDirectory );
|
QRegularExpressionMatch match = regex.match( m_executableDirectory );
|
||||||
if ( match.hasMatch() )
|
if ( match.hasMatch() )
|
||||||
{
|
{
|
||||||
m_organizationName = match.captured( 1 );
|
m_organizationName = match.captured( 1 );
|
||||||
m_themeName = match.captured( 2 );
|
m_themeName = match.captured( 2 );
|
||||||
m_projectName = match.captured( 3 );
|
|
||||||
|
|
||||||
QRegularExpression vr( "(.+?)\\.(.+)" );
|
QRegularExpression vr( "(.+?)\\.(.+)" );
|
||||||
QRegularExpressionMatch vm = vr.match( m_themeName );
|
QRegularExpressionMatch vm = vr.match( m_themeName );
|
||||||
@ -257,26 +218,74 @@ MYXLIB_INLINE void Paths::processOptHierarhy()
|
|||||||
m_version = vm.captured( 2 );
|
m_version = vm.captured( 2 );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
{
|
|
||||||
regex.setPattern( "^/opt/(.+?)/(.+?)/" );
|
|
||||||
match = regex.match( m_executableDirectory );
|
|
||||||
if ( match.hasMatch() )
|
|
||||||
{
|
|
||||||
m_organizationName = match.captured( 1 );
|
|
||||||
m_projectName = match.captured( 2 );
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( m_projectName.isEmpty() )
|
||||||
|
{
|
||||||
|
QRegularExpression regex( "^/opt/.+/(.+?)/" );
|
||||||
|
QRegularExpressionMatch match = regex.match( m_executableDirectory );
|
||||||
|
if ( match.hasMatch() )
|
||||||
|
{
|
||||||
|
m_projectName = match.captured( 1 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
directory.remove( m_binDirRegex );
|
||||||
|
|
||||||
|
setupSystemDirectories( directory,
|
||||||
|
directory + "/etc",
|
||||||
|
directory + "/share",
|
||||||
|
directory + "/var",
|
||||||
|
directory + "/log" );
|
||||||
|
setupUserDirectories( m_organizationName + "-" + m_themeName + "/" + m_projectName );
|
||||||
|
return;
|
||||||
|
|
||||||
|
case HierarchyType::kUsr:
|
||||||
|
setupSystemDirectories( QStringLiteral( "/usr" ),
|
||||||
|
"/etc/" + m_projectName,
|
||||||
|
"/usr/share/" + m_projectName,
|
||||||
|
"/var/lib/" + m_projectName,
|
||||||
|
"/var/log/" + m_projectName );
|
||||||
|
return;
|
||||||
|
|
||||||
|
case HierarchyType::kUsrLocal:
|
||||||
|
setupSystemDirectories( QStringLiteral( "/usr/local" ),
|
||||||
|
"/usr/local/etc/" + m_projectName,
|
||||||
|
"/usr/local/share/" + m_projectName,
|
||||||
|
"/var/lib/" + m_projectName,
|
||||||
|
"/var/log/" + m_projectName );
|
||||||
|
return;
|
||||||
|
|
||||||
|
case HierarchyType::kUsrLocalOrg:
|
||||||
directory.remove( m_binDirRegex );
|
directory.remove( m_binDirRegex );
|
||||||
setupSystemDirectories( directory,
|
setupSystemDirectories( directory,
|
||||||
directory + "/etc",
|
directory + "/etc",
|
||||||
directory + "/share",
|
directory + "/share",
|
||||||
directory + "/var",
|
directory + "/var",
|
||||||
directory + "/log" );
|
directory + "/log" );
|
||||||
setupUserDirectories();
|
return;
|
||||||
} // Paths::processOptHierarhy
|
|
||||||
|
case HierarchyType::kHome:
|
||||||
|
m_projectDirectory = m_homeDirectory;
|
||||||
|
m_systemConfigDirectory = m_userConfigDirectory;
|
||||||
|
m_systemConstDataDirectory = m_userConstDataDirectory;
|
||||||
|
m_systemVarDataDirectory = m_userVarDataDirectory;
|
||||||
|
m_systemLogDirectory = m_userLogDirectory;
|
||||||
|
return;
|
||||||
|
|
||||||
|
case HierarchyType::kDevelopment:
|
||||||
|
directory.remove( m_unityBinDirRegex );
|
||||||
|
directory.remove( m_binDirRegex );
|
||||||
|
setupSystemDirectories( directory,
|
||||||
|
directory + "/etc",
|
||||||
|
directory + "/share",
|
||||||
|
directory + "/var",
|
||||||
|
directory + "/log" );
|
||||||
|
return;
|
||||||
|
|
||||||
|
case HierarchyType::kUndefined:
|
||||||
|
;
|
||||||
|
} // switch
|
||||||
|
} // Paths::calculatePaths
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE bool Paths::makeDefaultSystemDirectories()
|
MYXLIB_INLINE bool Paths::makeDefaultSystemDirectories()
|
||||||
@ -313,24 +322,25 @@ MYXLIB_INLINE bool Paths::makeDefaultDirectories()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE QString Paths::findConfigFile( const QString& configFileName )
|
MYXLIB_INLINE QString Paths::findConfigFile( const QString& defaultConfigFile )
|
||||||
{
|
{
|
||||||
if ( !configFileName.isEmpty() && QFileInfo( configFileName ).isReadable() )
|
if ( !defaultConfigFile.isEmpty() && QFileInfo( defaultConfigFile ).isReadable() )
|
||||||
{
|
{
|
||||||
return( configFileName );
|
m_configFilePath = defaultConfigFile;
|
||||||
|
return( defaultConfigFile );
|
||||||
}
|
}
|
||||||
|
|
||||||
auto fileName = QString::fromLocal8Bit( qgetenv( QCoreApplication::applicationName()
|
auto fileName = QString::fromLocal8Bit( qgetenv( QCoreApplication::applicationName()
|
||||||
.toUpper().toUtf8() + "_CONFIG" ) );
|
.toUpper().toUtf8() + "_CONFIG" ) );
|
||||||
if ( QFileInfo( fileName ).isReadable() )
|
if ( QFileInfo( fileName ).isReadable() )
|
||||||
{
|
{
|
||||||
|
m_configFilePath = fileName;
|
||||||
return( fileName );
|
return( fileName );
|
||||||
}
|
}
|
||||||
|
|
||||||
QString autoConfigFile = m_systemConfigDirectory + "/" + m_executableName;
|
if ( QFileInfo( m_configFilePath ).isReadable() )
|
||||||
if ( QFileInfo( autoConfigFile ).isReadable() )
|
|
||||||
{
|
{
|
||||||
return( configFileName );
|
return( m_configFilePath );
|
||||||
}
|
}
|
||||||
|
|
||||||
return( QString() );
|
return( QString() );
|
||||||
@ -349,6 +359,30 @@ MYXLIB_INLINE const QString& Paths::systemConfigDirectory() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MYXLIB_INLINE const QString& Paths::configFilePath() const
|
||||||
|
{
|
||||||
|
return( m_configFilePath );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
MYXLIB_INLINE const QString& Paths::configFileName() const
|
||||||
|
{
|
||||||
|
return( m_configFileName );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const QString& Paths::configFileExtension() const
|
||||||
|
{
|
||||||
|
return( m_configFileExtension );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void Paths::setConfigFileExtension( const QString& name )
|
||||||
|
{
|
||||||
|
m_configFileExtension = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE const QString& Paths::userVarDataDirectory() const
|
MYXLIB_INLINE const QString& Paths::userVarDataDirectory() const
|
||||||
{
|
{
|
||||||
return( m_userVarDataDirectory );
|
return( m_userVarDataDirectory );
|
||||||
@ -403,12 +437,6 @@ MYXLIB_INLINE const QString& Paths::projectName() const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE void Paths::setProjectName( const QString& name )
|
|
||||||
{
|
|
||||||
m_projectName = name;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
MYXLIB_INLINE const QString& Paths::organizationName() const
|
MYXLIB_INLINE const QString& Paths::organizationName() const
|
||||||
{
|
{
|
||||||
return( m_organizationName );
|
return( m_organizationName );
|
||||||
|
@ -62,7 +62,7 @@ public:
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** @brief Обновление путей с учётом расположения исполняемого файла */
|
/** @brief Обновление путей с учётом расположения исполняемого файла */
|
||||||
bool init( bool autodetect = true );
|
bool init();
|
||||||
|
|
||||||
/** @brief Создание стандартных системных каталогов */
|
/** @brief Создание стандартных системных каталогов */
|
||||||
bool makeDefaultSystemDirectories();
|
bool makeDefaultSystemDirectories();
|
||||||
@ -76,11 +76,14 @@ public:
|
|||||||
/** @brief Поиск существующего файла настойки.
|
/** @brief Поиск существующего файла настойки.
|
||||||
* Поиск выполняется до тех пор пока не будет найден файл в следующем порядке:
|
* Поиск выполняется до тех пор пока не будет найден файл в следующем порядке:
|
||||||
* 1. Имя файла, указанное в качестве параметра функции
|
* 1. Имя файла, указанное в качестве параметра функции
|
||||||
* 2. Имя файла, заданное переменной окружения вида EXECUTABLE_NAME_CONFIG
|
* 2. Имя файла, заданное переменной окружения вида PROJECT_NAME_CONFIG
|
||||||
* 3. Имя файла, полученное из имени каталога системных настроек и имени исполняемого файла
|
* 3. Имя файла, полученное из внутренней переменной класса
|
||||||
* Если файл настройки не будет найден, то будет возвращена пустая строка
|
* Если файл настройки не будет найден, то будет возвращена пустая строка
|
||||||
*/
|
*/
|
||||||
QString findConfigFile( const QString& configFileName = QLatin1String( "" ) );
|
QString findConfigFile( const QString& defaultConfigFile = QLatin1String( "" ) );
|
||||||
|
|
||||||
|
/** @brief Полный путь к базовому каталогу */
|
||||||
|
const QString& projectName() const;
|
||||||
|
|
||||||
/** @brief Имя исполняемого файла */
|
/** @brief Имя исполняемого файла */
|
||||||
const QString& executableName() const;
|
const QString& executableName() const;
|
||||||
@ -91,6 +94,18 @@ public:
|
|||||||
/** @brief Полный путь к каталогу с исполняемым файлом */
|
/** @brief Полный путь к каталогу с исполняемым файлом */
|
||||||
const QString& executableDirectory() const;
|
const QString& executableDirectory() const;
|
||||||
|
|
||||||
|
/** @brief Имя файла настройки */
|
||||||
|
const QString& configFileName() const;
|
||||||
|
|
||||||
|
/** @brief Расширение файла настройки */
|
||||||
|
const QString& configFileExtension() const;
|
||||||
|
|
||||||
|
/** @brief Установка расширения файла настройки */
|
||||||
|
void setConfigFileExtension( const QString& name );
|
||||||
|
|
||||||
|
/** @brief Полный путь к файлу настройки */
|
||||||
|
const QString& configFilePath() const;
|
||||||
|
|
||||||
/** @brief Полный путь к пользовательскому каталогу с файлами настройки */
|
/** @brief Полный путь к пользовательскому каталогу с файлами настройки */
|
||||||
const QString& userConfigDirectory() const;
|
const QString& userConfigDirectory() const;
|
||||||
|
|
||||||
@ -135,10 +150,6 @@ public:
|
|||||||
const QString& themeName() const;
|
const QString& themeName() const;
|
||||||
void setThemeName( const QString& name );
|
void setThemeName( const QString& name );
|
||||||
|
|
||||||
/** @brief Название программного проекта */
|
|
||||||
const QString& projectName() const;
|
|
||||||
void setProjectName( const QString& name );
|
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
Paths();
|
Paths();
|
||||||
~Paths() = default;
|
~Paths() = default;
|
||||||
@ -147,13 +158,6 @@ private:
|
|||||||
/** @brief Тип расположения файлов по каталогам */
|
/** @brief Тип расположения файлов по каталогам */
|
||||||
HierarchyType m_hierarchyType { HierarchyType::kFlat };
|
HierarchyType m_hierarchyType { HierarchyType::kFlat };
|
||||||
|
|
||||||
/** @brief Автоматически определять значения organizationName, themeName и projectName
|
|
||||||
* @detail Если true, то пытаться автоматически определять значения переменных
|
|
||||||
* на основании полного пути к исполняемому файлу.
|
|
||||||
* Иначе использовать значения переменных, указанные пользователем.
|
|
||||||
*/
|
|
||||||
bool m_autodetect { true };
|
|
||||||
|
|
||||||
/** @brief Название организации */
|
/** @brief Название организации */
|
||||||
QString m_organizationName;
|
QString m_organizationName;
|
||||||
|
|
||||||
@ -205,6 +209,13 @@ private:
|
|||||||
/** @brief Путь к системному каталогу с файлами настройки */
|
/** @brief Путь к системному каталогу с файлами настройки */
|
||||||
QString m_systemConfigDirectory;
|
QString m_systemConfigDirectory;
|
||||||
|
|
||||||
|
/** @brief Полный путь к файлу настройки */
|
||||||
|
QString m_configFilePath;
|
||||||
|
/** @brief Имя файла настройки */
|
||||||
|
QString m_configFileName;
|
||||||
|
/** @brief Расширение файла настройки */
|
||||||
|
QString m_configFileExtension;
|
||||||
|
|
||||||
QRegularExpression m_binDirRegex;
|
QRegularExpression m_binDirRegex;
|
||||||
QRegularExpression m_unityBinDirRegex;
|
QRegularExpression m_unityBinDirRegex;
|
||||||
|
|
||||||
@ -213,11 +224,11 @@ private:
|
|||||||
const QString& defaultConstDataDirectory,
|
const QString& defaultConstDataDirectory,
|
||||||
const QString& defaultVarDataDirectory,
|
const QString& defaultVarDataDirectory,
|
||||||
const QString& defaultLogDirectory );
|
const QString& defaultLogDirectory );
|
||||||
void setupUserDirectories();
|
void setupUserDirectories( const QString& prefix );
|
||||||
|
|
||||||
|
bool initCommon();
|
||||||
HierarchyType getHierarchyType();
|
HierarchyType getHierarchyType();
|
||||||
void calculatePaths( HierarchyType hType );
|
void calculatePaths( HierarchyType hType );
|
||||||
void processOptHierarhy();
|
|
||||||
}; // class Paths
|
}; // class Paths
|
||||||
|
|
||||||
} // namespace filesystem
|
} // namespace filesystem
|
||||||
|
Loading…
Reference in New Issue
Block a user