games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

VCMIDirs: improvements for development on Mac and Linux

Browse Source 
Also added /usr/share/games in VCMIDirsXDG::dataPaths for mantis#2189.
This commit is contained in:
Arseniy Shestakov
2017-08-25 08:32:14 +03:00
parent 1110dd27d1
commit 8180e4d5c5
3 changed files with 56 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -262,16 +262,16 @@ else()
set(DATA_DIR "share/vcmi" CACHE STRING "Where to install data files")
endif()
endif()
# following constants only used for platforms using XDG (Linux, BSD, etc)
add_definitions(-DM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}")
add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")
add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
endif()
set(AI_LIB_DIR "${LIB_DIR}/AI")
set(SCRIPTING_LIB_DIR "${LIB_DIR}/scripting")
#define required constants
add_definitions(-DM_DATA_DIR="${CMAKE_INSTALL_PREFIX}/${DATA_DIR}")
add_definitions(-DM_BIN_DIR="${CMAKE_INSTALL_PREFIX}/${BIN_DIR}")
add_definitions(-DM_LIB_DIR="${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
#######################################
# Add subdirectories #
#######################################

53
lib/VCMIDirs.cpp
View File

@@ -271,7 +271,7 @@ bfs::path VCMIDirsWIN32::userDataPath() const
wchar_t profileDir[MAX_PATH];
if (SHGetSpecialFolderPathW(nullptr, profileDir, CSIDL_MYDOCUMENTS, FALSE) != FALSE)
return bfs::path(profileDir) / "My Games\\vcmi";
return bfs::path(profileDir) / "My Games" / "vcmi";
return ".";
}
@@ -350,8 +350,16 @@ class IVCMIDirsUNIX : public IVCMIDirs
boost::filesystem::path serverPath() const override;
std::string genHelpString() const override;
bool developmentMode() const;
};
bool IVCMIDirsUNIX::developmentMode() const
{
// We want to be able to run VCMI from single directory. E.g to run from build output directory
return bfs::exists("AI") && bfs::exists("config") && bfs::exists("Mods") && bfs::exists("vcmiserver") && bfs::exists("vcmiclient");
}
bfs::path IVCMIDirsUNIX::clientPath() const { return binaryPath() / "vcmiclient"; }
bfs::path IVCMIDirsUNIX::serverPath() const { return binaryPath() / "vcmiserver"; }
@@ -454,7 +462,7 @@ std::vector<bfs::path> VCMIDirsOSX::dataPaths() const
{
std::vector<bfs::path> ret;
//FIXME: need some proper codepath for detecting running from build output directory
if(bfs::exists("config") && bfs::exists("Mods") && bfs::exists("vcmiserver"))
if(developmentMode())
{
ret.push_back(".");
}
@@ -490,7 +498,7 @@ bfs::path VCMIDirsXDG::userDataPath() const
// $XDG_DATA_HOME, default: $HOME/.local/share
const char* homeDir;
if((homeDir = getenv("XDG_DATA_HOME")))
return homeDir;
return bfs::path(homeDir) / "vcmi";
else if((homeDir = getenv("HOME")))
return bfs::path(homeDir) / ".local" / "share" / "vcmi";
else
@@ -528,34 +536,51 @@ std::vector<bfs::path> VCMIDirsXDG::dataPaths() const
// in vcmi fs last directory has highest priority
std::vector<bfs::path> ret;
const char* tempResult;
ret.push_back(M_DATA_DIR);
//FIXME: need some proper codepath for detecting running from build output directory
if(bfs::exists("config") && bfs::exists("Mods") && bfs::exists("vcmiserver"))
if(developmentMode())
{
//For now we'll disable usage of system directories when VCMI running from bin directory
ret.push_back(".");
}
else if((tempResult = getenv("XDG_DATA_DIRS")) != nullptr)
else
{
ret.push_back(M_DATA_DIR);
const char * tempResult;
if((tempResult = getenv("XDG_DATA_DIRS")) != nullptr)
{
std::string dataDirsEnv = tempResult;
std::vector<std::string> dataDirs;
boost::split(dataDirs, dataDirsEnv, boost::is_any_of(":"));
for (auto & entry : boost::adaptors::reverse(dataDirs))
ret.push_back(entry + "/vcmi");
ret.push_back(bfs::path(entry) / "vcmi");
}
else
{
ret.push_back("/usr/share/");
ret.push_back("/usr/local/share/");
ret.push_back(bfs::path("/usr/share") / "vcmi");
ret.push_back(bfs::path("/usr/local/share") / "vcmi");
}
// Debian and other distributions might want to use it while it's not part of XDG
ret.push_back(bfs::path("/usr/share/games") / "vcmi");
}
return ret;
}
bfs::path VCMIDirsXDG::libraryPath() const { return M_LIB_DIR; }
bfs::path VCMIDirsXDG::binaryPath() const { return M_BIN_DIR; }
bfs::path VCMIDirsXDG::libraryPath() const
{
if(developmentMode())
return ".";
else
return M_LIB_DIR;
}
bfs::path VCMIDirsXDG::binaryPath() const
{
if(developmentMode())
return ".";
else
return M_BIN_DIR;
}
std::string VCMIDirsXDG::libraryName(const std::string& basename) const { return "lib" + basename + ".so"; }

6
server/CVCMIServer.cpp
View File

@@ -609,11 +609,9 @@ void handleLinuxSignal(int sig)
int main(int argc, char * argv[])
{
#ifndef VCMI_WINDOWS
#ifndef VCMI_ANDROID
// Correct working dir executable folder (not bundle folder) so we can use executable relative paths
std::string executablePath = argv[0];
std::string workDir = executablePath.substr(0, executablePath.rfind('/'));
chdir(workDir.c_str());
boost::filesystem::current_path(boost::filesystem::system_complete(argv[0]).parent_path());
#endif
// Installs a sig sev segmentation violation handler
// to log stacktrace