mirror of
https://github.com/godotengine/godot.git
synced 2025-11-01 06:01:14 +00:00
Add initial support for the XDG Base Directory spec
Spec version 0.7 from https://standards.freedesktop.org/basedir-spec/basedir-spec-0.7.html (latest as of this commit). Three virtual methods are added to OS for the various XDG paths we will use: - OS::get_data_path gives XDG_DATA_HOME, or if missing: ~/.local/share on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows - OS::get_config_path gives XDG_CONFIG_HOME, or if missing: ~/.config on X11, ~/Library/Application Support/ on macOS and %APPDATA% on Windows - OS::get_cache_path gives XDG_CACHE_HOME, or if missing: ~/.cache on X11, ~/Library/Caches on macOS and %APPDATA% on Windows So for Windows there are no changes, for Linux we follow the full split spec and for macOS stuff will move from ~/.godot to ~/Library/Application Support/Godot. Support for system-wide installation of templates on Unix was removed for now, as it's a bit hackish and I don't think anyone uses it. user:// will still be OS::get_data_path() + "/godot/app_userdata/$name" by default, but when using the application/config/use_shared_user_dir option it will now use XDG_DATA_HOME/$name, e.g. ~/.local/share/MyGame. For now everything still goes in EditorSettings::get_settings_dir(), but this will be changed in a later commit to make use of the new splitting where relevant. Part of #3513.
This commit is contained in:
parent
ad199c3964
commit
32c12a92a5
17 changed files with 360 additions and 118 deletions
|
|
@ -456,30 +456,19 @@ int OS_Unix::get_processor_count() const {
|
|||
|
||||
String OS_Unix::get_user_data_dir() const {
|
||||
|
||||
String an = get_safe_application_name();
|
||||
if (an != "") {
|
||||
|
||||
if (has_environment("HOME")) {
|
||||
|
||||
bool use_godot = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir");
|
||||
if (use_godot)
|
||||
return get_environment("HOME") + "/.godot/app_userdata/" + an;
|
||||
else
|
||||
return get_environment("HOME") + "/." + an;
|
||||
String appname = get_safe_application_name();
|
||||
if (appname != "") {
|
||||
bool use_godot_dir = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir");
|
||||
if (use_godot_dir) {
|
||||
return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file(appname);
|
||||
} else {
|
||||
return get_data_path().plus_file(appname);
|
||||
}
|
||||
}
|
||||
|
||||
return ProjectSettings::get_singleton()->get_resource_path();
|
||||
}
|
||||
|
||||
String OS_Unix::get_installed_templates_path() const {
|
||||
String p = get_global_settings_path();
|
||||
if (p != "")
|
||||
return p + "/templates/";
|
||||
else
|
||||
return "";
|
||||
}
|
||||
|
||||
String OS_Unix::get_executable_path() const {
|
||||
|
||||
#ifdef __linux__
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue