Changeset 287944 in webkit

Timestamp:

Jan 12, 2022, 12:17:59 PM (4 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Alex Christensen <​achristensen@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:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Makefile (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-12  Alex Christensen  <achristensen@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.noble@apple.com>
 

trunk/Source/WebKit/Makefile

@@ +1 @@
+export XCODE_TARGET = -target WebKit -target WebKitSwift
 include ../Makefile.shared

trunk/Tools/ChangeLog

@@ +1 @@
+2022-01-12  Alex Christensen  <achristensen@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  <ggaren@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -351 +351 @@
         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);