Title: [287944] trunk
Revision
287944
Author
commit-qu...@webkit.org
Date
2022-01-12 12:17:59 -0800 (Wed, 12 Jan 2022)

Log Message

Build WebKitSwift when building with make or build-webkit
https://bugs.webkit.org/show_bug.cgi?id=235093

Patch by Alex Christensen <achristen...@webkit.org> on 2022-01-12
Reviewed by Alexey Proskuryakov.

Source/WebKit:

For various internal reasons, we have to have no depency between the two,
but we command line builders want to build and test it just like everyone else.

* Makefile:

Tools:

* Scripts/build-webkit:

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (287943 => 287944)


--- trunk/Source/WebKit/ChangeLog	2022-01-12 20:06:30 UTC (rev 287943)
+++ trunk/Source/WebKit/ChangeLog	2022-01-12 20:17:59 UTC (rev 287944)
@@ -1,3 +1,15 @@
+2022-01-12  Alex Christensen  <achristen...@webkit.org>
+
+        Build WebKitSwift when building with make or build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=235093
+
+        Reviewed by Alexey Proskuryakov.
+
+        For various internal reasons, we have to have no depency between the two,
+        but we command line builders want to build and test it just like everyone else.
+
+        * Makefile:
+
 2022-01-12  Jer Noble  <jer.no...@apple.com>
 
         [iOS] Page loading hangs for ~10s on WebProcess launch

Modified: trunk/Source/WebKit/Makefile (287943 => 287944)


--- trunk/Source/WebKit/Makefile	2022-01-12 20:06:30 UTC (rev 287943)
+++ trunk/Source/WebKit/Makefile	2022-01-12 20:17:59 UTC (rev 287944)
@@ -1 +1,2 @@
+export XCODE_TARGET = -target WebKit -target WebKitSwift
 include ../Makefile.shared

Modified: trunk/Tools/ChangeLog (287943 => 287944)


--- trunk/Tools/ChangeLog	2022-01-12 20:06:30 UTC (rev 287943)
+++ trunk/Tools/ChangeLog	2022-01-12 20:17:59 UTC (rev 287944)
@@ -1,3 +1,12 @@
+2022-01-12  Alex Christensen  <achristen...@webkit.org>
+
+        Build WebKitSwift when building with make or build-webkit
+        https://bugs.webkit.org/show_bug.cgi?id=235093
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/build-webkit:
+
 2022-01-11  Geoffrey Garen  <gga...@apple.com>
 
         WebPageProxy destruction should not launch a network process

Modified: trunk/Tools/Scripts/build-webkit (287943 => 287944)


--- trunk/Tools/Scripts/build-webkit	2022-01-12 20:06:30 UTC (rev 287943)
+++ trunk/Tools/Scripts/build-webkit	2022-01-12 20:17:59 UTC (rev 287944)
@@ -350,6 +350,12 @@
         push @local_options, XcodeCoverageSupportOptions() if $coverageSupport;
         push @local_options, XcodeStaticAnalyzerOption() if $shouldRunStaticAnalyzer;
         push @local_options, "WK_LTO_MODE=$ltoMode" if ($ltoMode ne "default");
+
+        # FIXME: Move WebKitSwift to its own directory and remove this hack.
+        if ($dir eq "Source/WebKit") {
+            push @local_options, "-target", "WebKit", "-target", "WebKitSwift"
+        }
+
         my $projectPath = $project =~ /gtest/ ? "xcode/gtest" : $project;
         $result = buildXCodeProject($projectPath, $clean, @local_options, @ARGV);
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to