|
|
@@ -52,7 +52,14 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
|
|
|
|
|
|
Ref<ImageTexture> logo;
|
|
|
|
|
|
- void _fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const String &p_name, const String &p_binary);
|
|
|
+ typedef Error (*FileHandler)(String p_file, void *p_userdata);
|
|
|
+ static Error _walk_dir_recursive(DirAccess *p_da, FileHandler p_handler, void *p_userdata);
|
|
|
+ static Error _codesign(String p_file, void *p_userdata);
|
|
|
+
|
|
|
+ void _fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const String &p_name, const String &p_binary, bool p_debug);
|
|
|
+ static Error _export_dylibs(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total);
|
|
|
+ Error _export_loading_screens(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir);
|
|
|
+ Error _export_icons(const Ref<EditorExportPreset> &p_preset, const String &p_iconset_dir);
|
|
|
|
|
|
protected:
|
|
|
virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features);
|
|
|
@@ -63,7 +70,7 @@ public:
|
|
|
virtual String get_os_name() const { return "iOS"; }
|
|
|
virtual Ref<Texture> get_logo() const { return logo; }
|
|
|
|
|
|
- virtual String get_binary_extension() const { return "xcodeproj"; }
|
|
|
+ virtual String get_binary_extension() const { return "ipa"; }
|
|
|
virtual Error export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags = 0);
|
|
|
|
|
|
virtual bool can_export(const Ref<EditorExportPreset> &p_preset, String &r_error, bool &r_missing_templates) const;
|
|
|
@@ -96,16 +103,44 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_package/debug", PROPERTY_HINT_GLOBAL_FILE, "zip"), ""));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_package/release", PROPERTY_HINT_GLOBAL_FILE, "zip"), ""));
|
|
|
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/app_store_team_id"), ""));
|
|
|
+
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/provisioning_profile_uuid_debug"), ""));
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_debug"), "iPhone Developer"));
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_debug", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 1));
|
|
|
+
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/provisioning_profile_uuid_release"), ""));
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/code_sign_identity_release"), "iPhone Distribution"));
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/export_method_release", PROPERTY_HINT_ENUM, "App Store,Development,Ad-Hoc,Enterprise"), 0));
|
|
|
+
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/name"), ""));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/info"), "Made with Godot Engine"));
|
|
|
- // r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/icon", PROPERTY_HINT_FILE, "png"), ""));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/identifier"), "org.godotengine.iosgame"));
|
|
|
- r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/signature"), "godotiosgame"));
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/signature"), "????"));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/short_version"), "1.0"));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/version"), "1.0"));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), ""));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/bits_mode", PROPERTY_HINT_ENUM, "Fat (32 & 64 bits),64 bits,32 bits"), 1));
|
|
|
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/iphone_120x120", PROPERTY_HINT_FILE, "png"), "")); // Home screen on iPhone/iPod Touch with retina display
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/ipad_76x76", PROPERTY_HINT_FILE, "png"), "")); // Home screen on iPad
|
|
|
+
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/iphone_180x180", PROPERTY_HINT_FILE, "png"), "")); // Home screen on iPhone with retina HD display
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/ipad_152x152", PROPERTY_HINT_FILE, "png"), "")); // Home screen on iPad with retina display
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/ipad_167x167", PROPERTY_HINT_FILE, "png"), "")); // Home screen on iPad Pro
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/spotlight_40x40", PROPERTY_HINT_FILE, "png"), "")); // Spotlight
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "optional_icons/spotlight_80x80", PROPERTY_HINT_FILE, "png"), "")); // Spotlight on devices with retina display
|
|
|
+
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "landscape_launch_screens/iphone_2208x1242", PROPERTY_HINT_FILE, "png"), "")); // iPhone 6 Plus, 6s Plus, 7 Plus
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "landscape_launch_screens/ipad_2732x2048", PROPERTY_HINT_FILE, "png"), "")); // 12.9-inch iPad Pro
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "landscape_launch_screens/ipad_2048x1536", PROPERTY_HINT_FILE, "png"), "")); // Other iPads
|
|
|
+
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "portrait_launch_screens/iphone_640x1136", PROPERTY_HINT_FILE, "png"), "")); // iPhone 5, 5s, SE
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "portrait_launch_screens/iphone_750x1334", PROPERTY_HINT_FILE, "png"), "")); // iPhone 6, 6s, 7
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "portrait_launch_screens/iphone_1242x2208", PROPERTY_HINT_FILE, "png"), "")); // iPhone 6 Plus, 6s Plus, 7 Plus
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "portrait_launch_screens/ipad_2048x2732", PROPERTY_HINT_FILE, "png"), "")); // 12.9-inch iPad Pro
|
|
|
+ r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "portrait_launch_screens/ipad_1536x2048", PROPERTY_HINT_FILE, "png"), "")); // Other iPads
|
|
|
+
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), false));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false));
|
|
|
r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), true));
|
|
|
@@ -113,11 +148,17 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options)
|
|
|
/* probably need some more info */
|
|
|
}
|
|
|
|
|
|
-void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const String &p_name, const String &p_binary) {
|
|
|
-
|
|
|
+void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const String &p_name, const String &p_binary, bool p_debug) {
|
|
|
+ static const String export_method_string[] = {
|
|
|
+ "app-store",
|
|
|
+ "development",
|
|
|
+ "ad-hoc",
|
|
|
+ "enterprise"
|
|
|
+ };
|
|
|
String str;
|
|
|
String strnew;
|
|
|
str.parse_utf8((const char *)pfile.ptr(), pfile.size());
|
|
|
+ print_line(str);
|
|
|
Vector<String> lines = str.split("\n");
|
|
|
for (int i = 0; i < lines.size(); i++) {
|
|
|
if (lines[i].find("$binary") != -1) {
|
|
|
@@ -136,6 +177,19 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
|
|
|
strnew += lines[i].replace("$signature", p_preset->get("application/signature")) + "\n";
|
|
|
} else if (lines[i].find("$copyright") != -1) {
|
|
|
strnew += lines[i].replace("$copyright", p_preset->get("application/copyright")) + "\n";
|
|
|
+ } else if (lines[i].find("$team_id") != -1) {
|
|
|
+ strnew += lines[i].replace("$team_id", p_preset->get("application/app_store_team_id")) + "\n";
|
|
|
+ } else if (lines[i].find("$export_method") != -1) {
|
|
|
+ int export_method = p_preset->get(p_debug ? "application/export_method_debug" : "application/export_method_release");
|
|
|
+ strnew += lines[i].replace("$export_method", export_method_string[export_method]) + "\n";
|
|
|
+ } else if (lines[i].find("$provisioning_profile_uuid_release") != -1) {
|
|
|
+ strnew += lines[i].replace("$provisioning_profile_uuid_release", p_preset->get("application/provisioning_profile_uuid_release")) + "\n";
|
|
|
+ } else if (lines[i].find("$provisioning_profile_uuid_debug") != -1) {
|
|
|
+ strnew += lines[i].replace("$provisioning_profile_uuid_debug", p_preset->get("application/provisioning_profile_uuid_debug")) + "\n";
|
|
|
+ } else if (lines[i].find("$code_sign_identity_debug") != -1) {
|
|
|
+ strnew += lines[i].replace("$code_sign_identity_debug", p_preset->get("application/code_sign_identity_debug")) + "\n";
|
|
|
+ } else if (lines[i].find("$code_sign_identity_release") != -1) {
|
|
|
+ strnew += lines[i].replace("$code_sign_identity_release", p_preset->get("application/code_sign_identity_release")) + "\n";
|
|
|
} else {
|
|
|
strnew += lines[i] + "\n";
|
|
|
}
|
|
|
@@ -150,12 +204,214 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+Error EditorExportPlatformIOS::_export_dylibs(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total) {
|
|
|
+ if (!p_path.ends_with(".dylib")) return OK;
|
|
|
+ const String &dest_dir = *(String *)p_userdata;
|
|
|
+ String rel_path = p_path.replace_first("res://", "dylibs/");
|
|
|
+ DirAccess *dest_dir_access = DirAccess::open(dest_dir);
|
|
|
+ ERR_FAIL_COND_V(!dest_dir_access, ERR_CANT_OPEN);
|
|
|
+
|
|
|
+ String base_dir = rel_path.get_base_dir();
|
|
|
+ Error make_dir_err = OK;
|
|
|
+ if (!dest_dir_access->dir_exists(base_dir)) {
|
|
|
+ make_dir_err = dest_dir_access->make_dir_recursive(base_dir);
|
|
|
+ }
|
|
|
+ if (make_dir_err != OK) {
|
|
|
+ memdelete(dest_dir_access);
|
|
|
+ return make_dir_err;
|
|
|
+ }
|
|
|
+
|
|
|
+ Error copy_err = dest_dir_access->copy(p_path, dest_dir + rel_path);
|
|
|
+ memdelete(dest_dir_access);
|
|
|
+
|
|
|
+ return copy_err;
|
|
|
+}
|
|
|
+
|
|
|
+struct IconInfo {
|
|
|
+ const char *preset_key;
|
|
|
+ const char *idiom;
|
|
|
+ const char *export_name;
|
|
|
+ const char *actual_size_side;
|
|
|
+ const char *scale;
|
|
|
+ const char *unscaled_size;
|
|
|
+ bool is_required;
|
|
|
+};
|
|
|
+
|
|
|
+static const IconInfo icon_infos[] = {
|
|
|
+ { "required_icons/iphone_120x120", "iphone", "Icon-120.png", "120", "2x", "60x60", true },
|
|
|
+ { "required_icons/iphone_120x120", "iphone", "Icon-120.png", "120", "3x", "40x40", true },
|
|
|
+
|
|
|
+ { "required_icons/ipad_76x76", "ipad", "Icon-76.png", "76", "1x", "76x76", false },
|
|
|
+
|
|
|
+ { "optional_icons/iphone_180x180", "iphone", "Icon-180.png", "180", "3x", "60x60", false },
|
|
|
+
|
|
|
+ { "optional_icons/ipad_152x152", "ipad", "Icon-152.png", "152", "2x", "76x76", false },
|
|
|
+
|
|
|
+ { "optional_icons/ipad_167x167", "ipad", "Icon-167.png", "167", "2x", "83.5x83.5", false },
|
|
|
+
|
|
|
+ { "optional_icons/spotlight_40x40", "ipad", "Icon-40.png", "40", "1x", "40x40", false },
|
|
|
+
|
|
|
+ { "optional_icons/spotlight_80x80", "iphone", "Icon-80.png", "80", "2x", "40x40", false },
|
|
|
+ { "optional_icons/spotlight_80x80", "ipad", "Icon-80.png", "80", "2x", "40x40", false }
|
|
|
+
|
|
|
+};
|
|
|
+
|
|
|
+Error EditorExportPlatformIOS::_export_icons(const Ref<EditorExportPreset> &p_preset, const String &p_iconset_dir) {
|
|
|
+ String json_description = "{\"images\":[";
|
|
|
+ String sizes;
|
|
|
+
|
|
|
+ DirAccess *da = DirAccess::open(p_iconset_dir);
|
|
|
+ ERR_FAIL_COND_V(!da, ERR_CANT_OPEN);
|
|
|
+
|
|
|
+ for (int i = 0; i < (sizeof(icon_infos) / sizeof(icon_infos[0])); ++i) {
|
|
|
+ IconInfo info = icon_infos[i];
|
|
|
+ String icon_path = p_preset->get(info.preset_key);
|
|
|
+ if (icon_path.length() == 0) {
|
|
|
+ if (info.is_required) {
|
|
|
+ ERR_PRINT("Required icon is not specified in the preset");
|
|
|
+ return ERR_UNCONFIGURED;
|
|
|
+ }
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+ Error err = da->copy(icon_path, p_iconset_dir + info.export_name);
|
|
|
+ if (err) {
|
|
|
+ memdelete(da);
|
|
|
+ String err_str = String("Failed to export icon: ") + icon_path;
|
|
|
+ ERR_PRINT(err_str.utf8().get_data());
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+ sizes += String(info.actual_size_side) + "\n";
|
|
|
+ if (i > 0) {
|
|
|
+ json_description += ",";
|
|
|
+ }
|
|
|
+ json_description += String("{");
|
|
|
+ json_description += String("\"idiom\":") + "\"" + info.idiom + "\",";
|
|
|
+ json_description += String("\"size\":") + "\"" + info.unscaled_size + "\",";
|
|
|
+ json_description += String("\"scale\":") + "\"" + info.scale + "\",";
|
|
|
+ json_description += String("\"filename\":") + "\"" + info.export_name + "\"";
|
|
|
+ json_description += String("}");
|
|
|
+ }
|
|
|
+ json_description += "]}";
|
|
|
+ memdelete(da);
|
|
|
+
|
|
|
+ FileAccess *json_file = FileAccess::open(p_iconset_dir + "Contents.json", FileAccess::WRITE);
|
|
|
+ ERR_FAIL_COND_V(!json_file, ERR_CANT_CREATE);
|
|
|
+ CharString json_utf8 = json_description.utf8();
|
|
|
+ json_file->store_buffer((const uint8_t *)json_utf8.get_data(), json_utf8.length());
|
|
|
+ memdelete(json_file);
|
|
|
+
|
|
|
+ FileAccess *sizes_file = FileAccess::open(p_iconset_dir + "sizes", FileAccess::WRITE);
|
|
|
+ ERR_FAIL_COND_V(!sizes_file, ERR_CANT_CREATE);
|
|
|
+ CharString sizes_utf8 = sizes.utf8();
|
|
|
+ sizes_file->store_buffer((const uint8_t *)sizes_utf8.get_data(), sizes_utf8.length());
|
|
|
+ memdelete(sizes_file);
|
|
|
+
|
|
|
+ return OK;
|
|
|
+}
|
|
|
+
|
|
|
+struct LoadingScreenInfo {
|
|
|
+ const char *preset_key;
|
|
|
+ const char *export_name;
|
|
|
+};
|
|
|
+
|
|
|
+static const LoadingScreenInfo loading_screen_infos[] = {
|
|
|
+ { "landscape_launch_screens/iphone_2208x1242", "[email protected]" },
|
|
|
+ { "landscape_launch_screens/ipad_2732x2048", "[email protected]" },
|
|
|
+ { "landscape_launch_screens/ipad_2048x1536", "[email protected]" },
|
|
|
+
|
|
|
+ { "portrait_launch_screens/iphone_640x1136", "[email protected]" },
|
|
|
+ { "portrait_launch_screens/iphone_750x1334", "[email protected]" },
|
|
|
+ { "portrait_launch_screens/iphone_1242x2208", "[email protected]" },
|
|
|
+ { "portrait_launch_screens/ipad_2048x2732", "[email protected]" },
|
|
|
+ { "portrait_launch_screens/ipad_1536x2048", "[email protected]" }
|
|
|
+};
|
|
|
+
|
|
|
+Error EditorExportPlatformIOS::_export_loading_screens(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir) {
|
|
|
+ DirAccess *da = DirAccess::open(p_dest_dir);
|
|
|
+ ERR_FAIL_COND_V(!da, ERR_CANT_OPEN);
|
|
|
+
|
|
|
+ for (int i = 0; i < sizeof(loading_screen_infos) / sizeof(loading_screen_infos[0]); ++i) {
|
|
|
+ LoadingScreenInfo info = loading_screen_infos[i];
|
|
|
+ String loading_screen_file = p_preset->get(info.preset_key);
|
|
|
+ Error err = da->copy(loading_screen_file, p_dest_dir + info.export_name);
|
|
|
+ if (err) {
|
|
|
+ memdelete(da);
|
|
|
+ String err_str = String("Failed to export loading screen: ") + loading_screen_file;
|
|
|
+ ERR_PRINT(err_str.utf8().get_data());
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ memdelete(da);
|
|
|
+
|
|
|
+ return OK;
|
|
|
+}
|
|
|
+
|
|
|
+Error EditorExportPlatformIOS::_walk_dir_recursive(DirAccess *p_da, FileHandler p_handler, void *p_userdata) {
|
|
|
+ Vector<String> dirs;
|
|
|
+ String path;
|
|
|
+ String current_dir = p_da->get_current_dir();
|
|
|
+ p_da->list_dir_begin();
|
|
|
+ while ((path = p_da->get_next()).length() != 0) {
|
|
|
+ if (p_da->current_is_dir()) {
|
|
|
+ if (path != "." && path != "..") {
|
|
|
+ dirs.push_back(path);
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ Error err = p_handler(current_dir + "/" + path, p_userdata);
|
|
|
+ if (err) {
|
|
|
+ p_da->list_dir_end();
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ p_da->list_dir_end();
|
|
|
+
|
|
|
+ for (int i = 0; i < dirs.size(); ++i) {
|
|
|
+ String dir = dirs[i];
|
|
|
+ p_da->change_dir(dir);
|
|
|
+ Error err = _walk_dir_recursive(p_da, p_handler, p_userdata);
|
|
|
+ p_da->change_dir("..");
|
|
|
+ if (err) {
|
|
|
+ return err;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return OK;
|
|
|
+}
|
|
|
+
|
|
|
+struct CodesignData {
|
|
|
+ const Ref<EditorExportPreset> &preset;
|
|
|
+ bool debug;
|
|
|
+
|
|
|
+ CodesignData(const Ref<EditorExportPreset> &p_preset, bool p_debug)
|
|
|
+ : preset(p_preset), debug(p_debug) {
|
|
|
+ }
|
|
|
+};
|
|
|
+
|
|
|
+Error EditorExportPlatformIOS::_codesign(String p_file, void *p_userdata) {
|
|
|
+ if (p_file.ends_with(".dylib")) {
|
|
|
+ CodesignData *data = (CodesignData *)p_userdata;
|
|
|
+ print_line(String("Signing ") + p_file);
|
|
|
+ List<String> codesign_args;
|
|
|
+ codesign_args.push_back("-f");
|
|
|
+ codesign_args.push_back("-s");
|
|
|
+ codesign_args.push_back(data->preset->get(data->debug ? "application/code_sign_identity_debug" : "application/code_sign_identity_release"));
|
|
|
+ codesign_args.push_back(p_file);
|
|
|
+ return OS::get_singleton()->execute("/usr/bin/codesign", codesign_args, true);
|
|
|
+ }
|
|
|
+ return OK;
|
|
|
+}
|
|
|
+
|
|
|
Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) {
|
|
|
String src_pkg_name;
|
|
|
String dest_dir = p_path.get_base_dir() + "/";
|
|
|
String binary_name = p_path.get_file().get_basename();
|
|
|
|
|
|
- EditorProgress ep("export", "Exporting for iOS", 3);
|
|
|
+ EditorProgress ep("export", "Exporting for iOS", 5);
|
|
|
+
|
|
|
+ String team_id = p_preset->get("application/app_store_team_id");
|
|
|
+ ERR_EXPLAIN("App Store Team ID not specified - cannot configure the project.");
|
|
|
+ ERR_FAIL_COND_V(team_id.length() == 0, ERR_CANT_OPEN);
|
|
|
|
|
|
if (p_debug)
|
|
|
src_pkg_name = p_preset->get("custom_package/debug");
|
|
|
@@ -206,6 +462,15 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
|
|
|
bool found_binary = false;
|
|
|
int total_size = 0;
|
|
|
|
|
|
+ Set<String> files_to_parse;
|
|
|
+ files_to_parse.insert("godot_ios/godot_ios-Info.plist");
|
|
|
+ files_to_parse.insert("godot_ios.xcodeproj/project.pbxproj");
|
|
|
+ files_to_parse.insert("export_options.plist");
|
|
|
+ files_to_parse.insert("godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata");
|
|
|
+ files_to_parse.insert("godot_ios.xcodeproj/xcshareddata/xcschemes/godot_ios.xcscheme");
|
|
|
+
|
|
|
+ print_line("Unzipping...");
|
|
|
+
|
|
|
while (ret == UNZ_OK) {
|
|
|
bool is_execute = false;
|
|
|
|
|
|
@@ -229,12 +494,9 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
|
|
|
|
|
|
file = file.replace_first("iphone/", "");
|
|
|
|
|
|
- if (file == "godot_ios.xcodeproj/project.pbxproj") {
|
|
|
- print_line("parse pbxproj");
|
|
|
- _fix_config_file(p_preset, data, pkg_name, binary_name);
|
|
|
- } else if (file == "godot_ios/godot_ios-Info.plist") {
|
|
|
- print_line("parse plist");
|
|
|
- _fix_config_file(p_preset, data, pkg_name, binary_name);
|
|
|
+ if (files_to_parse.has(file)) {
|
|
|
+ print_line(String("parse ") + file);
|
|
|
+ _fix_config_file(p_preset, data, pkg_name, binary_name, p_debug);
|
|
|
} else if (file.begins_with("godot.iphone")) {
|
|
|
if (file != binary_to_use) {
|
|
|
ret = unzGoToNextFile(src_pkg_zip);
|
|
|
@@ -264,6 +526,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
|
|
|
if (dir_err) {
|
|
|
ERR_PRINTS("Can't create '" + dir_name + "'.");
|
|
|
unzClose(src_pkg_zip);
|
|
|
+ memdelete(tmp_app_path);
|
|
|
return ERR_CANT_CREATE;
|
|
|
}
|
|
|
}
|
|
|
@@ -273,6 +536,7 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
|
|
|
if (!f) {
|
|
|
ERR_PRINTS("Can't write '" + file + "'.");
|
|
|
unzClose(src_pkg_zip);
|
|
|
+ memdelete(tmp_app_path);
|
|
|
return ERR_CANT_CREATE;
|
|
|
};
|
|
|
f->store_buffer(data.ptr(), data.size());
|
|
|
@@ -295,26 +559,79 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
|
|
|
|
|
|
if (!found_binary) {
|
|
|
ERR_PRINTS("Requested template binary '" + binary_to_use + "' not found. It might be missing from your template archive.");
|
|
|
- unzClose(src_pkg_zip);
|
|
|
+ memdelete(tmp_app_path);
|
|
|
return ERR_FILE_NOT_FOUND;
|
|
|
}
|
|
|
|
|
|
- ep.step("Making PKG", 1);
|
|
|
+ String iconset_dir = dest_dir + binary_name + "/Images.xcassets/AppIcon.appiconset/";
|
|
|
+ Error err = OK;
|
|
|
+ if (!tmp_app_path->dir_exists(iconset_dir)) {
|
|
|
+ Error err = tmp_app_path->make_dir_recursive(iconset_dir);
|
|
|
+ }
|
|
|
+ memdelete(tmp_app_path);
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = _export_icons(p_preset, iconset_dir);
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ err = _export_loading_screens(p_preset, dest_dir + binary_name + "/");
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
+
|
|
|
+ ep.step("Making .pck", 1);
|
|
|
|
|
|
String pack_path = dest_dir + binary_name + ".pck";
|
|
|
- Error err = save_pack(p_preset, pack_path);
|
|
|
+ err = save_pack(p_preset, pack_path);
|
|
|
+ if (err)
|
|
|
+ return err;
|
|
|
|
|
|
- if (err) {
|
|
|
+ err = export_project_files(p_preset, _export_dylibs, &dest_dir);
|
|
|
+ if (err)
|
|
|
return err;
|
|
|
- }
|
|
|
|
|
|
#ifdef OSX_ENABLED
|
|
|
- /* and open up xcode with our new project.... */
|
|
|
- List<String> args;
|
|
|
- args.push_back(p_path);
|
|
|
- err = OS::get_singleton()->execute("/usr/bin/open", args, false);
|
|
|
+ ep.step("Making .xcarchive", 2);
|
|
|
+ String archive_path = p_path.get_basename() + ".xcarchive";
|
|
|
+ List<String> archive_args;
|
|
|
+ archive_args.push_back("-project");
|
|
|
+ archive_args.push_back(dest_dir + binary_name + ".xcodeproj");
|
|
|
+ archive_args.push_back("-scheme");
|
|
|
+ archive_args.push_back(binary_name);
|
|
|
+ archive_args.push_back("-sdk");
|
|
|
+ archive_args.push_back("iphoneos");
|
|
|
+ archive_args.push_back("-configuration");
|
|
|
+ archive_args.push_back(p_debug ? "Debug" : "Release");
|
|
|
+ archive_args.push_back("-destination");
|
|
|
+ archive_args.push_back("generic/platform=iOS");
|
|
|
+ archive_args.push_back("archive");
|
|
|
+ archive_args.push_back("-archivePath");
|
|
|
+ archive_args.push_back(archive_path);
|
|
|
+ err = OS::get_singleton()->execute("/usr/bin/xcodebuild", archive_args, true);
|
|
|
ERR_FAIL_COND_V(err, err);
|
|
|
|
|
|
+ ep.step("Code-signing dylibs", 3);
|
|
|
+ DirAccess *dylibs_dir = DirAccess::open(archive_path + "/Products/Applications/" + binary_name + ".app/dylibs");
|
|
|
+ ERR_FAIL_COND_V(!dylibs_dir, ERR_CANT_OPEN);
|
|
|
+ CodesignData codesign_data(p_preset, p_debug);
|
|
|
+ err = _walk_dir_recursive(dylibs_dir, _codesign, &codesign_data);
|
|
|
+ memdelete(dylibs_dir);
|
|
|
+ ERR_FAIL_COND_V(err, err);
|
|
|
+
|
|
|
+ ep.step("Making .ipa", 4);
|
|
|
+ List<String> export_args;
|
|
|
+ export_args.push_back("-exportArchive");
|
|
|
+ export_args.push_back("-archivePath");
|
|
|
+ export_args.push_back(archive_path);
|
|
|
+ export_args.push_back("-exportOptionsPlist");
|
|
|
+ export_args.push_back(dest_dir + "export_options.plist");
|
|
|
+ export_args.push_back("-exportPath");
|
|
|
+ export_args.push_back(dest_dir);
|
|
|
+ err = OS::get_singleton()->execute("/usr/bin/xcodebuild", export_args, true);
|
|
|
+ ERR_FAIL_COND_V(err, err);
|
|
|
+#else
|
|
|
+ print_line(".ipa can only be built on macOS. Leaving XCode project without building the package.");
|
|
|
#endif
|
|
|
|
|
|
return OK;
|
Ruslan Mustakov
