Changeset 245037 in webkit

Timestamp:

May 7, 2019 2:38:27 PM (5 years ago)

Author:

Keith Rollin

Message:

Add option to build-webkit to control whether or not XCBuild is used
​https://bugs.webkit.org/show_bug.cgi?id=197668
<rdar://problem/50549728>

Reviewed by Tim Horton.

Add --[no-]xcbuild to build-webkit to force the use of XCBuild or not.
Also update build-webkit and the makefiles with the foundation for
automatically using XCBuild when the conditions allow it. This latter
facility is currently turned off until Xcode fully supports building
WebKit with XCBuild.

.:

• Makefile.shared:

Tools:

• Scripts/build-webkit:
• Scripts/webkitdirs.pm:

(XcodeOptions):
(canUseXCBuild):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Makefile.shared (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (4 diffs)
• Tools/Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2019-05-07  Keith Rollin  <krollin@apple.com>
+
+        Add option to build-webkit to control whether or not XCBuild is used
+        https://bugs.webkit.org/show_bug.cgi?id=197668
+        <rdar://problem/50549728>
+
+        Reviewed by Tim Horton.
+
+        Add --[no-]xcbuild to build-webkit to force the use of XCBuild or not.
+        Also update build-webkit and the makefiles with the foundation for
+        automatically using XCBuild when the conditions allow it. This latter
+        facility is currently turned off until Xcode fully supports building
+        WebKit with XCBuild.
+
+        * Makefile.shared:
+
 2019-05-06  Christopher Reid  <chris.reid@sony.com>
 

trunk/Makefile.shared

@@ -42 +42 @@
         ifneq (, $(shell which ccache))
                 XCODE_OPTIONS += WK_USE_CCACHE=YES
+        endif
+endif
+
+ifeq ($(findstring UseNewBuildSystem,$(ARGS)),)
+        CAN_USE_XCBUILD = $(shell perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print canUseXCBuild()')
+        ifeq ($(CAN_USE_XCBUILD),1)
+                XCODE_OPTIONS += -UseNewBuildSystem=YES
+                XCODE_OPTIONS += USE_NEW_BUILD_SYSTEM=YES
+        else
+                XCODE_OPTIONS += -UseNewBuildSystem=NO
         endif
 endif

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-07  Keith Rollin  <krollin@apple.com>
+
+        Add option to build-webkit to control whether or not XCBuild is used
+        https://bugs.webkit.org/show_bug.cgi?id=197668
+        <rdar://problem/50549728>
+
+        Reviewed by Tim Horton.
+
+        Add --[no-]xcbuild to build-webkit to force the use of XCBuild or not.
+        Also update build-webkit and the makefiles with the foundation for
+        automatically using XCBuild when the conditions allow it. This latter
+        facility is currently turned off until Xcode fully supports building
+        WebKit with XCBuild.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (XcodeOptions):
+        (canUseXCBuild):
+
 2019-05-07  Andy Estes  <aestes@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -74 +74 @@
 my $noExperimentalFeatures = 0;
 my $ltoMode = "default";
+my $xcbuild = undef;
 my $startTime = time();
 my $archs32bit = 0;
@@ -116 +117 @@
   --analyze                         Enable static anaylsis (iOS and Mac only)
   --lto-mode=<mode>                 Set Link Time Optimization mode (full, thin, or none) (LLVM only)
+  --[no-]xcbuild                    Force the use of XCBuild or not
 
   --gtk                             Build the GTK+ port
@@ -154 +156 @@
     'no-experimental-features' => \$noExperimentalFeatures,
     'lto-mode=s' => \$ltoMode,
+    'xcbuild!' => \$xcbuild,
     'skip-library-update' => \$skipLibraryUpdate,
     'use-ccache!' => \$useCCache,
@@ -208 +211 @@
 if (isAppleCocoaWebKit()) {
     push @options, XcodeOptions();
+
+    if (not defined $xcbuild) {
+        $xcbuild = canUseXCBuild();
+    }
+
+    if ($xcbuild) {
+        push @options, "-UseNewBuildSystem=YES";
+        push @options, "USE_NEW_BUILD_SYSTEM=YES";
+    } else {
+        push @options, "-UseNewBuildSystem=NO";
+    }
+
     sub option($$)
     {

trunk/Tools/Scripts/webkitdirs.pm

@@ -850 +850 @@
 
     my @options;
-    push @options, "-UseNewBuildSystem=NO";
     push @options, "-UseSanitizedBuildSystemEnvironment=YES";
     push @options, "-ShowBuildOperationDuration=YES";
@@ -894 +893 @@
 {
     return "RUN_CLANG_STATIC_ANALYZER=YES";
+}
+
+sub canUseXCBuild()
+{
+    return 0;
 }