Build scripts should default to the Internal workspace using the internal SDK

[kmiller68]

29536a5

Build scripts should default to the Internal workspace using the internal SDK
https://bugs.webkit.org/show_bug.cgi?id=271245
rdar://125015308

Reviewed by Elliott Williams.

Right now in order to get WebKitAdditions when using these scripts you have to already have started a build
from Internal. This is annoying for clean builds or when WebKitBuild has a stale WebKitAdditions. This patch
changes the build scripts to default to the Internal workspace when building for a .internal SDK and the
regular workspace when building for a public SDK. If there's already a configured workspace then we just
use that.

* Tools/Scripts/webkitdirs.pm:
(determineConfiguredXcodeWorkspaceOrDefault):
(configuredXcodeWorkspace):
(XcodeOptions):
(determineConfiguredXcodeWorkspace): Deleted.
* Tools/Scripts/webkitperl/BuildSubproject.pm:
(buildUpToProject):

Canonical link: https://commits.webkit.org/276366@main

1c7399b

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-skia
🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
🛠 🧪 jsc-arm64	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim		✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 watch		✅ 🛠 jsc-armv7
	✅ 🛠 watch-sim		✅ 🧪 jsc-armv7-tests

[webkit-early-warning-system]

EWS run on previous version of this PR (hash b846ac7)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	🛠 wpe	⏳ 🛠 wincairo
🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	🧪 wpe-wk2
🧪 webkitperl	🧪 ios-wk2	🧪 api-mac	🧪 api-wpe
	🧪 ios-wk2-wpt	🧪 mac-wk1	✅ 🛠 wpe-skia
⏳ 🛠 🧪 jsc	🧪 api-ios	🧪 mac-wk2	🛠 gtk
⏳ 🛠 🧪 jsc-arm64	⏳ 🛠 tv	🧪 mac-AS-debug-wk2	🧪 gtk-wk2
	⏳ 🛠 tv-sim		🧪 api-gtk
	⏳ 🛠 watch		⏳ 🛠 jsc-armv7
	⏳ 🛠 watch-sim		⏳ 🧪 jsc-armv7-tests

[webkit-early-warning-system]

EWS run on current version of this PR (hash 1c7399b)

Details

Misc	iOS, tvOS & watchOS	macOS	Linux	Windows
✅ 🧪 style	✅ 🛠 ios	✅ 🛠 mac	✅ 🛠 wpe	✅ 🛠 wincairo
✅ 🧪 bindings	✅ 🛠 ios-sim	✅ 🛠 mac-AS-debug	✅ 🧪 wpe-wk2
✅ 🧪 webkitperl	✅ 🧪 ios-wk2	✅ 🧪 api-mac	✅ 🧪 api-wpe
	✅ 🧪 ios-wk2-wpt	✅ 🧪 mac-wk1	✅ 🛠 wpe-skia
🛠 🧪 jsc	✅ 🧪 api-ios	✅ 🧪 mac-wk2	✅ 🛠 gtk
🛠 🧪 jsc-arm64	✅ 🛠 tv	✅ 🧪 mac-AS-debug-wk2	✅ 🧪 gtk-wk2
	✅ 🛠 tv-sim		✅ 🧪 api-gtk
✅ 🛠 🧪 merge	✅ 🛠 watch		✅ 🛠 jsc-armv7
	✅ 🛠 watch-sim		✅ 🧪 jsc-armv7-tests

[kmiller68]

I tested build-jsc/build-webgpu/build-webkit and they all seem to work for clean internal builds with this patch and they pick the existing workspace when set via set-webkit-configuration --workspace=X

[emw-apple]

One thing to note is that this won't abort make unless we also change this logic to propagate the exit code from shell backticks:

WebKit/Makefile.shared

Lines 172 to 173 in 3d472e9

	eval build_webkit_options=(`perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()' -- $(BUILD_WEBKIT_BASE) $(BUILD_WEBKIT_OPTIONS)`); \
	xcodebuild $1 $(OTHER_OPTIONS) $(XCODE_TARGET) "$${build_webkit_options[@]}" $(XCODE_OPTIONS) $2 | $(OUTPUT_FILTER) && exit $${PIPESTATUS[0]} \

I don't think you need to do that now—if webkitdirs does die here, the error will be printed up front and the Xcode build should fail immediately, too.

[kmiller68]

Oh, interesting that make doesn't propagate non-zero exit status from sub-commands. As you said it's probably not a big deal.

[webkit-ews-buildbot]

Safe-Merge-Queue: Build #15423.

[webkit-commit-queue]

Committed 276366@main (29536a5): https://commits.webkit.org/276366@main

Reviewed commits have been landed. Closing PR #26123 and removing active labels.