Title: [248317] trunk/Tools
Revision
248317
Author
krol...@apple.com
Date
2019-08-06 14:57:52 -0700 (Tue, 06 Aug 2019)

Log Message

Enable XCBuild for `make` and `build-webkit` builds
https://bugs.webkit.org/show_bug.cgi?id=200476
<rdar://problem/50771065>

Reviewed by Jonathan Bedard.

All projects have now been tested under XCBuild and successfully
build. Enable the use of XCBuild when performing builds with `make` or
`build-webkit` and when using a sufficient version of Xcode. We set
this version to Xcode 11 since Xcode 10 -- even though it supports
XCBuild -- does not support a build facility needed to build WebKit
(Bug 197072, Bug 197116, Bug 197340).

Do not enable XCBuild in the Xcode projects themselves since these
projects may need to be used under older versions of Xcode and there's
no way to make those project changes sensitive to the version of Xcode
being used. This means that builds performed in the Xcode IDE will not
use XCBuild.

* Scripts/webkitdirs.pm:
(canUseXCBuild):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (248316 => 248317)


--- trunk/Tools/ChangeLog	2019-08-06 21:45:32 UTC (rev 248316)
+++ trunk/Tools/ChangeLog	2019-08-06 21:57:52 UTC (rev 248317)
@@ -1,3 +1,27 @@
+2019-08-06  Keith Rollin  <krol...@apple.com>
+
+        Enable XCBuild for `make` and `build-webkit` builds
+        https://bugs.webkit.org/show_bug.cgi?id=200476
+        <rdar://problem/50771065>
+
+        Reviewed by Jonathan Bedard.
+
+        All projects have now been tested under XCBuild and successfully
+        build. Enable the use of XCBuild when performing builds with `make` or
+        `build-webkit` and when using a sufficient version of Xcode. We set
+        this version to Xcode 11 since Xcode 10 -- even though it supports
+        XCBuild -- does not support a build facility needed to build WebKit
+        (Bug 197072, Bug 197116, Bug 197340).
+
+        Do not enable XCBuild in the Xcode projects themselves since these
+        projects may need to be used under older versions of Xcode and there's
+        no way to make those project changes sensitive to the version of Xcode
+        being used. This means that builds performed in the Xcode IDE will not
+        use XCBuild.
+
+        * Scripts/webkitdirs.pm:
+        (canUseXCBuild):
+
 2019-08-06  Chris Dumez  <cdu...@apple.com>
 
         Fix inefficiency in HTTPHeaderMap::set(CFStringRef, const String&)

Modified: trunk/Tools/Scripts/webkitdirs.pm (248316 => 248317)


--- trunk/Tools/Scripts/webkitdirs.pm	2019-08-06 21:45:32 UTC (rev 248316)
+++ trunk/Tools/Scripts/webkitdirs.pm	2019-08-06 21:57:52 UTC (rev 248317)
@@ -903,6 +903,10 @@
 
 sub canUseXCBuild()
 {
+    if (`xcodebuild -version | grep "Build version"` =~ /Build version (\d+)([a-zA-Z])(\d+)([a-zA-Z]?)/) {
+        return $1 >= 11;
+    }
+
     return 0;
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to