Title: [288742] trunk
- Revision
- 288742
- Author
- [email protected]
- Date
- 2022-01-28 09:16:45 -0800 (Fri, 28 Jan 2022)
Log Message
[XCBuild] Small corrections to build-webkit and Makefile for workspace builds
https://bugs.webkit.org/show_bug.cgi?id=235747
Patch by Elliott Williams <[email protected]> on 2022-01-28
Reviewed by Alexey Proskuryakov.
.:
* Makefile: Set SCRIPTS_PATH correctly from the root of the repo
Tools:
* Scripts/build-webkit: When --use-workspace is passed, assume --xcbuild
Modified Paths
Diff
Modified: trunk/ChangeLog (288741 => 288742)
--- trunk/ChangeLog 2022-01-28 16:09:03 UTC (rev 288741)
+++ trunk/ChangeLog 2022-01-28 17:16:45 UTC (rev 288742)
@@ -1,3 +1,12 @@
+2022-01-28 Elliott Williams <[email protected]>
+
+ [XCBuild] Small corrections to build-webkit and Makefile for workspace builds
+ https://bugs.webkit.org/show_bug.cgi?id=235747
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Makefile: Set SCRIPTS_PATH correctly from the root of the repo
+
2022-01-28 Pablo Saavedra <[email protected]>
[WPE] Build error with ACCESSIBILITY=OFF after r288731
Modified: trunk/Makefile (288741 => 288742)
--- trunk/Makefile 2022-01-28 16:09:03 UTC (rev 288741)
+++ trunk/Makefile 2022-01-28 17:16:45 UTC (rev 288742)
@@ -1,7 +1,8 @@
ifeq ($(USE_WORKSPACE),YES)
+SCHEME = All Modules
+SCRIPTS_PATH = Tools/Scripts
include Makefile.shared
-SCHEME = All Modules
else
Modified: trunk/Tools/ChangeLog (288741 => 288742)
--- trunk/Tools/ChangeLog 2022-01-28 16:09:03 UTC (rev 288741)
+++ trunk/Tools/ChangeLog 2022-01-28 17:16:45 UTC (rev 288742)
@@ -1,3 +1,12 @@
+2022-01-28 Elliott Williams <[email protected]>
+
+ [XCBuild] Small corrections to build-webkit and Makefile for workspace builds
+ https://bugs.webkit.org/show_bug.cgi?id=235747
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/build-webkit: When --use-workspace is passed, assume --xcbuild
+
2022-01-27 Jonathan Bedard <[email protected]>
[EWS] Only make a single request to GitHub when validating PR
Modified: trunk/Tools/Scripts/build-webkit (288741 => 288742)
--- trunk/Tools/Scripts/build-webkit 2022-01-28 16:09:03 UTC (rev 288741)
+++ trunk/Tools/Scripts/build-webkit 2022-01-28 17:16:45 UTC (rev 288742)
@@ -230,7 +230,7 @@
push @options, "-UseNewBuildSystem=YES";
} elsif (!$useWorkspace) {
push @options, "-UseNewBuildSystem=NO";
- } else {
+ } elsif (defined $xcbuild) {
die "Error: --use-workspace and --no-xcbuild are not compatible. Workspaces builds require XCBuild.\n";
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
