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

Improved custom Android template exports 

Prevent newlines from beeing appended in AndroidManifest.xml and
build.gradle. Fixes #36708.
This commit is contained in:
Marcus Brummer 2020-03-03 10:49:13 +01:00
parent 416cd715a3
commit 9190f516b1
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1854,6 +1854,7 @@ public:
while (!f->eof_reached()) { while (!f->eof_reached()) {
String l = f->get_line(); String l = f->get_line();
bool append_line = false;
if (l.begins_with("//CHUNK_")) { if (l.begins_with("//CHUNK_")) {
String text = l.replace_first("//CHUNK_", ""); String text = l.replace_first("//CHUNK_", "");
int begin_pos = text.find("_BEGIN"); int begin_pos = text.find("_BEGIN");
@ -1885,10 +1886,14 @@ public:
new_file += E->get() + "\n"; new_file += E->get() + "\n";
} }
} }
if (f->eof_reached()) {
new_file += end_marker;
} else {
new_file += end_marker + "\n"; new_file += end_marker + "\n";
} }
}
} else { } else {
new_file += l + "\n"; //pass line by append_line = true;
} }
} else if (l.begins_with("//DIR_")) { } else if (l.begins_with("//DIR_")) {
String text = l.replace_first("//DIR_", ""); String text = l.replace_first("//DIR_", "");
@ -1921,18 +1926,29 @@ public:
new_file += "\n"; new_file += "\n";
} }
} }
if (f->eof_reached()) {
new_file += end_marker;
} else {
new_file += end_marker + "\n"; new_file += end_marker + "\n";
} }
}
} else { } else {
new_file += l + "\n"; //pass line by append_line = true;
}
} else {
append_line = true;
} }
if (append_line) {
if (f->eof_reached()) {
new_file += l;
} else { } else {
new_file += l + "\n"; new_file += l + "\n";
} }
} }
} }
} }
}
FileAccessRef f = FileAccess::open("res://android/build/build.gradle", FileAccess::WRITE); FileAccessRef f = FileAccess::open("res://android/build/build.gradle", FileAccess::WRITE);
f->store_string(new_file); f->store_string(new_file);
@ -1949,6 +1965,7 @@ public:
while (!f->eof_reached()) { while (!f->eof_reached()) {
String l = f->get_line(); String l = f->get_line();
bool append_line = false;
if (l.begins_with("<!--CHUNK_")) { if (l.begins_with("<!--CHUNK_")) {
String text = l.replace_first("<!--CHUNK_", ""); String text = l.replace_first("<!--CHUNK_", "");
int begin_pos = text.find("_BEGIN-->"); int begin_pos = text.find("_BEGIN-->");
@ -1979,10 +1996,14 @@ public:
new_file += E->get() + "\n"; new_file += E->get() + "\n";
} }
} }
if (f->eof_reached()) {
new_file += end_marker;
} else {
new_file += end_marker + "\n"; new_file += end_marker + "\n";
} }
}
} else { } else {
new_file += l + "\n"; //pass line by append_line = true;
} }
} else if (l.strip_edges().begins_with("<application")) { } else if (l.strip_edges().begins_with("<application")) {
@ -1990,7 +2011,7 @@ public:
int last_tag_pos = l.find(last_tag); int last_tag_pos = l.find(last_tag);
if (last_tag_pos == -1) { if (last_tag_pos == -1) {
ERR_PRINTS("Not adding application attributes as the expected tag was not found in '<application': " + last_tag); ERR_PRINTS("Not adding application attributes as the expected tag was not found in '<application': " + last_tag);
new_file += l + "\n"; append_line = true;
} else { } else {
String base = l.substr(0, last_tag_pos + last_tag.length()); String base = l.substr(0, last_tag_pos + last_tag.length());
if (manifest_sections.has("application_attribs")) { if (manifest_sections.has("application_attribs")) {
@ -2003,7 +2024,14 @@ public:
new_file += base; new_file += base;
} }
} else { } else {
new_file += l + "\n"; append_line = true;
}
if (append_line) {
new_file += l;
if (!f->eof_reached()) {
new_file += "\n";
}
} }
} }
} }