Skip to content

Commit cf5f886

Browse files
authored
Merge pull request #14123 from cwakamo/fix-build-script-playground-frameworks
- Remove support for building PlaygroundLogger on Linux (this never actually worked, so it doesn't make sense to keep maintaining something which doesn't work). - Merge the "playgroundsupport" and "playgroundlogger" products in build-script and update presets where necessary - Update how PlaygroundLogger and PlaygroundSupport are built, taking advantage of a new workspace and new schemes to do per-platform xcodebuild invocations (requires changes in swift-xcode-playground-support).
2 parents 8dad899 + 3a0eaea commit cf5f886

File tree

6 files changed

+60
-141
lines changed

6 files changed

+60
-141
lines changed

utils/build-presets.ini

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ llbuild
326326
swiftpm
327327

328328
# Build Playground support
329-
playgroundlogger
330329
playgroundsupport
331330

332331
dash-dash
@@ -768,7 +767,6 @@ skip-test-swiftpm
768767
skip-test-xctest
769768
skip-test-foundation
770769
skip-test-libdispatch
771-
skip-test-playgroundlogger
772770
skip-test-playgroundsupport
773771
skip-test-libicu
774772

@@ -945,7 +943,6 @@ watchos
945943
lldb
946944
llbuild
947945
swiftpm
948-
playgroundlogger
949946
playgroundsupport
950947

951948
# Build with debug info, this allows us to symbolicate crashes from
@@ -963,14 +960,12 @@ build-ninja
963960
build-swift-static-stdlib
964961
build-swift-static-sdk-overlay
965962
build-swift-stdlib-unittest-extra
966-
playgroundlogger-build-type=Release
967963
playgroundsupport-build-type=Release
968964

969965
install-swift
970966
install-lldb
971967
install-llbuild
972968
install-swiftpm
973-
install-playgroundlogger
974969
install-playgroundsupport
975970

976971
install-destdir=%(install_destdir)s
@@ -1060,7 +1055,6 @@ skip-test-swiftpm
10601055
skip-test-llbuild
10611056
skip-test-lldb
10621057
skip-test-cmark
1063-
skip-test-playgroundlogger
10641058
skip-test-playgroundsupport
10651059

10661060

@@ -1144,7 +1138,6 @@ llbuild
11441138
swiftpm
11451139

11461140
# Build Playground support
1147-
playgroundlogger
11481141
playgroundsupport
11491142

11501143
dash-dash

utils/build-script

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -595,8 +595,6 @@ class BuildScriptInvocation(object):
595595
impl_args += ["--skip-build-libicu"]
596596
if not args.build_swiftpm:
597597
impl_args += ["--skip-build-swiftpm"]
598-
if not args.build_playgroundlogger:
599-
impl_args += ["--skip-build-playgroundlogger"]
600598
if not args.build_playgroundsupport:
601599
impl_args += ["--skip-build-playgroundsupport"]
602600
if args.build_swift_dynamic_stdlib:
@@ -644,7 +642,6 @@ class BuildScriptInvocation(object):
644642
"--skip-test-foundation",
645643
"--skip-test-libdispatch",
646644
"--skip-test-libicu",
647-
"--skip-test-playgroundlogger",
648645
"--skip-test-playgroundsupport"]
649646
if not args.test_linux:
650647
impl_args += ["--skip-test-linux"]

0 commit comments

Comments
 (0)