Skip to content

Commit c045802

Browse files
authored
Merge pull request swiftlang#32225 from gottesmm/pr-717ba0adb0340ba5a05ecc2256e269bcff506230
[build-script] Add dependencies for all build-script products as a first approximation.
2 parents 59d2d95 + 1e1b350 commit c045802

23 files changed

+254
-1
lines changed

utils/swift_build_support/swift_build_support/products/benchmarks.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,20 @@ def should_install(self, host_target):
5757
def install(self, host_target):
5858
pass
5959

60+
@classmethod
61+
def get_dependencies(cls):
62+
return [product.CMark,
63+
product.LLVM,
64+
product.LibCXX,
65+
product.LibICU,
66+
product.Swift,
67+
product.LLDB,
68+
product.LibDispatch,
69+
product.Foundation,
70+
product.XCTest,
71+
product.LLBuild,
72+
product.SwiftPM]
73+
6074

6175
def run_build_script_helper(host_target, product, args):
6276
toolchain_path = args.install_destdir

utils/swift_build_support/swift_build_support/products/cmark.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ def is_build_script_impl_product(cls):
2121
Whether this product is produced by build-script-impl.
2222
"""
2323
return True
24+
25+
# This is the root of the build-graph, so it doesn't have any dependencies.
26+
@classmethod
27+
def get_dependencies(cls):
28+
return []

utils/swift_build_support/swift_build_support/products/foundation.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,13 @@ def product_source_name(cls):
2929
The name of the source code directory of this product.
3030
"""
3131
return "swift-corelibs-foundation"
32+
33+
@classmethod
34+
def get_dependencies(cls):
35+
return [product.CMark,
36+
product.LLVM,
37+
product.LibCXX,
38+
product.LibICU,
39+
product.Swift,
40+
product.LLDB,
41+
product.LibDispatch]

utils/swift_build_support/swift_build_support/products/indexstoredb.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,21 @@ def should_install(self, host_target):
4545
def install(self, host_target):
4646
pass
4747

48+
@classmethod
49+
def get_dependencies(cls):
50+
return [product.CMark,
51+
product.LLVM,
52+
product.LibCXX,
53+
product.LibICU,
54+
product.Swift,
55+
product.LLDB,
56+
product.LibDispatch,
57+
product.Foundation,
58+
product.XCTest,
59+
product.LLBuild,
60+
product.SwiftPM,
61+
product.SwiftSyntax]
62+
4863

4964
def run_build_script_helper(action, host_target, product, args,
5065
sanitize_all=False):

utils/swift_build_support/swift_build_support/products/libcxx.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,8 @@ def is_build_script_impl_product(cls):
2121
Whether this product is produced by build-script-impl.
2222
"""
2323
return True
24+
25+
@classmethod
26+
def get_dependencies(cls):
27+
return [product.CMark,
28+
product.LLVM]

utils/swift_build_support/swift_build_support/products/libdispatch.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,12 @@ def product_source_name(cls):
2929
The name of the source code directory of this product.
3030
"""
3131
return "swift-corelibs-libdispatch"
32+
33+
@classmethod
34+
def get_dependencies(cls):
35+
return [product.CMark,
36+
product.LLVM,
37+
product.LibCXX,
38+
product.LibICU,
39+
product.Swift,
40+
product.LLDB]

utils/swift_build_support/swift_build_support/products/libicu.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,9 @@ def product_source_name(cls):
2929
The name of the source code directory of this product.
3030
"""
3131
return "icu"
32+
33+
@classmethod
34+
def get_dependencies(cls):
35+
return [product.CMark,
36+
product.LLVM,
37+
product.LibCXX]

utils/swift_build_support/swift_build_support/products/llbuild.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,15 @@ def is_build_script_impl_product(cls):
2121
Whether this product is produced by build-script-impl.
2222
"""
2323
return True
24+
25+
@classmethod
26+
def get_dependencies(cls):
27+
return [product.CMark,
28+
product.LLVM,
29+
product.LibCXX,
30+
product.LibICU,
31+
product.Swift,
32+
product.LLDB,
33+
product.LibDispatch,
34+
product.Foundation,
35+
product.XCTest]

utils/swift_build_support/swift_build_support/products/lldb.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,11 @@ def is_build_script_impl_product(cls):
2121
Whether this product is produced by build-script-impl.
2222
"""
2323
return True
24+
25+
@classmethod
26+
def get_dependencies(cls):
27+
return [product.CMark,
28+
product.LLVM,
29+
product.LibCXX,
30+
product.LibICU,
31+
product.Swift]

utils/swift_build_support/swift_build_support/products/llvm.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,7 @@ def _version_flags(self):
6565
'CLANG_REPOSITORY_STRING',
6666
"clang-{}".format(self.args.clang_compiler_version))
6767
return result
68+
69+
@classmethod
70+
def get_dependencies(cls):
71+
return [product.CMark]

0 commit comments

Comments
 (0)