Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
1a53ee66
Unverified
Commit
1a53ee66
authored
May 27, 2020
by
Rémi Verschelde
Committed by
GitHub
May 27, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39097 from m4gr3d/validate_plugins_build_config
Validate that `Use Custom Build` is enabled when `Plugins` are selected
parents
ffe2066b
c948d25b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
6 deletions
+12
-6
export.cpp
platform/android/export/export.cpp
+9
-0
config.gradle
platform/android/java/app/config.gradle
+1
-6
build.gradle
platform/android/java/build.gradle
+2
-0
No files found.
platform/android/export/export.cpp
View file @
1a53ee66
...
@@ -1823,6 +1823,15 @@ public:
...
@@ -1823,6 +1823,15 @@ public:
err
+=
etc_error
;
err
+=
etc_error
;
}
}
// 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
;
}
}
...
...
platform/android/java/app/config.gradle
View file @
1a53ee66
...
@@ -72,17 +72,12 @@ ext.getGodotPluginsRemoteBinaries = { ->
...
@@ -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
))
{
...
...
platform/android/java/build.gradle
View file @
1a53ee66
...
@@ -193,4 +193,6 @@ task cleanGodotTemplates(type: Delete) {
...
@@ -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
)
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment