Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (264339 => 264340)
--- trunk/Tools/BuildSlaveSupport/built-product-archive 2020-07-14 15:32:51 UTC (rev 264339)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2020-07-14 15:42:25 UTC (rev 264340)
@@ -1,6 +1,6 @@
#!/usr/bin/env python
-# Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
+# Copyright (C) 2009-2020 Apple Inc. All rights reserved.
# Copyright (C) 2012 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -74,10 +74,10 @@
def webkitBuildDirectoryForConfigurationAndPlatform(configuration, platform, fullPlatform='', returnTopLevelDirectory=False):
- if fullPlatform.startswith('ios-simulator'):
- platform = 'ios-simulator'
- elif platform == 'ios':
- platform = 'device'
+ if 'simulator' in fullPlatform:
+ platform = platform + '-simulator'
+ elif platform in ['ios', 'tvos', 'watchos']:
+ platform = platform + '-device'
command = ['perl', os.path.join(os.path.dirname(__file__), '..', 'Scripts', 'webkit-build-directory'), '--' + platform, '--' + configuration]
if returnTopLevelDirectory:
command += ['--top-level']
@@ -92,7 +92,7 @@
global _hostBuildDirectory
_configurationBuildDirectory = webkitBuildDirectoryForConfigurationAndPlatform(configuration, platform, fullPlatform)
_topLevelBuildDirectory = webkitBuildDirectoryForConfigurationAndPlatform(configuration, platform, fullPlatform, returnTopLevelDirectory=True)
- if platform == 'ios':
+ if platform in ['ios', 'tvos', 'watchos']:
_hostBuildDirectory = webkitBuildDirectoryForConfigurationAndPlatform(configuration, 'mac')
else:
_hostBuildDirectory = _configurationBuildDirectory
@@ -179,7 +179,7 @@
def minifyDirectory(platform, directory):
- if platform == 'mac' or platform == 'ios':
+ if platform in ['mac', 'ios', 'tvos', 'watchos']:
dir_patterns = ('.dSYM', 'DerivedSources')
file_patterns = ('.a',)
for root, dirs, files in os.walk(directory):
@@ -195,8 +195,8 @@
def archiveBuiltProduct(configuration, platform, fullPlatform, minify=False):
assert platform in ('gtk', 'ios', 'jsc', 'mac', 'tvos', 'watchos', 'win', 'wincairo', 'wpe')
- if platform == 'ios':
- combinedDirectory = os.path.join(_topLevelBuildDirectory, 'combined-mac-and-ios')
+ if platform in ['ios', 'tvos', 'watchos']:
+ combinedDirectory = os.path.join(_topLevelBuildDirectory, 'combined-mac-and-{}'.format(platform))
removeDirectoryIfExists(combinedDirectory)
os.makedirs(combinedDirectory)
if minify:
@@ -273,7 +273,7 @@
removeDirectoryIfExists(_configurationBuildDirectory)
os.makedirs(_configurationBuildDirectory)
- if platform in ('mac', 'ios'):
+ if platform in ('mac', 'ios', 'tvos', 'watchos'):
return unzipArchive(_topLevelBuildDirectory, configuration)
elif platform in ('gtk', 'jsc', 'win', 'wincairo', 'wpe'):
print 'Extracting', _configurationBuildDirectory
