Attachment 369309 Details for Bug 197668 – Patch

[patch] Patch

bug-197668-20190507120857.patch (text/plain), 5.19 KB, created by Keith Rollin on 2019-05-07 12:08:58 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Keith Rollin

Created: 2019-05-07 12:08:58 PDT

Size: 5.19 KB

patch

obsolete

>Subversion Revision: 245021
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 7ed590a54fd3104ac0bd6c28f8332f61e832f212..886a269799cde2dd9abddcf3f0fd95606d6ff984 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,22 @@
>+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 NOBODY (OOPS!).
>+
>+        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  Adrian Perez de Castro  <aperez@igalia.com>
> 
>         [Flatpak] webkit-build fails due to missing GTK2 in build environment
>diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
>index 659a867f815f82406800552d91ce0b1c8ae3c6db..e5a472e63334add131511c4293a71a4e58ef2cff 100755
>--- a/Tools/Scripts/build-webkit
>+++ b/Tools/Scripts/build-webkit
>@@ -73,6 +73,7 @@ my $coverageSupport = 0;
> my $shouldRunStaticAnalyzer = 0;
> my $noExperimentalFeatures = 0;
> my $ltoMode = "default";
>+my $xcbuild = -1;
> my $startTime = time();
> my $archs32bit = 0;
> my $skipLibraryUpdate = 0;
>@@ -115,6 +116,7 @@ Usage: $programName [options] [options to pass to build system]
>   --coverage                        Enable code coverage support (Mac only)
>   --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
>   --wpe                             Build the WPE port
>@@ -153,6 +155,7 @@ my %options = (
>     'analyze' => \$shouldRunStaticAnalyzer,
>     'no-experimental-features' => \$noExperimentalFeatures,
>     'lto-mode=s' => \$ltoMode,
>+    'xcbuild!' => \$xcbuild,
>     'skip-library-update' => \$skipLibraryUpdate,
>     'use-ccache!' => \$useCCache,
> );
>@@ -207,6 +210,18 @@ my @options = ();
> 
> if (isAppleCocoaWebKit()) {
>     push @options, XcodeOptions();
>+
>+    if ($xcbuild < 0) {
>+        $xcbuild = canUseXCBuild();
>+    }
>+
>+    if ($xcbuild > 0) {
>+        push @options, "-UseNewBuildSystem=YES";
>+        push @options, "USE_NEW_BUILD_SYSTEM=YES";
>+    } elsif ($xcbuild == 0) {
>+        push @options, "-UseNewBuildSystem=NO";
>+    }
>+
>     sub option($$)
>     {
>         my ($feature, $isEnabled) = @_;
>diff --git a/Tools/Scripts/webkitdirs.pm b/Tools/Scripts/webkitdirs.pm
>index b1168fe55bf4b023dc9dcf03691a0d6812abaf21..f0ff81d8269829635da0a9b2c993150f790c8b59 100755
>--- a/Tools/Scripts/webkitdirs.pm
>+++ b/Tools/Scripts/webkitdirs.pm
>@@ -849,7 +849,6 @@ sub XcodeOptions
>     determineXcodeSDK();
> 
>     my @options;
>-    push @options, "-UseNewBuildSystem=NO";
>     push @options, "-UseSanitizedBuildSystemEnvironment=YES";
>     push @options, "-ShowBuildOperationDuration=YES";
>     push @options, ("-configuration", $configuration);
>@@ -895,6 +894,11 @@ sub XcodeStaticAnalyzerOption()
>     return "RUN_CLANG_STATIC_ANALYZER=YES";
> }
> 
>+sub canUseXCBuild()
>+{
>+    return 0;
>+}
>+
> my $passedConfiguration;
> my $searchedForPassedConfiguration;
> sub determinePassedConfiguration
>diff --git a/ChangeLog b/ChangeLog
>index 034a201a8ebc801aa6f603cb7f4f19c4fedc8d1a..be287a01c8ba1e10cd58ac27598e6cb2d6cf74c0 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,19 @@
>+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 NOBODY (OOPS!).
>+
>+        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>
> 
>         [CMake] fuse-ld should also be set in module linker flags
>diff --git a/Makefile.shared b/Makefile.shared
>index a18547be8a655589ab48f6bd913ee173626443f5..85f0cb7acc4a08aadf662757b140c7b21f09a154 100644
>--- a/Makefile.shared
>+++ b/Makefile.shared
>@@ -44,6 +44,16 @@ ifeq (, $(findstring WK_USE_CCACHE, $(ARGS)))
> 	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
>+
> DEFAULT_VERBOSITY := $(shell defaults read org.webkit.BuildConfiguration BuildTranscriptVerbosity 2>/dev/null || echo "default")
> VERBOSITY ?= $(DEFAULT_VERBOSITY)
>

Actions: View | Formatted Diff | Diff

Attachments on bug 197668: 369309 | 369318