Skip to content

Commit 164ebbf

Browse files
authored
Merge pull request #32218 from gottesmm/pr-f9101d605011e95162876376e8ad32c05f84652f
[build-script] Make is_build_script_impl_product() a pure method and get rid of default Yes answer.
2 parents 7d4da10 + 104c8f3 commit 164ebbf

File tree

11 files changed

+77
-5
lines changed

11 files changed

+77
-5
lines changed

utils/swift_build_support/swift_build_support/products/cmark.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414

1515

1616
class CMark(product.Product):
17-
pass
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True

utils/swift_build_support/swift_build_support/products/foundation.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414

1515

1616
class Foundation(product.Product):
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True
24+
1725
@classmethod
1826
def product_source_name(cls):
1927
"""product_source_name() -> str

utils/swift_build_support/swift_build_support/products/libcxx.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414

1515

1616
class LibCXX(product.Product):
17-
pass
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True

utils/swift_build_support/swift_build_support/products/libdispatch.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414

1515

1616
class LibDispatch(product.Product):
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True
24+
1725
@classmethod
1826
def product_source_name(cls):
1927
"""product_source_name() -> str

utils/swift_build_support/swift_build_support/products/libicu.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414

1515

1616
class LibICU(product.Product):
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True
24+
1725
@classmethod
1826
def product_source_name(cls):
1927
"""product_source_name() -> str

utils/swift_build_support/swift_build_support/products/llbuild.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414

1515

1616
class LLBuild(product.Product):
17-
pass
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True

utils/swift_build_support/swift_build_support/products/lldb.py

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,10 @@
1414

1515

1616
class LLDB(product.Product):
17-
pass
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True

utils/swift_build_support/swift_build_support/products/llvm.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ def __init__(self, args, toolchain, source_dir, build_dir):
3434
# Add the cmake options for compiler version information.
3535
self.cmake_options.extend(self._version_flags)
3636

37+
@classmethod
38+
def is_build_script_impl_product(cls):
39+
"""is_build_script_impl_product -> bool
40+
41+
Whether this product is produced by build-script-impl.
42+
"""
43+
return True
44+
3745
@property
3846
def _compiler_vendor_flags(self):
3947
if self.args.compiler_vendor == "none":

utils/swift_build_support/swift_build_support/products/product.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def is_build_script_impl_product(cls):
5555
5656
Whether this product is produced by build-script-impl.
5757
"""
58-
return True
58+
raise NotImplementedError
5959

6060
@classmethod
6161
def is_swiftpm_unified_build_product(cls):

utils/swift_build_support/swift_build_support/products/swift.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,14 @@ def __init__(self, args, toolchain, source_dir, build_dir):
4545
self.cmake_options.extend(
4646
self._enable_experimental_differentiable_programming)
4747

48+
@classmethod
49+
def is_build_script_impl_product(cls):
50+
"""is_build_script_impl_product -> bool
51+
52+
Whether this product is produced by build-script-impl.
53+
"""
54+
return True
55+
4856
@property
4957
def _runtime_sanitizer_flags(self):
5058
sanitizer_list = []

utils/swift_build_support/swift_build_support/products/xctest.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,14 @@
1414

1515

1616
class XCTest(product.Product):
17+
@classmethod
18+
def is_build_script_impl_product(cls):
19+
"""is_build_script_impl_product -> bool
20+
21+
Whether this product is produced by build-script-impl.
22+
"""
23+
return True
24+
1725
@classmethod
1826
def product_source_name(cls):
1927
"""product_source_name() -> str

0 commit comments

Comments
 (0)