Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (220282 => 220283)
--- trunk/Tools/BuildSlaveSupport/built-product-archive 2017-08-04 19:01:00 UTC (rev 220282)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2017-08-04 19:03:27 UTC (rev 220283)
@@ -173,11 +173,11 @@
return False
-def minifySource(platform):
- if platform == 'mac':
+def minifyDirectory(platform, directory):
+ if platform == 'mac' or platform == 'ios':
dir_patterns = ('.dSYM', 'DerivedSources')
file_patterns = ('.a',)
- for root, dirs, files in os.walk(_configurationBuildDirectory):
+ for root, dirs, files in os.walk(directory):
if any(root.endswith(pattern) for pattern in dir_patterns):
print 'Removing: {}'.format(root)
shutil.rmtree(root)
@@ -194,16 +194,18 @@
combinedDirectory = os.path.join(_topLevelBuildDirectory, 'combined-mac-and-ios')
removeDirectoryIfExists(combinedDirectory)
os.makedirs(combinedDirectory)
-
+ if minify:
+ minifyDirectory(platform, _configurationBuildDirectory)
+ minifyDirectory(platform, _hostBuildDirectory)
if subprocess.call(['/bin/cp', '-pR', _configurationBuildDirectory, combinedDirectory]):
return 1
if subprocess.call(['/bin/cp', '-pR', _hostBuildDirectory, combinedDirectory]):
return 1
- return createZip(combinedDirectory, configuration)
+ return createZip(combinedDirectory, configuration, minify=minify)
elif platform == 'mac':
if minify:
- minifySource(platform)
+ minifyDirectory(platform, _configurationBuildDirectory)
return createZip(_configurationBuildDirectory, configuration, embedParentDirectoryNameOnDarwin=True, minify=minify)
elif platform == 'win':
# FIXME: We shouldn't hardcode the assumption of a 32-bit build. See <https://bugs.webkit.org/show_bug.cgi?id=149715>.
Modified: trunk/Tools/ChangeLog (220282 => 220283)
--- trunk/Tools/ChangeLog 2017-08-04 19:01:00 UTC (rev 220282)
+++ trunk/Tools/ChangeLog 2017-08-04 19:03:27 UTC (rev 220283)
@@ -1,3 +1,15 @@
+2017-08-04 Lucas Forschler <[email protected]>
+
+ minification logic is not implemented for ios builds
+ <rdar://problem/33726561>
+
+ Reviewed by Dean Johnson
+
+ * BuildSlaveSupport/built-product-archive:
+ (minifyDirectory): refactor minifySource -> minifyDirectory
+ (archiveBuiltProduct): add ios minification logic
+ (minifySource): Deleted.
+
2017-08-04 Matt Lewis <[email protected]>
Unreviewed, rolling out r220271.
