Title: [264480] trunk/Tools
Revision
264480
Author
[email protected]
Date
2020-07-16 14:54:11 -0700 (Thu, 16 Jul 2020)

Log Message

[configure-xcode-for-embedded-development] Support Xcode 12
https://bugs.webkit.org/show_bug.cgi?id=214420
<rdar://problem/65687153>

Reviewed by Alexey Proskuryakov.

* Scripts/configure-xcode-for-embedded-development: Mac xcspec files are in a different
spot in Xcode 12.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (264479 => 264480)


--- trunk/Tools/ChangeLog	2020-07-16 21:26:36 UTC (rev 264479)
+++ trunk/Tools/ChangeLog	2020-07-16 21:54:11 UTC (rev 264480)
@@ -1,3 +1,14 @@
+2020-07-16  Jonathan Bedard  <[email protected]>
+
+        [configure-xcode-for-embedded-development] Support Xcode 12
+        https://bugs.webkit.org/show_bug.cgi?id=214420
+        <rdar://problem/65687153>
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/configure-xcode-for-embedded-development: Mac xcspec files are in a different
+        spot in Xcode 12.
+
 2020-07-16  Eric Carlson  <[email protected]>
 
         Use AVRoutePickerView when available for choosing AirPlay devices

Modified: trunk/Tools/Scripts/configure-xcode-for-embedded-development (264479 => 264480)


--- trunk/Tools/Scripts/configure-xcode-for-embedded-development	2020-07-16 21:26:36 UTC (rev 264479)
+++ trunk/Tools/Scripts/configure-xcode-for-embedded-development	2020-07-16 21:54:11 UTC (rev 264480)
@@ -65,15 +65,21 @@
     ("VideoToolbox.framework", False),
 ]
 
+xcode_version = subprocess.run(['/usr/bin/xcodebuild', '-version'], capture_output=True, encoding='ascii').stdout.splitlines()[0].split(' ')[1]
+if int(xcode_version.split('.')[0]) >= 12:
+    mac_xcspec_location = 'Platforms/MacOSX.platform/Developer/Library/Xcode/PrivatePlugIns/IDEOSXSupportCore.ideplugin/Contents/Resources'
+else:
+    mac_xcspec_location = 'Platforms/MacOSX.platform/Developer/Library/Xcode/Specifications'
+
 XCSPEC_INFO = [
     {
         "id":       "com.apple.package-type.mach-o-executable",
-        "source":   "Platforms/MacOSX.platform/Developer/Library/Xcode/Specifications/MacOSX Package Types.xcspec",
+        "source":   f"{mac_xcspec_location}/MacOSX Package Types.xcspec",
         "dest":     "../PlugIns/IDEiOSSupportCore.ideplugin/Contents/Resources/Embedded-Shared.xcspec"
     },
     {
         "id":       "com.apple.product-type.tool",
-        "source":   "Platforms/MacOSX.platform/Developer/Library/Xcode/Specifications/MacOSX Product Types.xcspec",
+        "source":   f"{mac_xcspec_location}/MacOSX Product Types.xcspec",
         "dest":     "../PlugIns/IDEiOSSupportCore.ideplugin/Contents/Resources/Embedded-Shared.xcspec"
     },
 ]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to