Title: [240455] trunk/Tools
- Revision
- 240455
- Author
- [email protected]
- Date
- 2019-01-24 16:35:19 -0800 (Thu, 24 Jan 2019)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (240454 => 240455)
--- trunk/Tools/ChangeLog 2019-01-25 00:04:52 UTC (rev 240454)
+++ trunk/Tools/ChangeLog 2019-01-25 00:35:19 UTC (rev 240455)
@@ -1,3 +1,14 @@
+2019-01-24 Jonathan Bedard <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r240446.
Modified: trunk/Tools/Scripts/webkitdirs.pm (240454 => 240455)
--- trunk/Tools/Scripts/webkitdirs.pm 2019-01-25 00:04:52 UTC (rev 240454)
+++ trunk/Tools/Scripts/webkitdirs.pm 2019-01-25 00:35:19 UTC (rev 240455)
@@ -2504,8 +2504,13 @@
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;
}
sub installedMobileSafariBundle()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
