asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[iOS export] Capture and display xcodebuild output.

Browse source 
(cherry picked from commit 2e74bacf17)
This commit is contained in:
bruvzg 2021-11-07 11:05:12 +02:00 committed by Rémi Verschelde
parent 1cbc17247c
commit 4574b3ebeb
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
platform/iphone/export/export.cpp
View file

@ -1959,8 +1959,10 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
archive_args.push_back("archive"); archive_args.push_back("archive");
archive_args.push_back("-archivePath"); archive_args.push_back("-archivePath");
archive_args.push_back(archive_path); archive_args.push_back(archive_path);
err = OS::get_singleton()->execute("xcodebuild", archive_args, true); String archive_str;
err = OS::get_singleton()->execute("xcodebuild", archive_args, true, NULL, &archive_str, NULL, true);
ERR_FAIL_COND_V(err, err); ERR_FAIL_COND_V(err, err);
print_line("xcodebuild (.xcarchive):\n" + archive_str);
if (ep.step("Making .ipa", 4)) { if (ep.step("Making .ipa", 4)) {
return ERR_SKIP; return ERR_SKIP;
@ -1974,8 +1976,10 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p
export_args.push_back("-allowProvisioningUpdates"); export_args.push_back("-allowProvisioningUpdates");
export_args.push_back("-exportPath"); export_args.push_back("-exportPath");
export_args.push_back(dest_dir); export_args.push_back(dest_dir);
err = OS::get_singleton()->execute("xcodebuild", export_args, true); String export_str;
err = OS::get_singleton()->execute("xcodebuild", export_args, true, NULL, &export_str, NULL, true);
ERR_FAIL_COND_V(err, err); ERR_FAIL_COND_V(err, err);
print_line("xcodebuild (.ipa):\n" + export_str);
#else #else
print_line(".ipa can only be built on macOS. Leaving Xcode project without building the package."); print_line(".ipa can only be built on macOS. Leaving Xcode project without building the package.");
#endif #endif