Merge pull request #24500 from akien-mga/drop-global_defaults
Core: Drop unused global_defaults logic
This commit is contained in:
Rémi Verschelde
GitHub
commit
d8067e905c
|
|
@ -21,7 +21,6 @@ active_platforms = []
|
||||||
active_platform_ids = []
|
active_platform_ids = []
|
||||||
platform_exporters = []
|
platform_exporters = []
|
||||||
platform_apis = []
|
platform_apis = []
|
||||||
global_defaults = []
|
|
||||||
|
|
||||||
for x in sorted(glob.glob("platform/*")):
|
for x in sorted(glob.glob("platform/*")):
|
||||||
if (not os.path.isdir(x) or not os.path.exists(x + "/detect.py")):
|
if (not os.path.isdir(x) or not os.path.exists(x + "/detect.py")):
|
||||||
|
|
@ -35,8 +34,6 @@ for x in sorted(glob.glob("platform/*")):
|
||||||
platform_exporters.append(x[9:])
|
platform_exporters.append(x[9:])
|
||||||
if (os.path.exists(x + "/api/api.cpp")):
|
if (os.path.exists(x + "/api/api.cpp")):
|
||||||
platform_apis.append(x[9:])
|
platform_apis.append(x[9:])
|
||||||
if (os.path.exists(x + "/globals/global_defaults.cpp")):
|
|
||||||
global_defaults.append(x[9:])
|
|
||||||
if (detect.is_active()):
|
if (detect.is_active()):
|
||||||
active_platforms.append(detect.get_name())
|
active_platforms.append(detect.get_name())
|
||||||
active_platform_ids.append(x)
|
active_platform_ids.append(x)
|
||||||
|
|
@ -68,7 +65,6 @@ if 'TERM' in os.environ:
|
||||||
env_base['ENV']['TERM'] = os.environ['TERM']
|
env_base['ENV']['TERM'] = os.environ['TERM']
|
||||||
env_base.AppendENVPath('PATH', os.getenv('PATH'))
|
env_base.AppendENVPath('PATH', os.getenv('PATH'))
|
||||||
env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
|
env_base.AppendENVPath('PKG_CONFIG_PATH', os.getenv('PKG_CONFIG_PATH'))
|
||||||
env_base.global_defaults = global_defaults
|
|
||||||
env_base.android_maven_repos = []
|
env_base.android_maven_repos = []
|
||||||
env_base.android_flat_dirs = []
|
env_base.android_flat_dirs = []
|
||||||
env_base.android_dependencies = []
|
env_base.android_dependencies = []
|
||||||
|
|
|
||||||
16
core/SCsub
16
core/SCsub
|
|
@ -8,22 +8,6 @@ from platform_methods import run_in_subprocess
|
||||||
|
|
||||||
env.core_sources = []
|
env.core_sources = []
|
||||||
|
|
||||||
# Generate global defaults
|
|
||||||
gd_call = ""
|
|
||||||
gd_inc = ""
|
|
||||||
|
|
||||||
for x in env.global_defaults:
|
|
||||||
env.core_sources.append("#platform/" + x + "/globals/global_defaults.cpp")
|
|
||||||
gd_inc += '#include "platform/' + x + '/globals/global_defaults.h"\n'
|
|
||||||
gd_call += "\tregister_" + x + "_global_defaults();\n"
|
|
||||||
|
|
||||||
gd_cpp = '#include "core/project_settings.h"\n'
|
|
||||||
gd_cpp += gd_inc
|
|
||||||
gd_cpp += "void ProjectSettings::register_global_defaults() {\n" + gd_call + "\n}\n"
|
|
||||||
|
|
||||||
with open("global_defaults.gen.cpp", "w") as f:
|
|
||||||
f.write(gd_cpp)
|
|
||||||
|
|
||||||
|
|
||||||
# Generate AES256 script encryption key
|
# Generate AES256 script encryption key
|
||||||
import os
|
import os
|
||||||
|
|
|
||||||
|
|
@ -152,8 +152,6 @@ public:
|
||||||
|
|
||||||
void set_disable_feature_overrides(bool p_disable);
|
void set_disable_feature_overrides(bool p_disable);
|
||||||
|
|
||||||
void register_global_defaults();
|
|
||||||
|
|
||||||
bool is_using_datapack() const;
|
bool is_using_datapack() const;
|
||||||
|
|
||||||
void set_registering_order(bool p_enable);
|
void set_registering_order(bool p_enable);
|
||||||
|
|
|
||||||
|
|
@ -1029,8 +1029,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
|
||||||
|
|
||||||
message_queue = memnew(MessageQueue);
|
message_queue = memnew(MessageQueue);
|
||||||
|
|
||||||
ProjectSettings::get_singleton()->register_global_defaults();
|
|
||||||
|
|
||||||
if (p_second_phase)
|
if (p_second_phase)
|
||||||
return setup2();
|
return setup2();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
/*************************************************************************/
|
|
||||||
/* global_defaults.cpp */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* This file is part of: */
|
|
||||||
/* GODOT ENGINE */
|
|
||||||
/* https://godotengine.org */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
|
|
||||||
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
|
|
||||||
/* */
|
|
||||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
||||||
/* a copy of this software and associated documentation files (the */
|
|
||||||
/* "Software"), to deal in the Software without restriction, including */
|
|
||||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
||||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
||||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
||||||
/* the following conditions: */
|
|
||||||
/* */
|
|
||||||
/* The above copyright notice and this permission notice shall be */
|
|
||||||
/* included in all copies or substantial portions of the Software. */
|
|
||||||
/* */
|
|
||||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
||||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
||||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
||||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
||||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
||||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
||||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
||||||
/*************************************************************************/
|
|
||||||
|
|
||||||
#include "global_defaults.h"
|
|
||||||
#include "core/project_settings.h"
|
|
||||||
|
|
||||||
void register_android_global_defaults() {
|
|
||||||
}
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
/*************************************************************************/
|
|
||||||
/* global_defaults.h */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* This file is part of: */
|
|
||||||
/* GODOT ENGINE */
|
|
||||||
/* https://godotengine.org */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
|
|
||||||
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
|
|
||||||
/* */
|
|
||||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
||||||
/* a copy of this software and associated documentation files (the */
|
|
||||||
/* "Software"), to deal in the Software without restriction, including */
|
|
||||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
||||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
||||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
||||||
/* the following conditions: */
|
|
||||||
/* */
|
|
||||||
/* The above copyright notice and this permission notice shall be */
|
|
||||||
/* included in all copies or substantial portions of the Software. */
|
|
||||||
/* */
|
|
||||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
||||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
||||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
||||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
||||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
||||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
||||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
||||||
/*************************************************************************/
|
|
||||||
|
|
||||||
void register_android_global_defaults();
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
/*************************************************************************/
|
|
||||||
/* global_defaults.cpp */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* This file is part of: */
|
|
||||||
/* GODOT ENGINE */
|
|
||||||
/* https://godotengine.org */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
|
|
||||||
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
|
|
||||||
/* */
|
|
||||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
||||||
/* a copy of this software and associated documentation files (the */
|
|
||||||
/* "Software"), to deal in the Software without restriction, including */
|
|
||||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
||||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
||||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
||||||
/* the following conditions: */
|
|
||||||
/* */
|
|
||||||
/* The above copyright notice and this permission notice shall be */
|
|
||||||
/* included in all copies or substantial portions of the Software. */
|
|
||||||
/* */
|
|
||||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
||||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
||||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
||||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
||||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
||||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
||||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
||||||
/*************************************************************************/
|
|
||||||
|
|
||||||
#include "global_defaults.h"
|
|
||||||
#include "core/project_settings.h"
|
|
||||||
|
|
||||||
void register_iphone_global_defaults() {
|
|
||||||
}
|
|
||||||
|
|
@ -1,31 +0,0 @@
|
||||||
/*************************************************************************/
|
|
||||||
/* global_defaults.h */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* This file is part of: */
|
|
||||||
/* GODOT ENGINE */
|
|
||||||
/* https://godotengine.org */
|
|
||||||
/*************************************************************************/
|
|
||||||
/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */
|
|
||||||
/* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */
|
|
||||||
/* */
|
|
||||||
/* Permission is hereby granted, free of charge, to any person obtaining */
|
|
||||||
/* a copy of this software and associated documentation files (the */
|
|
||||||
/* "Software"), to deal in the Software without restriction, including */
|
|
||||||
/* without limitation the rights to use, copy, modify, merge, publish, */
|
|
||||||
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
|
||||||
/* permit persons to whom the Software is furnished to do so, subject to */
|
|
||||||
/* the following conditions: */
|
|
||||||
/* */
|
|
||||||
/* The above copyright notice and this permission notice shall be */
|
|
||||||
/* included in all copies or substantial portions of the Software. */
|
|
||||||
/* */
|
|
||||||
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
|
||||||
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
|
||||||
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
|
|
||||||
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
|
||||||
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
|
||||||
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
|
||||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
|
||||||
/*************************************************************************/
|
|
||||||
|
|
||||||
void register_iphone_global_defaults();
|
|
||||||
Loading…
Reference in New Issue