Attachment 342051 Details for Bug 186352 – Patch

[patch] Patch

bug-186352-20180606092644.patch (text/plain), 3.55 KB, created by Jonathan Bedard on 2018-06-06 09:26:45 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-06-06 09:26:45 PDT

Size: 3.55 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 232543)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-06-06  Jonathan Bedard  <jbedard@apple.com>
>+
>+        webkitperl: Support more diverse Xcode sdk types
>+        https://bugs.webkit.org/show_bug.cgi?id=186352
>+        <rdar://problem/40853947>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitdirs.pm:
>+        (availableXcodeSDKS): Generate a list of all available Xcode SDKs on this machine.
>+        (determineXcodeSDK): Always prefer a more specific embedded SDK if one is available.
>+
> 2018-06-05  Chris Dumez  <cdumez@apple.com>
> 
>         Regression(r232082): Websites get loaded inside of Messages App chat transcript
>Index: Tools/Scripts/webkitdirs.pm
>===================================================================
>--- Tools/Scripts/webkitdirs.pm	(revision 232539)
>+++ Tools/Scripts/webkitdirs.pm	(working copy)
>@@ -132,6 +132,7 @@ my $maxCPULoad;
> my $baseProductDir;
> my @baseProductDirOption;
> my $configuration;
>+my @availableXcodeSDKs;
> my $xcodeSDK;
> my $configurationForVisualStudio;
> my $configurationProductDir;
>@@ -503,34 +504,61 @@ sub extractNonMacOSHostConfiguration
>     return @args;
> }
> 
>+sub availableXcodeSDKS
>+{
>+    return if @availableXcodeSDKs;
>+    @availableXcodeSDKs = ();
>+    
>+    my @output = `xcodebuild -showsdks`;
>+    foreach my $line (@output) {
>+        if ($line =~ /-sdk (\D+)([\d\.]+)(\D*)\n/) {
>+            if ($3) {
>+                push @availableXcodeSDKs, "$1.$3";
>+            } else {
>+                push @availableXcodeSDKs, "$1";
>+            }
>+        }
>+    }
>+}
>+
> sub determineXcodeSDK
> {
>     return if defined $xcodeSDK;
>     my $sdk;
>+    
>+    # The user explicitly specified the sdk, don't assume anything
>     if (checkForArgumentAndRemoveFromARGVGettingValue("--sdk", \$sdk)) {
>         $xcodeSDK = $sdk;
>+        return;
>     }
>     if (checkForArgumentAndRemoveFromARGV("--device") || checkForArgumentAndRemoveFromARGV("--ios-device")) {
>-        my $hasInternalSDK = exitStatus(system("xcrun --sdk iphoneos.internal --show-sdk-version > /dev/null 2>&1")) == 0;
>-        $xcodeSDK ||= $hasInternalSDK ? "iphoneos.internal" : "iphoneos";
>+        $xcodeSDK ||= "iphoneos";
>     }
>     if (checkForArgumentAndRemoveFromARGV("--simulator") || checkForArgumentAndRemoveFromARGV("--ios-simulator")) {
>         $xcodeSDK ||= 'iphonesimulator';
>     }
>     if (checkForArgumentAndRemoveFromARGV("--tvos-device")) {
>-        my $hasInternalSDK = exitStatus(system("xcrun --sdk appletvos.internal --show-sdk-version > /dev/null 2>&1")) == 0;
>-        $xcodeSDK ||=  $hasInternalSDK ? "appletvos.internal" : "appletvos";
>+        $xcodeSDK ||=  "appletvos";
>     }
>     if (checkForArgumentAndRemoveFromARGV("--tvos-simulator")) {
>         $xcodeSDK ||= "appletvsimulator";
>     }
>     if (checkForArgumentAndRemoveFromARGV("--watchos-device")) {
>-        my $hasInternalSDK = exitStatus(system("xcrun --sdk watchos.internal --show-sdk-version > /dev/null 2>&1")) == 0;
>-        $xcodeSDK ||=  $hasInternalSDK ? "watchos.internal" : "watchos";
>+        $xcodeSDK ||=  "watchos";
>     }
>     if (checkForArgumentAndRemoveFromARGV("--watchos-simulator")) {
>         $xcodeSDK ||= "watchsimulator";
>     }
>+    
>+    # Prefer the more specific version of an sdk, if it exists.
>+    availableXcodeSDKS();
>+    
>+    foreach my $sdk (@availableXcodeSDKs) {
>+        next if $sdk eq $xcodeSDK;
>+        next if (index($sdk, "$xcodeSDK.") == -1);
>+        $xcodeSDK = $sdk;
>+        last;
>+    }
> }
> 
> sub xcodeSDK

Actions: View | Formatted Diff | Diff

Attachments on bug 186352: 342051 | 342060 | 342069 | 342096 | 342171