Changeset 231978 in webkit

Timestamp:

May 18, 2018 12:33:35 PM (6 years ago)

Author:

dbates@webkit.org

Message:

"debug-safari --ios-simulator" creates lldb target to launch Mac Safari
​https://bugs.webkit.org/show_bug.cgi?id=185774

Reviewed by Andy Estes.

For now, the script debug-safari is not supported for WebKit for iOS. To
fix this we differentiate between the Apple Mac port and Apple embedded
ports.

• Scripts/webkitdirs.pm:

(safariPath): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
(isAppleMacWebKit): Added.
(isAppleCocoaWebKit): Write in terms of isAppleMacWebKit() and isEmbeddedWebKit().
(launcherName): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
(mobileSafariBundle): Substitute isIOSWebKit() for isAppleCocoaWebKit().
(debugSafari): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
(runSafari): Ditto.
(runMiniBrowser): Ditto.
(debugMiniBrowser): Ditto.
(runWebKitTestRunner): Ditto.
(debugWebKitTestRunner): Ditto.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2018-05-18  Daniel Bates  <dabates@apple.com>
+
+        "debug-safari --ios-simulator" creates lldb target to launch Mac Safari
+        https://bugs.webkit.org/show_bug.cgi?id=185774
+
+        Reviewed by Andy Estes.
+
+        For now, the script debug-safari is not supported for WebKit for iOS. To
+        fix this we differentiate between the Apple Mac port and Apple embedded
+        ports.
+
+        * Scripts/webkitdirs.pm:
+        (safariPath): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
+        (isAppleMacWebKit): Added.
+        (isAppleCocoaWebKit): Write in terms of isAppleMacWebKit() and isEmbeddedWebKit().
+        (launcherName): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
+        (mobileSafariBundle): Substitute isIOSWebKit() for isAppleCocoaWebKit().
+        (debugSafari): Substitute isAppleMacWebKit() for isAppleCocoaWebKit().
+        (runSafari): Ditto.
+        (runMiniBrowser): Ditto.
+        (debugMiniBrowser): Ditto.
+        (runWebKitTestRunner): Ditto.
+        (debugWebKitTestRunner): Ditto.
+
 2018-05-18  Antoine Quint  <graouts@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -990 +990 @@
 sub safariPath
 {
-    die "Safari path is only relevant on Apple Mac platform\n" unless isAppleCocoaWebKit();
+    die "Safari path is only relevant on Apple Mac platform\n" unless isAppleMacWebKit();
 
     my $safariPath;
@@ -1374 +1374 @@
 }
 
+sub isIOSWebKit()
+{
+    return portName() eq iOS;
+}
+
+sub isTVOSWebKit()
+{
+    return portName() eq tvOS;
+}
+
+sub isWatchOSWebKit()
+{
+    return portName() eq watchOS;
+}
+
+sub isEmbeddedWebKit()
+{
+    return isIOSWebKit() || isTVOSWebKit() || isWatchOSWebKit();
+}
+
 sub isAppleWebKit()
 {
@@ -1379 +1399 @@
 }
 
+sub isAppleMacWebKit()
+{
+    return portName() eq Mac;
+}
+
 sub isAppleCocoaWebKit()
 {
-    return (portName() eq Mac) || isIOSWebKit() || isTVOSWebKit() || isWatchOSWebKit();
+    return isAppleMacWebKit() || isEmbeddedWebKit();
 }
 
@@ -1465 +1490 @@
 {
     return xcodeSDKPlatformName() eq "watchsimulator";
-}
-
-sub isIOSWebKit()
-{
-    return portName() eq iOS;
-}
-
-sub isTVOSWebKit()
-{
-    return portName() eq tvOS;
-}
-
-sub isWatchOSWebKit()
-{
-    return portName() eq watchOS;
-}
-
-sub isEmbeddedWebKit()
-{
-    return isIOSWebKit() || isTVOSWebKit() || isWatchOSWebKit();
 }
 
@@ -1648 +1653 @@
     if (isGtk()) {
         return "MiniBrowser";
-    } elsif (isAppleCocoaWebKit()) {
+    } elsif (isAppleMacWebKit()) {
         return "Safari";
     } elsif (isAppleWinWebKit()) {
@@ -2411 +2416 @@
 
     # Use MobileSafari.app in product directory if present.
-    if (isAppleCocoaWebKit() && -d "$configurationProductDir/MobileSafari.app") {
+    if (isIOSWebKit() && -d "$configurationProductDir/MobileSafari.app") {
         return "$configurationProductDir/MobileSafari.app";
     }
@@ -2724 +2729 @@
 sub debugSafari
 {
-    if (isAppleCocoaWebKit()) {
+    if (isAppleMacWebKit()) {
         checkFrameworks();
         execMacWebKitAppForDebugging(safariPath());
@@ -2738 +2743 @@
     }
 
-    if (isAppleCocoaWebKit()) {
+    if (isAppleMacWebKit()) {
         return runMacWebKitApp(safariPath());
     }
@@ -2753 +2758 @@
 sub runMiniBrowser
 {
-    if (isAppleCocoaWebKit()) {
+    if (isAppleMacWebKit()) {
         return runMacWebKitApp(File::Spec->catfile(productDir(), "MiniBrowser.app", "Contents", "MacOS", "MiniBrowser"));
-    } elsif (isAppleWinWebKit()) {
-        my $result;
+    }
+    if (isAppleWinWebKit()) {
         my $webKitLauncherPath = File::Spec->catfile(executableProductDir(), "MiniBrowser.exe");
         return system { $webKitLauncherPath } $webKitLauncherPath, @ARGV;
     }
-
     return 1;
 }
@@ -2766 +2770 @@
 sub debugMiniBrowser
 {
-    if (isAppleCocoaWebKit()) {
+    if (isAppleMacWebKit()) {
         execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "MiniBrowser.app", "Contents", "MacOS", "MiniBrowser"));
     }
@@ -2775 +2779 @@
 sub runWebKitTestRunner
 {
-    if (isAppleCocoaWebKit()) {
+    if (isAppleMacWebKit()) {
         return runMacWebKitApp(File::Spec->catfile(productDir(), "WebKitTestRunner"));
     }
@@ -2784 +2788 @@
 sub debugWebKitTestRunner
 {
-    if (isAppleCocoaWebKit()) {
+    if (isAppleMacWebKit()) {
         execMacWebKitAppForDebugging(File::Spec->catfile(productDir(), "WebKitTestRunner"));
     }