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

Merge pull request #85168 from bruvzg/ios_xc_check 

[iOS] Check if Xcode is installed in one-click deploy code.
This commit is contained in:
Rémi Verschelde 2023-11-21 15:06:32 +01:00
parent 0e33036d19 eceaaea2fe
commit 132554badd
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
platform/ios/export/export_plugin.cpp
View File

@ -2071,6 +2071,22 @@ bool EditorExportPlatformIOS::is_package_name_valid(const String &p_package, Str
} }
#ifdef MACOS_ENABLED #ifdef MACOS_ENABLED
bool EditorExportPlatformIOS::_check_xcode_install() {
static bool xcode_found = false;
if (!xcode_found) {
String xcode_path;
List<String> args;
args.push_back("-p");
int ec = 0;
Error err = OS::get_singleton()->execute("xcode-select", args, &xcode_path, &ec, true);
if (err != OK || ec != 0) {
return false;
}
xcode_found = DirAccess::dir_exists_absolute(xcode_path.strip_edges());
}
return xcode_found;
}
void EditorExportPlatformIOS::_check_for_changes_poll_thread(void *ud) { void EditorExportPlatformIOS::_check_for_changes_poll_thread(void *ud) {
EditorExportPlatformIOS *ea = static_cast<EditorExportPlatformIOS *>(ud); EditorExportPlatformIOS *ea = static_cast<EditorExportPlatformIOS *>(ud);
@ -2138,7 +2154,7 @@ void EditorExportPlatformIOS::_check_for_changes_poll_thread(void *ud) {
} }
// Enum simulators // Enum simulators
if (FileAccess::exists("/usr/bin/xcrun") || FileAccess::exists("/bin/xcrun")) { if (_check_xcode_install() && (FileAccess::exists("/usr/bin/xcrun") || FileAccess::exists("/bin/xcrun"))) {
String devices; String devices;
List<String> args; List<String> args;
args.push_back("simctl"); args.push_back("simctl");

1
platform/ios/export/export_plugin.h
View File

@ -81,6 +81,7 @@ class EditorExportPlatformIOS : public EditorExportPlatform {
Thread check_for_changes_thread; Thread check_for_changes_thread;
SafeFlag quit_request; SafeFlag quit_request;
static bool _check_xcode_install();
static void _check_for_changes_poll_thread(void *ud); static void _check_for_changes_poll_thread(void *ud);
#endif #endif