Skip to content

Commit 28f60a0

Browse files
gottesmmgottesmm
authored
Merge pull request #32247 from gottesmm/pr-bd788ac2872223df1190069035d4106524088523
[build-script] Fix import of dependencies of each product.
2 parents 68351d2 + 363bd5d commit 28f60a0

21 files changed

+359
-181
lines changed

‎utils/swift_build_support/swift_build_support/products/benchmarks.py

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,18 @@
1313
import os
1414
import platform
1515

16+
from . import cmark
17+
from . import foundation
18+
from . import libcxx
19+
from . import libdispatch
20+
from . import libicu
21+
from . import llbuild
22+
from . import lldb
23+
from . import llvm
1624
from . import product
25+
from . import swift
26+
from . import swiftpm
27+
from . import xctest
1728
from .. import shell
1829
from .. import targets
1930

@@ -59,17 +70,17 @@ def install(self, host_target):
5970

6071
@classmethod
6172
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+
return [cmark.CMark,
74+
llvm.LLVM,
75+
libcxx.LibCXX,
76+
libicu.LibICU,
77+
swift.Swift,
78+
lldb.LLDB,
79+
libdispatch.LibDispatch,
80+
foundation.Foundation,
81+
xctest.XCTest,
82+
llbuild.LLBuild,
83+
swiftpm.SwiftPM]
7384

7485

7586
def run_build_script_helper(host_target, product, args):

‎utils/swift_build_support/swift_build_support/products/foundation.py

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
from . import cmark
14+
from . import libcxx
15+
from . import libdispatch
16+
from . import libicu
17+
from . import lldb
18+
from . import llvm
1319
from . import product
20+
from . import swift
1421

1522

1623
class Foundation(product.Product):
@@ -32,10 +39,10 @@ def product_source_name(cls):
3239

3340
@classmethod
3441
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]
42+
return [cmark.CMark,
43+
llvm.LLVM,
44+
libcxx.LibCXX,
45+
libicu.LibICU,
46+
swift.Swift,
47+
lldb.LLDB,
48+
libdispatch.LibDispatch]

‎utils/swift_build_support/swift_build_support/products/indexstoredb.py

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,19 @@
1212

1313
import os
1414

15+
from . import cmark
16+
from . import foundation
17+
from . import libcxx
18+
from . import libdispatch
19+
from . import libicu
20+
from . import llbuild
21+
from . import lldb
22+
from . import llvm
1523
from . import product
24+
from . import swift
25+
from . import swiftpm
26+
from . import swiftsyntax
27+
from . import xctest
1628
from .. import shell
1729
from .. import targets
1830

@@ -47,18 +59,18 @@ def install(self, host_target):
4759

4860
@classmethod
4961
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+
return [cmark.CMark,
63+
llvm.LLVM,
64+
libcxx.LibCXX,
65+
libicu.LibICU,
66+
swift.Swift,
67+
lldb.LLDB,
68+
libdispatch.LibDispatch,
69+
foundation.Foundation,
70+
xctest.XCTest,
71+
llbuild.LLBuild,
72+
swiftpm.SwiftPM,
73+
swiftsyntax.SwiftSyntax]
6274

6375

6476
def run_build_script_helper(action, host_target, product, args,

‎utils/swift_build_support/swift_build_support/products/libcxx.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
from . import cmark
14+
from . import llvm
1315
from . import product
1416

1517

@@ -24,5 +26,5 @@ def is_build_script_impl_product(cls):
2426

2527
@classmethod
2628
def get_dependencies(cls):
27-
return [product.CMark,
28-
product.LLVM]
29+
return [cmark.CMark,
30+
llvm.LLVM]

‎utils/swift_build_support/swift_build_support/products/libdispatch.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,13 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
from . import cmark
14+
from . import libcxx
15+
from . import libicu
16+
from . import lldb
17+
from . import llvm
1318
from . import product
19+
from . import swift
1420

1521

1622
class LibDispatch(product.Product):
@@ -32,9 +38,9 @@ def product_source_name(cls):
3238

3339
@classmethod
3440
def get_dependencies(cls):
35-
return [product.CMark,
36-
product.LLVM,
37-
product.LibCXX,
38-
product.LibICU,
39-
product.Swift,
40-
product.LLDB]
41+
return [cmark.CMark,
42+
llvm.LLVM,
43+
libcxx.LibCXX,
44+
libicu.LibICU,
45+
swift.Swift,
46+
lldb.LLDB]

‎utils/swift_build_support/swift_build_support/products/libicu.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
from . import cmark
14+
from . import libcxx
15+
from . import llvm
1316
from . import product
1417

1518

@@ -32,6 +35,6 @@ def product_source_name(cls):
3235

3336
@classmethod
3437
def get_dependencies(cls):
35-
return [product.CMark,
36-
product.LLVM,
37-
product.LibCXX]
38+
return [cmark.CMark,
39+
llvm.LLVM,
40+
libcxx.LibCXX]

‎utils/swift_build_support/swift_build_support/products/llbuild.py

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,16 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
from . import cmark
14+
from . import foundation
15+
from . import libcxx
16+
from . import libdispatch
17+
from . import libicu
18+
from . import lldb
19+
from . import llvm
1320
from . import product
21+
from . import swift
22+
from . import xctest
1423

1524

1625
class LLBuild(product.Product):
@@ -24,12 +33,12 @@ def is_build_script_impl_product(cls):
2433

2534
@classmethod
2635
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]
36+
return [cmark.CMark,
37+
llvm.LLVM,
38+
libcxx.LibCXX,
39+
libicu.LibICU,
40+
swift.Swift,
41+
lldb.LLDB,
42+
libdispatch.LibDispatch,
43+
foundation.Foundation,
44+
xctest.XCTest]

