[build-script] Create explicit Platform and Target types.

 - This is so that we can have a place to attach the additional metadata we need
   on platform or target specific behaviors.

Author: ddunbar

utils/SwiftBuildSupport.py

@@ -151,22 +151,22 @@ def get_preset_options(substitutions, preset_file_names, preset_name):
             from swift_build_support.targets import StdlibDeploymentTarget
             for sdk in sdks_to_configure:
                 if sdk == "OSX":
-                    tgts += StdlibDeploymentTarget.OSX.allArchs
+                    tgts += StdlibDeploymentTarget.OSX.targets
                 elif sdk == "IOS":
-                    tgts += StdlibDeploymentTarget.iOS.allArchs
+                    tgts += StdlibDeploymentTarget.iOS.targets
                 elif sdk == "IOS_SIMULATOR":
-                    tgts += StdlibDeploymentTarget.iOSSimulator.allArchs
+                    tgts += StdlibDeploymentTarget.iOSSimulator.targets
                 elif sdk == "TVOS":
-                    tgts += StdlibDeploymentTarget.AppleTV.allArchs
+                    tgts += StdlibDeploymentTarget.AppleTV.targets
                 elif sdk == "TVOS_SIMULATOR":
-                    tgts += StdlibDeploymentTarget.AppleTVSimulator.allArchs
+                    tgts += StdlibDeploymentTarget.AppleTVSimulator.targets
                 elif sdk == "WATCHOS":
-                    tgts += StdlibDeploymentTarget.AppleWatch.allArchs
+                    tgts += StdlibDeploymentTarget.AppleWatch.targets
                 elif sdk == "WATCHOS_SIMULATOR":
-                    tgts += StdlibDeploymentTarget.AppleWatchSimulator.allArchs
+                    tgts += StdlibDeploymentTarget.AppleWatchSimulator.targets
 
             build_script_opts.append("--stdlib-deployment-targets=" +
-                                     " ".join(tgts))
+                                     " ".join([tgt.name for tgt in tgts]))
     # Filter the swift-sdks parameter
     build_script_impl_opts = [opt for opt in build_script_impl_opts
                               if not opt.startswith("--swift-sdks")]

utils/build-script

@@ -837,7 +837,7 @@ details of the setups of other systems or automated environments.""")
         help="The host target. LLVM, Clang, and Swift will be built for this "
              "target. The built LLVM and Clang will be used to compile Swift "
              "for the cross-compilation targets.",
-        default=StdlibDeploymentTarget.host_target())
+        default=StdlibDeploymentTarget.host_target().name)
     targets_group.add_argument(
         "--cross-compile-hosts",
         help="A space separated list of targets to cross-compile host Swift "
@@ -849,7 +849,10 @@ details of the setups of other systems or automated environments.""")
         help="list of targets to compile or cross-compile the Swift standard "
              "library for. %(default)s by default.",
         nargs="*",
-        default=StdlibDeploymentTarget.default_stdlib_deployment_targets())
+        default=[
+            target.name
+            for target in
+                StdlibDeploymentTarget.default_stdlib_deployment_targets()])
 
     projects_group = parser.add_argument_group(
         title="Options to select projects")

utils/swift_build_support/swift_build_support/targets.py

@@ -12,60 +12,61 @@
 import platform
 
 
+class Platform(object):
+    """
+    Abstract representation of a platform Swift can run on.
+    """
+
+    def __init__(self, name, archs):
+        """
+        Create a platform with the given name and list of architectures.
+        """
+        self.name = name
+        self.targets = [Target(self, arch) for arch in archs]
+
+        # Add a property for each arch.
+        for target in self.targets:
+            setattr(self, target.arch, target)
+
+
+class Target(object):
+    """
+    Abstract representation of a target Swift can run on.
+    """
+
+    def __init__(self, platform, arch):
+        self.platform = platform
+        self.arch = arch
+
+    @property
+    def name(self):
+        return "{}-{}".format(self.platform.name, self.arch)
+
+
 class StdlibDeploymentTarget(object):
