<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[211380] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/211380">211380</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2017-01-30 12:05:34 -0800 (Mon, 30 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK][EFL] Avoid using a thin directory to create the built product on the archive-built-product step.
https://bugs.webkit.org/show_bug.cgi?id=167596
Reviewed by Daniel Bates.
We avoid needing a thin directory by invoking the zip program with
the list of directories from the build directory to be zipped,
and by using the zip feature to exclude files matching a pattern.
* BuildSlaveSupport/built-product-archive:
(copyBuildFiles):
(createZipFromList):
(archiveBuiltProduct):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuiltproductarchive">trunk/Tools/BuildSlaveSupport/built-product-archive</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuiltproductarchive"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/built-product-archive (211379 => 211380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/built-product-archive 2017-01-30 19:46:40 UTC (rev 211379)
+++ trunk/Tools/BuildSlaveSupport/built-product-archive 2017-01-30 20:05:34 UTC (rev 211380)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
</span><span class="cx"> # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><ins>+import errno
</ins><span class="cx"> import optparse
</span><span class="cx"> import os
</span><span class="cx"> import shutil
</span><span class="lines">@@ -97,6 +98,25 @@
</span><span class="cx"> shutil.copytree(source, destination, ignore=shutil.ignore_patterns(*patterns))
</span><span class="cx">
</span><span class="cx">
</span><ins>+def createZipFromList(listToZip, configuration, excludePattern=None):
+ archiveDir = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..', 'WebKitBuild'))
+ archiveFile = os.path.join(archiveDir, configuration + '.zip')
+
+ try:
+ os.unlink(archiveFile)
+ except OSError, e:
+ if e.errno != errno.ENOENT:
+ raise
+
+ if sys.platform.startswith('linux'):
+ zipCommand = ['zip', '-y', '-r', archiveFile] + listToZip
+ if excludePattern:
+ zipCommand += ['-x', excludePattern]
+ return subprocess.call(zipCommand, cwd=_configurationBuildDirectory)
+
+ raise NotImplementedError('Unsupported platform: {platform}'.format(platform=sys.platform))
+
+
</ins><span class="cx"> def createZipManually(directoryToZip, archiveFile):
</span><span class="cx"> archiveZip = zipfile.ZipFile(archiveFile, "w")
</span><span class="cx">
</span><span class="lines">@@ -115,7 +135,7 @@
</span><span class="cx"> try:
</span><span class="cx"> os.unlink(archiveFile)
</span><span class="cx"> except OSError, e:
</span><del>- if e.errno != 2:
</del><ins>+ if e.errno != errno.ENOENT:
</ins><span class="cx"> raise
</span><span class="cx">
</span><span class="cx"> if sys.platform == 'darwin':
</span><span class="lines">@@ -183,32 +203,17 @@
</span><span class="cx"> shutil.rmtree(thinDirectory)
</span><span class="cx">
</span><span class="cx"> elif platform == 'gtk' or platform == 'efl':
</span><del>- thinDirectory = os.path.join(_configurationBuildDirectory, 'thin')
-
- removeDirectoryIfExists(thinDirectory)
- os.mkdir(thinDirectory)
-
- neededDirectories = ["bin", "lib"]
-
</del><ins>+ # On GTK+/EFL we don't need the intermediate step of creating a thinDirectory
+ # to be compressed in a ZIP file, because we can create the ZIP directly.
+ # This is faster and requires less disk resources.
+ neededDirectories = ['bin', 'lib']
</ins><span class="cx"> # When debug fission is enabled the directories below contain dwo files
</span><span class="cx"> # with the debug information needed to generate backtraces with GDB.
</span><del>- for objectDir in ["Tools", "Source"]:
</del><ins>+ for objectDir in ['Tools', 'Source']:
</ins><span class="cx"> if dirContainsdwo(objectDir):
</span><span class="cx"> neededDirectories.append(objectDir)
</span><span class="cx">
</span><del>- for dirname in neededDirectories:
- fromDir = os.path.join(_configurationBuildDirectory, dirname, '.')
- toDir = os.path.join(thinDirectory, dirname)
- os.makedirs(toDir)
- if subprocess.call('cp -R %s %s' % (fromDir, toDir), shell=True):
- return 1
-
- for root, dirs, files in os.walk(thinDirectory, topdown=False):
- for name in files:
- if name.endswith(".o"):
- os.remove(os.path.join(root, name))
-
- if createZip(thinDirectory, configuration):
</del><ins>+ if createZipFromList(neededDirectories, configuration, excludePattern='*.o'):
</ins><span class="cx"> return 1
</span><span class="cx">
</span><span class="cx"> def unzipArchive(directoryToExtractTo, configuration):
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (211379 => 211380)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-30 19:46:40 UTC (rev 211379)
+++ trunk/Tools/ChangeLog 2017-01-30 20:05:34 UTC (rev 211380)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-01-30 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK][EFL] Avoid using a thin directory to create the built product on the archive-built-product step.
+ https://bugs.webkit.org/show_bug.cgi?id=167596
+
+ Reviewed by Daniel Bates.
+
+ We avoid needing a thin directory by invoking the zip program with
+ the list of directories from the build directory to be zipped,
+ and by using the zip feature to exclude files matching a pattern.
+
+ * BuildSlaveSupport/built-product-archive:
+ (copyBuildFiles):
+ (createZipFromList):
+ (archiveBuiltProduct):
+
</ins><span class="cx"> 2017-01-30 Jonathan Bedard <jbedard@apple.com>
</span><span class="cx">
</span><span class="cx"> Use simctl instead of LayoutTestRelay
</span></span></pre>
</div>
</div>
</body>
</html>