Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #12988 from akien-mga/xdg-home-paths

Browse source 
Add support for XDG Base Directory spec
This commit is contained in:
Rémi Verschelde 2017-11-20 00:42:51 +01:00 • committed by GitHub
commit ecf80fbbba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
49 changed files with 498 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

2
platform/javascript/export/export.cpp
View file

@ -272,7 +272,7 @@ int EditorExportPlatformJavaScript::get_device_count() const {
Error EditorExportPlatformJavaScript::run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) {
String path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmp_export.html";
String path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_export.html");
Error err = export_project(p_preset, true, path, p_debug_flags);
if (err) {
return err;

10
platform/javascript/os_javascript.cpp
View file

@ -882,11 +882,11 @@ String OS_JavaScript::get_resource_dir() const {
return "/"; //javascript has it's own filesystem for resources inside the APK
}
String OS_JavaScript::get_data_dir() const {
String OS_JavaScript::get_user_data_dir() const {
/*
if (get_data_dir_func)
return get_data_dir_func();
if (get_user_data_dir_func)
return get_user_data_dir_func();
*/
return "/userfs";
};
@ -986,7 +986,7 @@ bool OS_JavaScript::is_userfs_persistent() const {
return idbfs_available;
}
OS_JavaScript::OS_JavaScript(const char *p_execpath, GetDataDirFunc p_get_data_dir_func) {
OS_JavaScript::OS_JavaScript(const char *p_execpath, GetUserDataDirFunc p_get_user_data_dir_func) {
set_cmdline(p_execpath, get_cmdline_args());
main_loop = NULL;
gl_extensions = NULL;
@ -994,7 +994,7 @@ OS_JavaScript::OS_JavaScript(const char *p_execpath, GetDataDirFunc p_get_data_d
soft_fs_enabled = false;
canvas_size_adjustment_requested = false;
get_data_dir_func = p_get_data_dir_func;
get_user_data_dir_func = p_get_user_data_dir_func;
FileAccessUnix::close_notification_func = _close_notification_funcs;
idbfs_available = false;

8
platform/javascript/os_javascript.h
View file

@ -41,7 +41,7 @@
#include <emscripten/html5.h>
typedef String (*GetDataDirFunc)();
typedef String (*GetUserDataDirFunc)();
class OS_JavaScript : public OS_Unix {
@ -62,7 +62,7 @@ class OS_JavaScript : public OS_Unix {
CursorShape cursor_shape;
MainLoop *main_loop;
GetDataDirFunc get_data_dir_func;
GetUserDataDirFunc get_user_data_dir_func;
PowerJavascript *power_manager;
@ -141,7 +141,7 @@ public:
void set_opengl_extensions(const char *p_gl_extensions);
virtual Error shell_open(String p_uri);
virtual String get_data_dir() const;
virtual String get_user_data_dir() const;
String get_executable_path() const;
virtual String get_resource_dir() const;
@ -160,7 +160,7 @@ public:
void set_idbfs_available(bool p_idbfs_available);
OS_JavaScript(const char *p_execpath, GetDataDirFunc p_get_data_dir_func);
OS_JavaScript(const char *p_execpath, GetUserDataDirFunc p_get_user_data_dir_func);
~OS_JavaScript();
};