Skip to content

[build-script] Fix import of dependencies of each product. #32247

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 9, 2020
Merged

[build-script] Fix import of dependencies of each product. #32247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 22 additions & 11 deletions utils/swift_build_support/swift_build_support/products/benchmarks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,18 @@
import os
import platform

from . import cmark
from . import foundation
from . import libcxx
from . import libdispatch
from . import libicu
from . import llbuild
from . import lldb
from . import llvm
from . import product
from . import swift
from . import swiftpm
from . import xctest
from .. import shell
from .. import targets

Expand Down Expand Up @@ -59,17 +70,17 @@ def install(self, host_target):

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift,
product.LLDB,
product.LibDispatch,
product.Foundation,
product.XCTest,
product.LLBuild,
product.SwiftPM]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift,
lldb.LLDB,
libdispatch.LibDispatch,
foundation.Foundation,
xctest.XCTest,
llbuild.LLBuild,
swiftpm.SwiftPM]


def run_build_script_helper(host_target, product, args):
Expand Down
21 changes: 14 additions & 7 deletions utils/swift_build_support/swift_build_support/products/foundation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@
#
# ----------------------------------------------------------------------------

from . import cmark
from . import libcxx
from . import libdispatch
from . import libicu
from . import lldb
from . import llvm
from . import product
from . import swift


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

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift,
product.LLDB,
product.LibDispatch]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift,
lldb.LLDB,
libdispatch.LibDispatch]
36 changes: 24 additions & 12 deletions utils/swift_build_support/swift_build_support/products/indexstoredb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,19 @@

import os

from . import cmark
from . import foundation
from . import libcxx
from . import libdispatch
from . import libicu
from . import llbuild
from . import lldb
from . import llvm
from . import product
from . import swift
from . import swiftpm
from . import swiftsyntax
from . import xctest
from .. import shell
from .. import targets

Expand Down Expand Up @@ -47,18 +59,18 @@ def install(self, host_target):

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift,
product.LLDB,
product.LibDispatch,
product.Foundation,
product.XCTest,
product.LLBuild,
product.SwiftPM,
product.SwiftSyntax]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift,
lldb.LLDB,
libdispatch.LibDispatch,
foundation.Foundation,
xctest.XCTest,
llbuild.LLBuild,
swiftpm.SwiftPM,
swiftsyntax.SwiftSyntax]


def run_build_script_helper(action, host_target, product, args,
Expand Down
6 changes: 4 additions & 2 deletions utils/swift_build_support/swift_build_support/products/libcxx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#
# ----------------------------------------------------------------------------

from . import cmark
from . import llvm
from . import product


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

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM]
return [cmark.CMark,
llvm.LLVM]
18 changes: 12 additions & 6 deletions utils/swift_build_support/swift_build_support/products/libdispatch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,13 @@
#
# ----------------------------------------------------------------------------

from . import cmark
from . import libcxx
from . import libicu
from . import lldb
from . import llvm
from . import product
from . import swift


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

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift,
product.LLDB]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift,
lldb.LLDB]
9 changes: 6 additions & 3 deletions utils/swift_build_support/swift_build_support/products/libicu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
#
# ----------------------------------------------------------------------------

from . import cmark
from . import libcxx
from . import llvm
from . import product


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

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX]
27 changes: 18 additions & 9 deletions utils/swift_build_support/swift_build_support/products/llbuild.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,16 @@
#
# ----------------------------------------------------------------------------

from . import cmark
from . import foundation
from . import libcxx
from . import libdispatch
from . import libicu
from . import lldb
from . import llvm
from . import product
from . import swift
from . import xctest


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

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift,
product.LLDB,
product.LibDispatch,
product.Foundation,
product.XCTest]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift,
lldb.LLDB,
libdispatch.LibDispatch,
foundation.Foundation,
xctest.XCTest]
15 changes: 10 additions & 5 deletions utils/swift_build_support/swift_build_support/products/lldb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,12 @@
#
# ----------------------------------------------------------------------------

from . import cmark
from . import libcxx
from . import libicu
from . import llvm
from . import product
from . import swift


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

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift]
3 changes: 2 additions & 1 deletion utils/swift_build_support/swift_build_support/products/llvm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#
# ----------------------------------------------------------------------------

from . import cmark
from . import product
from ..cmake import CMakeOptions

Expand Down Expand Up @@ -68,4 +69,4 @@ def _version_flags(self):

@classmethod
def get_dependencies(cls):
return [product.CMark]
return [cmark.CMark]
33 changes: 22 additions & 11 deletions utils/swift_build_support/swift_build_support/products/playgroundsupport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,18 @@
import os
import re

from . import cmark
from . import foundation
from . import libcxx
from . import libdispatch
from . import libicu
from . import llbuild
from . import lldb
from . import llvm
from . import product
from . import swift
from . import swiftpm
from . import xctest
from .. import shell
from .. import targets

Expand Down Expand Up @@ -113,14 +124,14 @@ def install(self, host_target):

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift,
product.LLDB,
product.LibDispatch,
product.Foundation,
product.XCTest,
product.LLBuild,
product.SwiftPM]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift,
lldb.LLDB,
libdispatch.LibDispatch,
foundation.Foundation,
xctest.XCTest,
llbuild.LLBuild,
swiftpm.SwiftPM]
33 changes: 22 additions & 11 deletions utils/swift_build_support/swift_build_support/products/pythonkit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,18 @@

import os

from . import cmark
from . import foundation
from . import libcxx
from . import libdispatch
from . import libicu
from . import llbuild
from . import lldb
from . import llvm
from . import product
from . import swift
from . import swiftpm
from . import xctest
from .. import shell
from .. import targets

Expand Down Expand Up @@ -82,14 +93,14 @@ def install(self, host_target):

@classmethod
def get_dependencies(cls):
return [product.CMark,
product.LLVM,
product.LibCXX,
product.LibICU,
product.Swift,
product.LLDB,
product.LibDispatch,
product.Foundation,
product.XCTest,
product.LLBuild,
product.SwiftPM]
return [cmark.CMark,
llvm.LLVM,
libcxx.LibCXX,
libicu.LibICU,
swift.Swift,
lldb.LLDB,
libdispatch.LibDispatch,
foundation.Foundation,
xctest.XCTest,
llbuild.LLBuild,
swiftpm.SwiftPM]
Loading