f1x1t/myxlib
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Переименованы стандартные каталоги для данных (data->share, lib->var)

Browse Source
This commit is contained in:
Andrei Astafev
2021-05-25 15:07:25 +03:00
parent 5dff256613
commit 4024029944
6 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/cmlib

Submodule cmake/cmlib updated: 1bff4d2a0d...c6414bbc03

2
cmake/etc/uncrustify

Submodule cmake/etc/uncrustify updated: 3323b81fab...e11d85f133

0
files/log/.keep-directory
View File

0
files/data/icon/icon.jpg → files/share/icon/icon.jpg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 86 KiB

0
files/lib/.keep-directory → files/var/.gitkeep
View File

24
src/myx/filesystem/paths.cpp
View File

@@ -91,9 +91,9 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
binaryDir.remove( binUnityRegexp ); binaryDir.remove( binUnityRegexp );
setupSystemDirectories( binaryDir, setupSystemDirectories( binaryDir,
binaryDir + "/etc", binaryDir + "/etc",
binaryDir + "/files/data", binaryDir + "/share",
binaryDir + "/files/lib", binaryDir + "/var",
binaryDir + "/files/log" ); binaryDir + "/log" );
return ( HierarchyType::kDevelopment ); return ( HierarchyType::kDevelopment );
} }
@@ -116,9 +116,9 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
binaryDir.remove( binRegexp ); binaryDir.remove( binRegexp );
setupSystemDirectories( binaryDir, setupSystemDirectories( binaryDir,
binaryDir + "/etc", binaryDir + "/etc",
binaryDir + "/files/data", binaryDir + "/share",
binaryDir + "/files/lib", binaryDir + "/var",
binaryDir + "/files/log" ); binaryDir + "/log" );
return ( HierarchyType::kOpt ); return ( HierarchyType::kOpt );
} }
@@ -128,7 +128,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
setupSystemDirectories( "/usr/local/rtis", setupSystemDirectories( "/usr/local/rtis",
"/usr/local/rtis/etc/" + m_projectName, "/usr/local/rtis/etc/" + m_projectName,
"/usr/local/rtis/share/" + m_projectName, "/usr/local/rtis/share/" + m_projectName,
"/usr/local/rtis/lib/" + m_projectName, "/usr/local/rtis/var/" + m_projectName,
"/usr/local/rtis/log/" + m_projectName ); "/usr/local/rtis/log/" + m_projectName );
return ( HierarchyType::kUsrLocalRtis ); return ( HierarchyType::kUsrLocalRtis );
@@ -171,9 +171,9 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType()
binaryDir.remove( binRegexp ); binaryDir.remove( binRegexp );
setupSystemDirectories( binaryDir, setupSystemDirectories( binaryDir,
binaryDir + "/etc", binaryDir + "/etc",
binaryDir + "/files/data", binaryDir + "/share",
binaryDir + "/files/lib", binaryDir + "/var",
binaryDir + "/files/log" ); binaryDir + "/log" );
return ( HierarchyType::kDevelopment ); return ( HierarchyType::kDevelopment );
} // Paths::getHierarchyType } // Paths::getHierarchyType
@@ -197,8 +197,8 @@ MYXLIB_INLINE bool Paths::initCommon()
dataHome = m_homeDirectory + "/.local/share"; dataHome = m_homeDirectory + "/.local/share";
} }
dataHome += "/" + m_projectName; dataHome += "/" + m_projectName;
m_userConstDataDirectory = dataHome + "/data"; m_userConstDataDirectory = dataHome + "/share";
m_userVarDataDirectory = dataHome + "/lib"; m_userVarDataDirectory = dataHome + "/var";
m_userLogDirectory = dataHome + "/log"; m_userLogDirectory = dataHome + "/log";
m_hierarchyType = getHierarchyType(); m_hierarchyType = getHierarchyType();