godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #39098 from m4gr3d/validate_plugins_build_config_3_2 

[3.2] Validate that `Use Custom Build` is enabled when `Plugins` are selected
This commit is contained in:
Rémi Verschelde 2020-05-27 22:55:14 +02:00 committed by GitHub
parent 9aeb9ea826 0181e89e43
commit 2d9132a463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform/android/export/export.cpp
View File

@ -1900,6 +1900,15 @@ public:
} }
} }
// Ensure that `Use Custom Build` is enabled if a plugin is selected.
String enabled_plugins_names = get_plugins_names(get_enabled_plugins(p_preset));
bool custom_build_enabled = p_preset->get("custom_template/use_custom_build");
if (!enabled_plugins_names.empty() && !custom_build_enabled) {
valid = false;
err += TTR("\"Use Custom Build\" must be enabled to use the plugins.");
err += "\n";
}
r_error = err; r_error = err;
return valid; return valid;
} }

7
platform/android/java/app/config.gradle
View File

@ -72,17 +72,12 @@ ext.getGodotPluginsRemoteBinaries = { ->
/** /**
* Parse the project properties for the 'plugins_local_binaries' property and return * Parse the project properties for the 'plugins_local_binaries' property and return
* their binaries for inclusion in the build dependencies. * their binaries for inclusion in the build dependencies.
*
* Returns the prebuilt plugins if the 'plugins_local_binaries' property is unavailable.
*/ */
ext.getGodotPluginsLocalBinaries = { -> ext.getGodotPluginsLocalBinaries = { ->
// Set the prebuilt plugins as default. If custom build is enabled, Set<String> binDeps = []
// the 'plugins_local_binaries' will be defined so we can use it instead.
Set<String> binDeps = ["libs/plugins/GodotPayment.release.aar"]
// Retrieve the list of local plugins binaries. // Retrieve the list of local plugins binaries.
if (project.hasProperty("plugins_local_binaries")) { if (project.hasProperty("plugins_local_binaries")) {
binDeps.clear()
String pluginsList = project.property("plugins_local_binaries") String pluginsList = project.property("plugins_local_binaries")
if (pluginsList != null && !pluginsList.trim().isEmpty()) { if (pluginsList != null && !pluginsList.trim().isEmpty()) {
for (String plugin : pluginsList.split(PLUGIN_VALUE_SEPARATOR_REGEX)) { for (String plugin : pluginsList.split(PLUGIN_VALUE_SEPARATOR_REGEX)) {

2
platform/android/java/build.gradle
View File

@ -193,4 +193,6 @@ task cleanGodotTemplates(type: Delete) {
delete("$binDir/android_source.zip") delete("$binDir/android_source.zip")
delete("$binDir/godot-lib.debug.aar") delete("$binDir/godot-lib.debug.aar")
delete("$binDir/godot-lib.release.aar") delete("$binDir/godot-lib.release.aar")
finalizedBy getTasksByName("clean", true)
} }