Attachment 342060 Details for Bug 186352 – Patch

[patch] Patch

generalizedSDKs.patch (text/plain), 5.94 KB, created by Jonathan Bedard on 2018-06-06 10:39:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Bedard

Created: 2018-06-06 10:39:39 PDT

Size: 5.94 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 232546)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,18 @@
>+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/build-webkit:
>+        * Scripts/package-root:
>+        (usage):
>+        * 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/build-webkit
>===================================================================
>--- Tools/Scripts/build-webkit	(revision 232539)
>+++ Tools/Scripts/build-webkit	(working copy)
>@@ -99,9 +99,9 @@ Usage: $programName [options] [options t
>   --debug                           Compile with Debug configuration
>   --release                         Compile with Release configuration
>   --sdk=<sdk>                       Use a specific Xcode SDK (iOS and Mac only)
>-  --ios-device                      Use "iphoneos.internal" SDK if installed, else "iphoneos" SDK (iOS only)
>+  --ios-device                      Use "iphoneos.*" SDK if installed, else "iphoneos" SDK (iOS only)
>   --device                          DEPRECATED alias of --ios-device
>-  --ios-simulator                   Use the current iphonesimulator SDK (iOS only)
>+  --ios-simulator                   Use "iphonesimulator.*" SDK if installed, else "iphonesimulator" SDK (iOS only)
>   --simulator                       DEPRECATED alias of --ios-simulator
>   --coverage                        Enable code coverage support (Mac only)
>   --analyze                         Enable static anaylsis (iOS and Mac only)
>Index: Tools/Scripts/package-root
>===================================================================
>--- Tools/Scripts/package-root	(revision 232539)
>+++ Tools/Scripts/package-root	(working copy)
>@@ -47,9 +47,9 @@ sub usage()
>       --help                            Show this help message
>       --sdk                             Specifies SDK for which the roots are staged
>                                         (Default: currently installed Base SDK)
>-      --ios-device                      Equivalent to --sdk iphoneos.internal
>+      --ios-device                      Use "iphoneos.*" SDK if installed, else "iphoneos" SDK (iOS only)
>       --device                          DEPRECATED alias of --ios-device
>-      --ios-simulator                   Equivalent to --sdk iphonesimulator
>+      --ios-simulator                   Use "iphonesimulator.*" SDK if installed, else "iphonesimulator" SDK (iOS only)
>       --simulator                       DEPRECATED alias of --ios-simulator
>       --debug                           Package roots from Debug-<platform>
>       --release                         Package roots from Release-<platform>
>Index: Tools/Scripts/webkitdirs.pm
>===================================================================
>--- Tools/Scripts/webkitdirs.pm	(revision 232539)
>+++ Tools/Scripts/webkitdirs.pm	(working copy)
>@@ -61,6 +61,7 @@ BEGIN {
>        &appDisplayNameFromBundle
>        &appendToEnvironmentVariableList
>        &archCommandLineArgumentsForRestrictedEnvironmentVariables
>+       &availableXcodeSDKs
>        &baseProductDir
>        &chdirWebKit
>        &checkFrameworks
>@@ -503,34 +504,61 @@ sub extractNonMacOSHostConfiguration
>     return @args;
> }
> 
>+sub availableXcodeSDKS
>+{
>+    my @result = ();
>+    
>+    my @output = `xcodebuild -showsdks`;
>+    foreach my $line (@output) {
>+        if ($line =~ /-sdk (\D+)([\d\.]+)(\D*)\n/) {
>+            if ($3) {
>+                push @result, "$1.$3";
>+            } else {
>+                push @result, "$1";
>+            }
>+        }
>+    }
>+    return @result;
>+}
>+
> 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.
>+    my @availableSDKS = availableXcodeSDKS();
>+    
>+    foreach my $sdk (@availableSDKS) {
>+        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