Changeset 240455 in webkit

Timestamp:

Jan 24, 2019 4:35:19 PM (5 years ago)

Author:

Jonathan Bedard

Message:

[webkitdirs] iosSimulatorApplicationsPath may not have iOS.simruntime in its path
​https://bugs.webkit.org/show_bug.cgi?id=193787
<rdar://problem/47497634>

Reviewed by Alexey Proskuryakov.

• Scripts/webkitdirs.pm:

(iosSimulatorApplicationsPath): Pick from available runtime directories.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-01-24  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitdirs] iosSimulatorApplicationsPath may not have iOS.simruntime in its path
+        https://bugs.webkit.org/show_bug.cgi?id=193787
+        <rdar://problem/47497634>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitdirs.pm:
+        (iosSimulatorApplicationsPath): Pick from available runtime directories.
+
 2019-01-24  Truitt Savell  <tsavell@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -2505 +2505 @@
 sub iosSimulatorApplicationsPath()
 {
-    my $iphoneOSPlatformPath = sdkPlatformDirectory("iphoneos");
-    return File::Spec->catdir($iphoneOSPlatformPath, "Developer", "Library", "CoreSimulator", "Profiles", "Runtimes", "iOS.simruntime", "Contents", "Resources", "RuntimeRoot", "Applications");
+    # FIXME: We should ask simctl for this information, instead of guessing from available runtimes.
+    my $runtimePath = File::Spec->catdir(sdkPlatformDirectory("iphoneos"), "Developer", "Library", "CoreSimulator", "Profiles", "Runtimes");
+    opendir(RUNTIMES, $runtimePath);
+    my @runtimes = grep {/.*\.simruntime/} readdir(RUNTIMES);
+    close(RUNTIMES);
+    my $sult = File::Spec->catdir($runtimePath, @runtimes ? $runtimes[0] : "iOS.simruntime", "Contents", "Resources", "RuntimeRoot", "Applications");
+    return $sult;
 }