Attachment 360042 Details for Bug 193787 – Patch

[patch] Patch

bug-193787-20190124152203.patch (text/plain), 1.67 KB, created by Jonathan Bedard on 2019-01-24 15:22:03 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2019-01-24 15:22:03 PST

Size: 1.67 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 240450)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2019-01-24  Jonathan Bedard  <jbedard@apple.com>
>+
>+        [webkitdirs] iosSimulatorApplicationsPath may not have iOS.simruntime in it's path
>+        https://bugs.webkit.org/show_bug.cgi?id=193787
>+        <rdar://problem/47497634>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitdirs.pm:
>+        (iosSimulatorApplicationsPath): Pick from available runtime directories.
>+
> 2019-01-24  Zalan Bujtas  <zalan@apple.com>
> 
>         DidFirstVisuallyNonEmptyLayout milestone should always fire at some point.
>Index: Tools/Scripts/webkitdirs.pm
>===================================================================
>--- Tools/Scripts/webkitdirs.pm	(revision 240446)
>+++ Tools/Scripts/webkitdirs.pm	(working copy)
>@@ -2504,8 +2504,11 @@ sub setupIOSWebKitEnvironment($)
> 
> sub iosSimulatorApplicationsPath()
> {
>-    my $iphoneOSPlatformPath = sdkPlatformDirectory("iphoneos");
>-    return File::Spec->catdir($iphoneOSPlatformPath, "Developer", "Library", "CoreSimulator", "Profiles", "Runtimes", "iOS.simruntime", "Contents", "Resources", "RuntimeRoot", "Applications");
>+    my $runtimePath = File::Spec->catdir(sdkPlatformDirectory("iphoneos"), "Developer", "Library", "CoreSimulator", "Profiles", "Runtimes");
>+    opendir(RUNTIMES, $runtimePath);
>+    my @runtimes = grep {!/^\./} readdir(RUNTIMES);
>+    close(RUNTIMES);
>+    return File::Spec->catdir($runtimePath, @runtimes ? $runtimes[0] : "iOS.simruntime", "Contents", "Resources", "RuntimeRoot", "Applications");
> }
> 
> sub installedMobileSafariBundle()

Flags:

ap: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 193787: 360042