+    OSX = Platform("macosx", archs=["x86_64"])
+
+    iOS = Platform("iphoneos", archs=["armv7", "armv7s", "arm64"])
+    iOSSimulator = Platform("iphonesimulator", archs=["i386", "x86_64"])
+
+    AppleTV = Platform("appletvos", archs=["arm64"])
+    AppleTVSimulator = Platform("appletvsimulator", archs=["x86_64"])
+
+    AppleWatch = Platform("watchos", archs=["armv7k"])
+    AppleWatchSimulator = Platform("watchsimulator", archs=["i386"])
+
+    Linux = Platform("linux", archs=[
+        "x86_64",
+        "armv6",
+        "armv7",
+        "aarch64",
+        "ppc64",
+        "ppc64le",
+        "s390x"])
+
+    FreeBSD = Platform("freebsd", archs=["x86_64"])
 
-    class OSX(object):
-        x86_64 = 'macosx-x86_64'
-        allArchs = [x86_64]
-
-    class iOS(object):  # noqa
-        armv7 = 'iphoneos-armv7'
-        armv7s = 'iphoneos-armv7s'
-        arm64 = 'iphoneos-arm64'
-        allArchs = [armv7, armv7s, arm64]
-
-    class iOSSimulator(object):  # noqa
-        i386 = 'iphonesimulator-i386'
-        x86_64 = 'iphonesimulator-x86_64'
-        allArchs = [i386, x86_64]
-
-    class AppleTV(object):
-        arm64 = 'appletvos-arm64'
-        allArchs = [arm64]
-
-    class AppleTVSimulator(object):
-        x86_64 = 'appletvsimulator-x86_64'
-        allArchs = [x86_64]
-
-    class AppleWatch(object):
-        armv7k = 'watchos-armv7k'
-        allArchs = [armv7k]
-
-    class AppleWatchSimulator(object):
-        i386 = 'watchsimulator-i386'
-        allArchs = [i386]
-
-    class Linux(object):
-        x86_64 = 'linux-x86_64'
-        armv6 = 'linux-armv6'
-        armv7 = 'linux-armv7'
-        aarch64 = 'linux-aarch64'
-        ppc64 = 'linux-ppc64'
-        ppc64le = 'linux-ppc64le'
-        s390x = 'linux-s390x'
-        allArchs = [x86_64, armv6, armv7, aarch64, ppc64, ppc64le, s390x]
-
-    class FreeBSD(object):
-        amd64 = 'freebsd-x86_64'
-        allArchs = [amd64]
-
-    class Cygwin(object):
-        x86_64 = 'cygwin-x86_64'
-        allArchs = [x86_64]
-
-    class Android(object):
-        armv7 = 'android-armv7'
-        allArchs = [armv7]
+    Cygwin = Platform("cygwin", archs=["x86_64"])
 
     @staticmethod
     def host_target():
@@ -124,12 +125,12 @@ def default_stdlib_deployment_targets():
         # (it takes a long time).
         if host_target == StdlibDeploymentTarget.OSX.x86_64:
             return [host_target] + \
-                StdlibDeploymentTarget.iOSSimulator.allArchs + \
-                StdlibDeploymentTarget.AppleTVSimulator.allArchs + \
-                StdlibDeploymentTarget.AppleWatchSimulator.allArchs + \
-                StdlibDeploymentTarget.iOS.allArchs + \
-                StdlibDeploymentTarget.AppleTV.allArchs + \
-                StdlibDeploymentTarget.AppleWatch.allArchs
+                StdlibDeploymentTarget.iOSSimulator.targets + \
+                StdlibDeploymentTarget.AppleTVSimulator.targets + \
+                StdlibDeploymentTarget.AppleWatchSimulator.targets + \
+                StdlibDeploymentTarget.iOS.targets + \
+                StdlibDeploymentTarget.AppleTV.targets + \
+                StdlibDeploymentTarget.AppleWatch.targets
         else:
             # All other machines only configure their host stdlib by default.
             return [host_target]