Revert "Merge pull request #39723 from d-ronnqvist/add-docc-in-build-script"

utils/build-presets.ini

@@ -818,7 +818,6 @@ install-libicu
 install-prefix=/usr
 install-libcxx
 install-sourcekit-lsp
-install-swiftdocc
 build-swift-static-stdlib
 build-swift-static-sdk-overlay
 build-swift-stdlib-unittest-extra
@@ -858,7 +857,6 @@ foundation
 libdispatch
 indexstore-db
 sourcekit-lsp
-swiftdocc
 lit-args=-v --time-tests
 
 # rdar://problem/31454823
@@ -882,7 +880,6 @@ skip-test-playgroundsupport
 skip-test-libicu
 skip-test-indexstore-db
 skip-test-sourcekit-lsp
-skip-test-swiftdocc
 
 # Linux package with out test
 [preset: buildbot_linux,no_test]
@@ -1227,7 +1224,6 @@ playgroundsupport
 libcxx
 indexstore-db
 sourcekit-lsp
-swiftdocc
 
 # Build concurrency back-deployment binaries
 back-deploy-concurrency
@@ -1277,7 +1273,6 @@ install-playgroundsupport
 install-libcxx
 install-sourcekit-lsp
 install-back-deploy-concurrency
-install-swiftdocc
 
 install-destdir=%(install_destdir)s
 
@@ -1385,7 +1380,6 @@ skip-test-playgroundsupport
 skip-test-swiftsyntax
 skip-test-skstresstester
 skip-test-swiftevolve
-skip-test-swiftdocc
 
 [preset: buildbot_osx_package,no_assertions,no_test,use_os_runtime]
 mixin-preset=
@@ -1420,7 +1414,6 @@ skip-test-playgroundsupport
 skip-test-swiftsyntax
 skip-test-skstresstester
 skip-test-swiftevolve
-skip-test-swiftdocc
 
 # macOS package with out test
 [preset: buildbot_osx_package,no_test]
@@ -1565,7 +1558,6 @@ swiftpm
 # swift-inspect
 swift-driver
 swiftsyntax
-swiftdocc
 
 # Don't generate the SwiftSyntax gyb files. Instead verify that up-to-date ones
 # are checked in.
@@ -1580,7 +1572,6 @@ install-llbuild
 install-swiftpm
 install-swift-driver
 install-libcxx
-install-swiftdocc
 
 # Build the stress tester and SwiftEvolve
 skstresstester

utils/build_swift/build_swift/driver_arguments.py

@@ -193,7 +193,6 @@ def _apply_default_arguments(args):
         args.test_swiftformat = False
         args.test_swiftevolve = False
         args.test_toolchainbenchmarks = False
-        args.test_swiftdocc = False
 
     # --test implies --test-early-swift-driver
     # (unless explicitly skipped with `--skip-test-early-swift-driver`)
@@ -633,8 +632,6 @@ def create_argument_parser():
 
     option(['--swift-driver'], toggle_true('build_swift_driver'),
            help='build swift-driver')
-    option(['--swiftdocc'], toggle_true('build_swiftdocc'),
-           help='build Swift DocC')
 
     option(['--skip-early-swift-driver'], toggle_false('build_early_swift_driver'),
            help='skip building the early swift-driver')
@@ -663,8 +660,6 @@ def create_argument_parser():
            help='install new Swift driver')
     option(['--install-swiftevolve'], toggle_true('install_swiftevolve'),
            help='install SwiftEvolve')
