Skip to content

[4.1] [build-script] Fix how the playground frameworks build in build-script. #14817

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 26, 2018
Merged

[4.1] [build-script] Fix how the playground frameworks build in build-script. #14817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fff99b
[build-script] Removed the always-broken support for building Playgro…
cwakamo Jan 18, 2018
a4f77de
[build-script] Merged the PlaygroundLogger and PlaygroundSupport prod…
cwakamo Jan 18, 2018
0ef3f2c
[build-script] Adjust how PlaygroundLogger and PlaygroundSupport are …
cwakamo Jan 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions utils/build-presets.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,6 @@ llbuild
swiftpm

# Build Playground support
playgroundlogger
playgroundsupport

dash-dash
Expand Down Expand Up @@ -768,7 +767,6 @@ skip-test-swiftpm
skip-test-xctest
skip-test-foundation
skip-test-libdispatch
skip-test-playgroundlogger
skip-test-playgroundsupport
skip-test-libicu

Expand Down Expand Up @@ -945,7 +943,6 @@ watchos
lldb
llbuild
swiftpm
playgroundlogger
playgroundsupport

# Build with debug info, this allows us to symbolicate crashes from
Expand All @@ -963,14 +960,12 @@ build-ninja
build-swift-static-stdlib
build-swift-static-sdk-overlay
build-swift-stdlib-unittest-extra
playgroundlogger-build-type=Release
playgroundsupport-build-type=Release

install-swift
install-lldb
install-llbuild
install-swiftpm
install-playgroundlogger
install-playgroundsupport

install-destdir=%(install_destdir)s
Expand Down Expand Up @@ -1060,7 +1055,6 @@ skip-test-swiftpm
skip-test-llbuild
skip-test-lldb
skip-test-cmark
skip-test-playgroundlogger
skip-test-playgroundsupport


Expand Down Expand Up @@ -1144,7 +1138,6 @@ llbuild
swiftpm

# Build Playground support
playgroundlogger
playgroundsupport

dash-dash
Expand Down
3 changes: 0 additions & 3 deletions utils/build-script
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,6 @@ class BuildScriptInvocation(object):
impl_args += ["--skip-build-libicu"]
if not args.build_swiftpm:
impl_args += ["--skip-build-swiftpm"]
if not args.build_playgroundlogger:
impl_args += ["--skip-build-playgroundlogger"]
if not args.build_playgroundsupport:
impl_args += ["--skip-build-playgroundsupport"]
if args.build_swift_dynamic_stdlib:
Expand Down Expand Up @@ -638,7 +636,6 @@ class BuildScriptInvocation(object):
"--skip-test-foundation",
"--skip-test-libdispatch",
"--skip-test-libicu",
"--skip-test-playgroundlogger",
"--skip-test-playgroundsupport"]
if not args.test_linux:
impl_args += ["--skip-test-linux"]
Expand Down
Loading