Title: [290400] trunk
- Revision
- 290400
- Author
- [email protected]
- Date
- 2022-02-23 16:47:08 -0800 (Wed, 23 Feb 2022)
Log Message
[XCBuild] Don't automatically use the ../Internal/WebKit workspace
https://bugs.webkit.org/show_bug.cgi?id=237115
Reviewed by Alexey Proskuryakov.
When the USE_WORKSPACE=YES Make flag was added in https://commits.webkit.org/246232@main, we
configured Make to automatically use the workspace at ../Internal/WebKit/WebKit.xcworkspace,
if it was available. The idea was to make it easier for workspace builds to automatically
detect dependencies needed by folks at Apple, like WebKitAdditions.
In practice, this has made workspace builds silently rely on code from outside of the WebKit
repo, and it's unintuitive since non-workspace Make builds do not do this.
* Makefile.shared:
Modified Paths
Diff
Modified: trunk/ChangeLog (290399 => 290400)
--- trunk/ChangeLog 2022-02-24 00:39:27 UTC (rev 290399)
+++ trunk/ChangeLog 2022-02-24 00:47:08 UTC (rev 290400)
@@ -1,3 +1,20 @@
+2022-02-23 Elliott Williams <[email protected]>
+
+ [XCBuild] Don't automatically use the ../Internal/WebKit workspace
+ https://bugs.webkit.org/show_bug.cgi?id=237115
+
+ Reviewed by Alexey Proskuryakov.
+
+ When the USE_WORKSPACE=YES Make flag was added in https://commits.webkit.org/246232@main, we
+ configured Make to automatically use the workspace at ../Internal/WebKit/WebKit.xcworkspace,
+ if it was available. The idea was to make it easier for workspace builds to automatically
+ detect dependencies needed by folks at Apple, like WebKitAdditions.
+
+ In practice, this has made workspace builds silently rely on code from outside of the WebKit
+ repo, and it's unintuitive since non-workspace Make builds do not do this.
+
+ * Makefile.shared:
+
2022-02-23 W.D. Xiong <[email protected]>
Add wdx's Github username to contributors.json
Modified: trunk/Makefile.shared (290399 => 290400)
--- trunk/Makefile.shared 2022-02-24 00:39:27 UTC (rev 290399)
+++ trunk/Makefile.shared 2022-02-24 00:47:08 UTC (rev 290400)
@@ -5,10 +5,7 @@
ifeq ($(USE_WORKSPACE),YES)
SCHEME ?= $(notdir $(CURDIR))
XCODE_TARGET = -scheme "$(SCHEME)"
-WORKSPACE := $(firstword $(wildcard \
- $(dir $(lastword $(MAKEFILE_LIST)))../Internal/WebKit/WebKit.xcworkspace \
- $(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace \
- ))
+WORKSPACE := $(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace
else
SCHEME =
endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