-    option(['--install-swiftdocc'], toggle_true('install_swiftdocc'),
-           help='install Swift DocC')
     option(['--toolchain-benchmarks'],
            toggle_true('build_toolchainbenchmarks'),
            help='build Swift Benchmarks using swiftpm against the just built '
@@ -1124,8 +1119,6 @@ def create_argument_parser():
     option('--skip-test-swift-inspect',
            toggle_false('test_swift_inspect'),
            help='skip testing swift_inspect')
-    option('--skip-test-swiftdocc', toggle_false('test_swiftdocc'),
-           help='skip testing swift-docc')
 
     # -------------------------------------------------------------------------
     in_group('Build settings specific for LLVM')

utils/build_swift/tests/expected_options.py

@@ -96,15 +96,13 @@
     'build_skstresstester': False,
     'build_swiftformat': False,
     'build_swiftevolve': False,
-    'build_swiftdocc': False,
     'build_indexstoredb': False,
     'test_indexstoredb_sanitize_all': False,
     'test_sourcekitlsp_sanitize_all': False,
     'build_sourcekitlsp': False,
     'install_swiftpm': False,
     'install_swiftsyntax': False,
     'install_swift_driver': False,
-    'install_swiftdocc': False,
     'swiftsyntax_verify_generated_files': False,
     'install_playgroundsupport': False,
     'install_sourcekitlsp': False,
@@ -264,7 +262,6 @@
     'test_skstresstester': False,
     'test_swiftformat': False,
     'test_swiftevolve': False,
-    'test_swiftdocc': False,
     'test_toolchainbenchmarks': False,
     'tvos': False,
     'tvos_all': False,
@@ -512,7 +509,6 @@ class BuildScriptImplOption(_BaseOption):
     SetTrueOption('--skstresstester', dest='build_skstresstester'),
     SetTrueOption('--swiftformat', dest='build_swiftformat'),
     SetTrueOption('--swiftevolve', dest='build_swiftevolve'),
-    SetTrueOption('--swiftdocc', dest='build_swiftdocc'),
     SetTrueOption('-B', dest='benchmark'),
     SetTrueOption('-S', dest='skip_build'),
     SetTrueOption('-b', dest='build_llbuild'),
@@ -567,7 +563,6 @@ class BuildScriptImplOption(_BaseOption):
     EnableOption('--install-sourcekit-lsp', dest='install_sourcekitlsp'),
     EnableOption('--install-skstresstester', dest='install_skstresstester'),
     EnableOption('--install-swiftevolve', dest='install_swiftevolve'),
-    EnableOption('--install-swiftdocc', dest='install_swiftdocc'),
     EnableOption('--toolchain-benchmarks', dest='build_toolchainbenchmarks'),
     EnableOption('--swift-inspect', dest='build_swift_inspect'),
     EnableOption('--tsan-libdispatch-test'),
@@ -649,7 +644,6 @@ class BuildScriptImplOption(_BaseOption):
     DisableOption('--skip-test-skstresstester', dest='test_skstresstester'),
     DisableOption('--skip-test-swiftformat', dest='test_swiftformat'),
     DisableOption('--skip-test-swiftevolve', dest='test_swiftevolve'),
-    DisableOption('--skip-test-swiftdocc', dest='test_swiftdocc'),
     DisableOption('--skip-test-toolchain-benchmarks',
                   dest='test_toolchainbenchmarks'),
     DisableOption('--skip-test-swift-inspect',

utils/swift_build_support/swift_build_support/build_script_invocation.py

@@ -605,10 +605,6 @@ def compute_product_pipelines(self):
                             is_enabled=self.args.build_swift_inspect)
         builder.add_product(products.TSanLibDispatch,
                             is_enabled=self.args.tsan_libdispatch_test)
-        builder.add_product(products.SwiftDocC,
-                            is_enabled=self.args.build_swiftdocc)
-        builder.add_product(products.SwiftDocCRender,
-                            is_enabled=self.args.install_swiftdocc)                  
 
         # Keep SwiftDriver at last.
         # swift-driver's integration with the build scripts is not fully

utils/swift_build_support/swift_build_support/products/__init__.py

@@ -27,8 +27,6 @@
 from .skstresstester import SKStressTester
 from .sourcekitlsp import SourceKitLSP
 from .swift import Swift
-from .swiftdocc import SwiftDocC
-from .swiftdoccrender import SwiftDocCRender
 from .swiftdriver import SwiftDriver
 from .swiftevolve import SwiftEvolve
 from .swiftformat import SwiftFormat
@@ -65,6 +63,4 @@
     'SourceKitLSP',
     'Benchmarks',
     'TSanLibDispatch',
-    'SwiftDocC',
-    'SwiftDocCRender'
 ]