Changeset 261397 in webkit

Timestamp:

May 8, 2020 10:56:48 AM (4 years ago)

Author:

dino@apple.com

Message:

Allow run-safari to launch an iPad simulator
​https://bugs.webkit.org/show_bug.cgi?id=211606
<rdar://problem/63002849>

Reviewed by Jon Lee.

Add an "--ipad-simulator" command line option to run-safari.

• Scripts/webkitdirs.pm:

(argumentsForConfiguration):
(determineXcodeSDK): Mark the device idiom depending on the command line argument.
(printHelpAndExitForRunAndDebugWebKitAppIfNeeded):
(findOrCreateSimulatorForIOSDevice): Create an iPad Pro simulator if requested.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2020-05-08  Dean Jackson  <dino@apple.com>
+
+        Allow run-safari to launch an iPad simulator
+        https://bugs.webkit.org/show_bug.cgi?id=211606
+        <rdar://problem/63002849>
+
+        Reviewed by Jon Lee.
+
+        Add an "--ipad-simulator" command line option to run-safari.
+
+        * Scripts/webkitdirs.pm:
+        (argumentsForConfiguration):
+        (determineXcodeSDK): Mark the device idiom depending on the command line argument.
+        (printHelpAndExitForRunAndDebugWebKitAppIfNeeded):
+        (findOrCreateSimulatorForIOSDevice): Create an iPad Pro simulator if requested.
+
 2020-05-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -139 +139 @@
 my $configuration;
 my $xcodeSDK;
+my $simulatorIdiom;
 my $configurationForVisualStudio;
 my $configurationProductDir;
@@ -515 +516 @@
     push(@args, '--release') if ($configuration =~ "^Release");
     push(@args, '--ios-device') if (defined $xcodeSDK && $xcodeSDK =~ /^iphoneos/);
-    push(@args, '--ios-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/);
+    push(@args, '--ios-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/ && $simulatorIdiom eq "iPhone");
+    push(@args, '--ipad-simulator') if (defined $xcodeSDK && $xcodeSDK =~ /^iphonesimulator/ && $simulatorIdiom eq "iPad");
     push(@args, '--maccatalyst') if (defined $xcodeSDK && $xcodeSDK =~ /^maccatalyst/);
     push(@args, '--32-bit') if ($architecture eq "x86" and !isWin64());
@@ -590 +592 @@
     if (checkForArgumentAndRemoveFromARGV("--simulator") || checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
         $xcodeSDK ||= 'iphonesimulator';
+        $simulatorIdiom = 'iPhone';
+    }
+    if (checkForArgumentAndRemoveFromARGV("--ipad-simulator")) {
+        $xcodeSDK ||= 'iphonesimulator';
+        $simulatorIdiom = 'iPad';
     }
     if (checkForArgumentAndRemoveFromARGV("--tvos-device")) {
@@ -2576 +2583 @@
                                     This accepts a language name (German) or a language code (de, ar, pt_BR, etc).
   --locale=LOCALE                   Use a specific locale instead of the system region.
+
+Options specific to iOS:
+  --iphone-simulator                Run the app in an iPhone Simulator
+  --ipad-simulator                  Run the app in an iPad Simulator
 EOF
 
@@ -2785 +2796 @@
     my $simulatorName;
     my $simulatorDeviceType;
-    $simulatorName = "iPhone SE " . $simulatorNameSuffix;
-    $simulatorDeviceType = "com.apple.CoreSimulator.SimDeviceType.iPhone-SE";
+
+    if ($simulatorIdiom eq "iPad") {
+        $simulatorName = "iPad Pro " . $simulatorNameSuffix;
+        $simulatorDeviceType = "com.apple.CoreSimulator.SimDeviceType.iPad-Pro--9-7-inch-";
+    } else {
+        $simulatorName = "iPhone SE " . $simulatorNameSuffix;
+        $simulatorDeviceType = "com.apple.CoreSimulator.SimDeviceType.iPhone-SE";
+    }
 
     my $simulatedDevice = iosSimulatorDeviceByName($simulatorName);