Title: [291181] trunk
- Revision
- 291181
- Author
- [email protected]
- Date
- 2022-03-11 11:14:03 -0800 (Fri, 11 Mar 2022)
Log Message
Makefile.shared: Rename WORKSPACE to WORKSPACE_PATH and allow overrides
https://bugs.webkit.org/show_bug.cgi?id=237746
Reviewed by Alexey Proskuryakov.
This permits Make-based workflows which build out of a different workspace, e.g. a workspace
that includes WebKitAdditions.
WORKSPACE_PATH was chosen as a new name for parity with SCRIPTS_PATH and to avoid confusion
with USE_WORKSPACE.
Refactors Makefile.shared a bit to prevent SCHEME or WORKSPACE_PATH being set without
USE_WORKSPACE from breaking the build.
* Makefile.shared:
Modified Paths
Diff
Modified: trunk/ChangeLog (291180 => 291181)
--- trunk/ChangeLog 2022-03-11 19:08:58 UTC (rev 291180)
+++ trunk/ChangeLog 2022-03-11 19:14:03 UTC (rev 291181)
@@ -1,3 +1,21 @@
+2022-03-11 Elliott Williams <[email protected]>
+
+ Makefile.shared: Rename WORKSPACE to WORKSPACE_PATH and allow overrides
+ https://bugs.webkit.org/show_bug.cgi?id=237746
+
+ Reviewed by Alexey Proskuryakov.
+
+ This permits Make-based workflows which build out of a different workspace, e.g. a workspace
+ that includes WebKitAdditions.
+
+ WORKSPACE_PATH was chosen as a new name for parity with SCRIPTS_PATH and to avoid confusion
+ with USE_WORKSPACE.
+
+ Refactors Makefile.shared a bit to prevent SCHEME or WORKSPACE_PATH being set without
+ USE_WORKSPACE from breaking the build.
+
+ * Makefile.shared:
+
2022-03-08 Jonathan Bedard <[email protected]>
[git-webkit] Support multiple metadata locations
Modified: trunk/Makefile.shared (291180 => 291181)
--- trunk/Makefile.shared 2022-03-11 19:08:58 UTC (rev 291180)
+++ trunk/Makefile.shared 2022-03-11 19:14:03 UTC (rev 291181)
@@ -4,10 +4,10 @@
ifeq ($(USE_WORKSPACE),YES)
SCHEME ?= $(notdir $(CURDIR))
-XCODE_TARGET = -scheme "$(SCHEME)"
-WORKSPACE := $(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace
+WORKSPACE_PATH ?= $(dir $(lastword $(MAKEFILE_LIST)))WebKit.xcworkspace
+XCODE_TARGET = -workspace $(WORKSPACE_PATH) -scheme "$(SCHEME)"
else
-SCHEME =
+USE_WORKSPACE =
endif
ifneq (,$(SDKROOT))
@@ -117,9 +117,9 @@
( \
[[ -t 1 ]] && COLOR_DIAGNOSTICS_ARG="COLOR_DIAGNOSTICS=YES"; \
echo; \
- echo "===== BUILDING $(if $(WORKSPACE),$(SCHEME),$(notdir $(CURDIR))) ====="; \
+ echo "===== BUILDING $(if $(USE_WORKSPACE),$(SCHEME),$(notdir $(CURDIR))) ====="; \
echo; \
- $1 xcodebuild $2 $(WORKSPACE:%=-workspace %) $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $3 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
+ $1 xcodebuild $2 $(OTHER_OPTIONS) $(XCODE_TARGET) $(XCODE_OPTIONS) $3 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \
)
endef
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
