Skip to content

Commit b66bc17

Browse files
install DocC-Render in install-all mode when DocC is being built
1 parent 350c1ce commit b66bc17

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

utils/swift_build_support/swift_build_support/build_script_invocation.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -700,11 +700,17 @@ def compute_product_pipelines(self):
700700
is_enabled=self.args.tsan_libdispatch_test)
701701
builder.add_product(products.SwiftDocC,
702702
is_enabled=self.args.build_swiftdocc)
703-
builder.add_product(products.SwiftDocCRender,
704-
is_enabled=self.args.install_swiftdocc)
705703
builder.add_product(products.MinimalStdlib,
706704
is_enabled=self.args.build_minimalstdlib)
707705

706+
# Swift-DocC-Render should be installed whenever Swift-DocC is installed, which
707+
# can be either given directly or via install-all
708+
install_doccrender = self.args.install_swiftdocc or (
709+
self.args.install_all and self.args.build_swiftdocc
710+
)
711+
builder.add_product(products.SwiftDocCRender,
712+
is_enabled=install_doccrender)
713+
708714
# Keep SwiftDriver at last.
709715
# swift-driver's integration with the build scripts is not fully
710716
# supported. Using swift-driver to build these products may hit

utils/swift_build_support/swift_build_support/products/swiftdoccrender.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ def should_test(self, host_target):
4848

4949
def should_install(self, host_target):
5050
# Swift-DocC-Render should always be installed if Swift-DocC is being installed
51-
return self.args.install_swiftdocc
51+
return self.args.install_swiftdocc or (
52+
self.args.install_all and self.args.build_swiftdocc
53+
)
5254

5355
def install(self, host_target):
5456
# Swift-DocC-Render is installed at '/usr/share/docc/render' in the built

0 commit comments

Comments
 (0)