‎utils/swift_build_support/swift_build_support/products/lldb.py

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
from . import cmark
14+
from . import libcxx
15+
from . import libicu
16+
from . import llvm
1317
from . import product
18+
from . import swift
1419

1520

1621
class LLDB(product.Product):
@@ -24,8 +29,8 @@ def is_build_script_impl_product(cls):
2429

2530
@classmethod
2631
def get_dependencies(cls):
27-
return [product.CMark,
28-
product.LLVM,
29-
product.LibCXX,
30-
product.LibICU,
31-
product.Swift]
32+
return [cmark.CMark,
33+
llvm.LLVM,
34+
libcxx.LibCXX,
35+
libicu.LibICU,
36+
swift.Swift]

‎utils/swift_build_support/swift_build_support/products/llvm.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#
1111
# ----------------------------------------------------------------------------
1212

13+
from . import cmark
1314
from . import product
1415
from ..cmake import CMakeOptions
1516

@@ -68,4 +69,4 @@ def _version_flags(self):
6869

6970
@classmethod
7071
def get_dependencies(cls):
71-
return [product.CMark]
72+
return [cmark.CMark]

‎utils/swift_build_support/swift_build_support/products/playgroundsupport.py

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,18 @@
1313
import os
1414
import re
1515

16+
from . import cmark
17+
from . import foundation
18+
from . import libcxx
19+
from . import libdispatch
20+
from . import libicu
21+
from . import llbuild
22+
from . import lldb
23+
from . import llvm
1624
from . import product
25+
from . import swift
26+
from . import swiftpm
27+
from . import xctest
1728
from .. import shell
1829
from .. import targets
1930

@@ -113,14 +124,14 @@ def install(self, host_target):
113124

114125
@classmethod
115126
def get_dependencies(cls):
116-
return [product.CMark,
117-
product.LLVM,
118-
product.LibCXX,
119-
product.LibICU,
120-
product.Swift,
121-
product.LLDB,
122-
product.LibDispatch,
123-
product.Foundation,
124-
product.XCTest,
125-
product.LLBuild,
126-
product.SwiftPM]
127+
return [cmark.CMark,
128+
llvm.LLVM,
129+
libcxx.LibCXX,
130+
libicu.LibICU,
131+
swift.Swift,
132+
lldb.LLDB,
133+
libdispatch.LibDispatch,
134+
foundation.Foundation,
135+
xctest.XCTest,
136+
llbuild.LLBuild,
137+
swiftpm.SwiftPM]

‎utils/swift_build_support/swift_build_support/products/pythonkit.py

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,18 @@
1212

1313
import os
1414

15+
from . import cmark
16+
from . import foundation
17+
from . import libcxx
18+
from . import libdispatch
19+
from . import libicu
20+
from . import llbuild
21+
from . import lldb
22+
from . import llvm
1523
from . import product
24+
from . import swift
25+
from . import swiftpm
26+
from . import xctest
1627
from .. import shell
1728
from .. import targets
1829

@@ -82,14 +93,14 @@ def install(self, host_target):
8293

8394
@classmethod
8495
def get_dependencies(cls):
85-
return [product.CMark,
86-
product.LLVM,
87-
product.LibCXX,
88-
product.LibICU,
89-
product.Swift,
90-
product.LLDB,
91-
product.LibDispatch,
92-
product.Foundation,
93-
product.XCTest,
94-
product.LLBuild,
95-
product.SwiftPM]
96+
return [cmark.CMark,
97+
llvm.LLVM,
98+
libcxx.LibCXX,
99+
libicu.LibICU,
100+
swift.Swift,
101+
lldb.LLDB,
102+
libdispatch.LibDispatch,
103+
foundation.Foundation,
104+
xctest.XCTest,
105+
llbuild.LLBuild,
106+
swiftpm.SwiftPM]

0 commit comments

Comments
 (0)