From 4024029944119a985f8fff9bd8897b114ae6a710 Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Tue, 25 May 2021 15:07:25 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D1=8B=20=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=B4=D0=B0=D1=80=D1=82=D0=BD=D1=8B=D0=B5=20=D0=BA=D0=B0=D1=82?= =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20(data->share,=20lib->var)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/cmlib | 2 +- cmake/etc/uncrustify | 2 +- files/log/.keep-directory | 0 files/{data => share}/icon/icon.jpg | Bin files/{lib/.keep-directory => var/.gitkeep} | 0 src/myx/filesystem/paths.cpp | 24 ++++++++++---------- 6 files changed, 14 insertions(+), 14 deletions(-) delete mode 100644 files/log/.keep-directory rename files/{data => share}/icon/icon.jpg (100%) rename files/{lib/.keep-directory => var/.gitkeep} (100%) diff --git a/cmake/cmlib b/cmake/cmlib index 1bff4d2..c6414bb 160000 --- a/cmake/cmlib +++ b/cmake/cmlib @@ -1 +1 @@ -Subproject commit 1bff4d2a0d6b1e762c1dd8eae37e4426cf62086a +Subproject commit c6414bbc03c924379ceb7c7d7c914f4853e5d528 diff --git a/cmake/etc/uncrustify b/cmake/etc/uncrustify index 3323b81..e11d85f 160000 --- a/cmake/etc/uncrustify +++ b/cmake/etc/uncrustify @@ -1 +1 @@ -Subproject commit 3323b81fab518c600d8662243f1e503ae30a1f66 +Subproject commit e11d85f13317dcf3652988026ce1ef4dcbe72c68 diff --git a/files/log/.keep-directory b/files/log/.keep-directory deleted file mode 100644 index e69de29..0000000 diff --git a/files/data/icon/icon.jpg b/files/share/icon/icon.jpg similarity index 100% rename from files/data/icon/icon.jpg rename to files/share/icon/icon.jpg diff --git a/files/lib/.keep-directory b/files/var/.gitkeep similarity index 100% rename from files/lib/.keep-directory rename to files/var/.gitkeep diff --git a/src/myx/filesystem/paths.cpp b/src/myx/filesystem/paths.cpp index a8f2637..d93a997 100644 --- a/src/myx/filesystem/paths.cpp +++ b/src/myx/filesystem/paths.cpp @@ -91,9 +91,9 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType() binaryDir.remove( binUnityRegexp ); setupSystemDirectories( binaryDir, binaryDir + "/etc", - binaryDir + "/files/data", - binaryDir + "/files/lib", - binaryDir + "/files/log" ); + binaryDir + "/share", + binaryDir + "/var", + binaryDir + "/log" ); return ( HierarchyType::kDevelopment ); } @@ -116,9 +116,9 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType() binaryDir.remove( binRegexp ); setupSystemDirectories( binaryDir, binaryDir + "/etc", - binaryDir + "/files/data", - binaryDir + "/files/lib", - binaryDir + "/files/log" ); + binaryDir + "/share", + binaryDir + "/var", + binaryDir + "/log" ); return ( HierarchyType::kOpt ); } @@ -128,7 +128,7 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType() setupSystemDirectories( "/usr/local/rtis", "/usr/local/rtis/etc/" + 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 ); return ( HierarchyType::kUsrLocalRtis ); @@ -171,9 +171,9 @@ MYXLIB_INLINE Paths::HierarchyType Paths::getHierarchyType() binaryDir.remove( binRegexp ); setupSystemDirectories( binaryDir, binaryDir + "/etc", - binaryDir + "/files/data", - binaryDir + "/files/lib", - binaryDir + "/files/log" ); + binaryDir + "/share", + binaryDir + "/var", + binaryDir + "/log" ); return ( HierarchyType::kDevelopment ); } // Paths::getHierarchyType @@ -197,8 +197,8 @@ MYXLIB_INLINE bool Paths::initCommon() dataHome = m_homeDirectory + "/.local/share"; } dataHome += "/" + m_projectName; - m_userConstDataDirectory = dataHome + "/data"; - m_userVarDataDirectory = dataHome + "/lib"; + m_userConstDataDirectory = dataHome + "/share"; + m_userVarDataDirectory = dataHome + "/var"; m_userLogDirectory = dataHome + "/log"; m_hierarchyType = getHierarchyType();