---

yaml
---
r: 349527
b: refs/heads/master-next
c: c0de4e1
h: refs/heads/master
i:
  349525: e3bcfb7
  349523: 18f998d
  349519: da8a0a5

Author: swift-ci

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: 6f32b4e5d02f5c1e471c1e5a257a3244cf13e8f7
+refs/heads/master-next: c0de4e1126dc1527d409f9741009bd9487bfc107
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/utils/api_checker/swift-api-checker.py

@@ -97,7 +97,7 @@ def create_directory(path):
 
 
 class DumpConfig:
-    def __init__(self, tool_path, platform):
+    def __init__(self, tool_path, platform, platform_alias):
         target_map = {
             'iphoneos': 'arm64-apple-ios13.0',
             'macosx': 'x86_64-apple-macosx10.15',
@@ -110,12 +110,11 @@ def __init__(self, tool_path, platform):
         self.target = target_map[platform]
         self.sdk = get_sdk_path(platform)
         self.inputs = []
+        self.platform_alias = platform_alias
         if self.platform == 'macosx':
             # We need this input search path for CreateML
             self.inputs.extend([self.sdk + '/usr/lib/swift/'])
-        self.frameworks = [
-            self.sdk + '/System/Library/Frameworks/',
-            os.path.realpath(self.sdk + '/../../Library/Frameworks/')]
+        self.frameworks = []
         if self.platform.startswith('iosmac'):
             # Catalyst modules need this extra framework dir
             iOSSupport = self.sdk + \
@@ -156,7 +155,8 @@ def run(self, output, module, swift_ver, opts, verbose,
                             continue
                         dir_path = os.path.realpath(output + '/' + module)
                         file_path = os.path.realpath(dir_path + '/' +
-                                                     self.platform + '.json')
+                                                     self.platform_alias +
+                                                     '.json')
                         create_directory(dir_path)
                         current_cmd = list(cmd)
                         current_cmd.extend(['-module', module])
@@ -245,6 +245,12 @@ def main():
                              action='store_true',
                              help='When importing entire SDK, dump content '
                                   'seprately by module names')
+
+    basic_group.add_argument('--platform-alias', default='', help='''
+        Specify a file name to use if using a platform name in json file isn't
+        optimal
+        ''')
+
     args = parser.parse_args(sys.argv[1:])
 
     if args.action == 'dump':
@@ -263,7 +269,10 @@ def main():
             include_fixed_clang_modules = False
         else:
             fatal_error("cannot recognize --module-filter")
-        runner = DumpConfig(tool_path=args.tool_path, platform=args.target)
+        if args.platform_alias == '':
+            args.platform_alias = args.target
+        runner = DumpConfig(tool_path=args.tool_path, platform=args.target,
+                            platform_alias=args.platform_alias)
         runner.run(output=args.output, module=args.module,
                    swift_ver=args.swift_version, opts=args.opts,
                    verbose=args.v,