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

Make export valid when setting custom packages for iOS

Browse Source 
even no templates installed.
all others export work as this already.
This commit is contained in:
volzhs 2019-01-12 01:39:29 +09:00
parent 27d7772381
commit af162a8c3f
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
platform/iphone/export/export.cpp
View File

@ -1029,32 +1029,38 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const { bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const {
bool valid = true;
String err; String err;
r_missing_templates = find_export_template("iphone.zip") == String();
if (!exists_export_template("iphone.zip", &err)) { if (p_preset->get("custom_package/debug") != "") {
valid = false; if (FileAccess::exists(p_preset->get("custom_package/debug"))) {
r_missing_templates = false;
} else {
err += "Custom debug package not found.\n";
}
} }
if (p_preset->get("custom_package/debug") != "" && !FileAccess::exists(p_preset->get("custom_package/debug"))) { if (p_preset->get("custom_package/release") != "") {
valid = false; if (FileAccess::exists(p_preset->get("custom_package/release"))) {
err += "Custom debug package not found.\n"; r_missing_templates = false;
} else {
err += "Custom release package not found.\n";
}
} }
if (p_preset->get("custom_package/release") != "" && !FileAccess::exists(p_preset->get("custom_package/release"))) { bool valid = !r_missing_templates;
valid = false;
err += "Custom release package not found.\n";
}
String team_id = p_preset->get("application/app_store_team_id"); String team_id = p_preset->get("application/app_store_team_id");
if (team_id.length() == 0) { if (team_id.length() == 0) {
err += "App Store Team ID not specified - cannot configure the project.\n"; err += "App Store Team ID not specified - cannot configure the project.\n";
valid = false;
} }
String identifier = p_preset->get("application/identifier"); String identifier = p_preset->get("application/identifier");
String pn_err; String pn_err;
if (!is_package_name_valid(identifier, &pn_err)) { if (!is_package_name_valid(identifier, &pn_err)) {
err += "Invalid Identifier - " + pn_err + "\n"; err += "Invalid Identifier - " + pn_err + "\n";
valid = false;
} }
for (unsigned int i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) { for (unsigned int i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
@ -1063,6 +1069,7 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset
if (icon_path.length() == 0) { if (icon_path.length() == 0) {
if (info.is_required) { if (info.is_required) {
err += "Required icon is not specified in the preset.\n"; err += "Required icon is not specified in the preset.\n";
valid = false;
} }
break; break;
} }
@ -1071,8 +1078,7 @@ bool EditorExportPlatformIOS::can_export(const Ref<EditorExportPreset> &p_preset
if (!err.empty()) if (!err.empty())
r_error = err; r_error = err;
r_missing_templates = !valid; return valid;
return err.empty();
} }
EditorExportPlatformIOS::EditorExportPlatformIOS() { EditorExportPlatformIOS::EditorExportPlatformIOS() {