Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-21 21:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moved the CMake install prefix function to FileSystemUtil and implemented the same logic also for theme loading.

Browse source
This commit is contained in:
Leon Styhre 2020-06-21 21:08:54 +02:00
parent 8fefc9232c
commit b560429a20
5 changed files with 32 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
NEWS.md
View file

@ -18,6 +18,8 @@ v1.0.0
* GUI-configurable option to sort favorite games on the top of the game lists (favorites marked with stars)
* Added new component GuiComplexTextEditPopup to handle changes to configuration file entries and similar
* Speed improvements and optimizations, the application now starts faster and feels more responsive
* Moved all resources to a subdirectory structure and enabled the CMake install prefix variable to generate the resources search path
* Changed theme directory to the install prefix (e.g. /usr/local/share/emulationstation/themes) with themes in the home directory taking precedence
* Refactoring, cleanup and documentation of the source code, removal of deprecated files etc.
* All required fonts bundled with the application, no dependencies on the OS to provide them any longer
* License files included for all the libraries and resources that are bundled with the application

4
es-core/src/ThemeData.cpp
View file

@ -592,10 +592,12 @@ std::map<std::string, ThemeSet> ThemeData::getThemeSets()
{
std::map<std::string, ThemeSet> sets;
// Check for themes under the data installation directory (install prefix), as well
// as under the user home directory.
static const size_t pathCount = 2;
std::string paths[pathCount] =
{
"/etc/emulationstation/themes",
Utils::FileSystem::getInstallPrefixPath() + "/emulationstation/themes",
Utils::FileSystem::getHomePath() + "/.emulationstation/themes"
};

23
es-core/src/resources/ResourceManager.cpp
View file

@ -10,18 +10,6 @@
#include "utils/FileSystemUtil.h"
#include <fstream>
#ifdef ES_INSTALL_PREFIX
std::string installPrefix = ES_INSTALL_PREFIX;
#else
std::string installPrefix = "/usr/local";
#endif
#ifdef ES_DATAROOTDIR
std::string dataRootDir = ES_DATAROOTDIR;
#else
std::string dataRootDir = "share";
#endif
auto array_deleter = [](unsigned char* p) { delete[] p; };
auto nop_deleter = [](unsigned char* /*p*/) { };
@ -50,13 +38,10 @@ std::string ResourceManager::getResourcePath(const std::string& path) const
if (Utils::FileSystem::exists(test))
return test;
// Check under the data installation directory.
// The base directory is the value set for CMAKE_INSTALL_DIRECTORY during build.
// The datarootdir directory is the value set for CMAKE_INSTALL_DATAROOTDIR during build.
// If not defined, the default prefix path '/usr/local' and the default datarootdir
// directory 'share' will be used, i.e. '/usr/local/share'.
test = installPrefix + "/" + dataRootDir + "/emulationstation/resources/" + &path[2];
if (Utils::FileSystem::exists(test))
// Check under the data installation directory (install prefix).
test = Utils::FileSystem::getInstallPrefixPath() +
"/emulationstation/resources/" + &path[2];
if (Utils::FileSystem::exists(test))
return test;
}

22
es-core/src/utils/FileSystemUtil.cpp
View file

@ -21,6 +21,23 @@
#include <unistd.h>
#endif // _WIN32
// Try to ascertain the install prefix as defined when CMake was run.
// The installPrefix directory is the value set for CMAKE_INSTALL_DIRECTORY during build.
// The datarootdir directory is the value set for CMAKE_INSTALL_DATAROOTDIR during build.
// If not defined, the default prefix path '/usr/local' and the default datarootdir
// directory 'share' will be used, i.e. combining to '/usr/local/share'.
#ifdef ES_INSTALL_PREFIX
std::string installPrefix = ES_INSTALL_PREFIX;
#else
std::string installPrefix = "/usr/local";
#endif
#ifdef ES_DATAROOTDIR
std::string dataRootDir = ES_DATAROOTDIR;
#else
std::string dataRootDir = "share";
#endif
namespace Utils
{
namespace FileSystem
@ -221,6 +238,11 @@ namespace Utils
} // getExePath
std::string getInstallPrefixPath()
{
return installPrefix + "/" + dataRootDir;
}
std::string getPreferredPath(const std::string& _path)
{
std::string path = _path;

1
es-core/src/utils/FileSystemUtil.h
View file

@ -18,6 +18,7 @@ namespace Utils
std::string getCWDPath ();
void setExePath (const std::string& _path);
std::string getExePath ();
std::string getInstallPrefixPath ();
std::string getPreferredPath (const std::string& _path);
std::string getGenericPath (const std::string& _path);
std::string getEscapedPath (const std::string& _path);