<!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>[180019] branches/safari-600.5-branch/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/180019">180019</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-02-12 15:10:30 -0800 (Thu, 12 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179996">r179996</a> to correct test system failures.
2015-02-12 Brent Fulgham <bfulgham@apple.com>
[Win] Test bot infrastructure should not try to find/use old Safari DLLs
https://bugs.webkit.org/show_bug.cgi?id=141517
Reviewed by Anders Carlsson.
We do not need to locate or use the DLL's that came with Safari, so stop
failing when we cannot find them. Also remove some old Qt cruft from this
script.
* BuildSlaveSupport/built-product-archive:
(archiveBuiltProduct):
(extractBuiltProduct):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6005branchToolsBuildSlaveSupportbuiltproductarchive">branches/safari-600.5-branch/Tools/BuildSlaveSupport/built-product-archive</a></li>
<li><a href="#branchessafari6005branchToolsChangeLog">branches/safari-600.5-branch/Tools/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6005branchToolsBuildSlaveSupportbuiltproductarchive"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Tools/BuildSlaveSupport/built-product-archive (180018 => 180019)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Tools/BuildSlaveSupport/built-product-archive 2015-02-12 23:09:05 UTC (rev 180018)
+++ branches/safari-600.5-branch/Tools/BuildSlaveSupport/built-product-archive 2015-02-12 23:10:30 UTC (rev 180019)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> #!/usr/bin/python
</span><span class="cx">
</span><del>-# Copyright (C) 2009 Apple Inc. All rights reserved.
</del><ins>+# Copyright (C) 2009, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> # Copyright (C) 2012 Google Inc. All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -113,7 +113,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def archiveBuiltProduct(configuration, platform, fullPlatform):
</span><del>- assert platform in ('mac', 'win', 'qt', 'gtk', 'efl')
</del><ins>+ assert platform in ('mac', 'win', 'gtk', 'efl')
</ins><span class="cx">
</span><span class="cx"> configurationBuildDirectory = os.path.join(_buildDirectory, configuration.title())
</span><span class="cx">
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx">
</span><span class="cx"> shutil.rmtree(thinDirectory)
</span><span class="cx">
</span><del>- elif platform == 'qt' or platform == 'gtk' or platform == 'efl':
</del><ins>+ elif platform == 'gtk' or platform == 'efl':
</ins><span class="cx"> thinDirectory = os.path.join(configurationBuildDirectory, "thin")
</span><span class="cx">
</span><span class="cx"> removeDirectoryIfExists(thinDirectory)
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def extractBuiltProduct(configuration, platform):
</span><del>- assert platform in ('mac', 'win', 'qt', 'gtk', 'efl')
</del><ins>+ assert platform in ('mac', 'win', 'gtk', 'efl')
</ins><span class="cx">
</span><span class="cx"> archiveFile = os.path.join(_buildDirectory, configuration + ".zip")
</span><span class="cx"> configurationBuildDirectory = os.path.join(_buildDirectory, configuration.title())
</span><span class="lines">@@ -191,18 +191,7 @@
</span><span class="cx">
</span><span class="cx"> if platform == 'mac':
</span><span class="cx"> return unzipArchive(_buildDirectory, configuration)
</span><del>- elif platform == 'win':
- binDirectory = os.path.join(configurationBuildDirectory, "bin32")
- os.makedirs(binDirectory)
-
- safariPath = subprocess.Popen('cygpath -w "$PROGRAMFILES"/Safari',
- shell=True, stdout=subprocess.PIPE).communicate()[0].strip()
-
- if subprocess.call('cp -R "%s"/*.dll "%s"/*.resources %s' % (safariPath, safariPath, binDirectory), shell=True):
- return 1
-
- return unzipArchive(configurationBuildDirectory, configuration)
- elif platform == 'qt' or platform == 'gtk' or platform == 'efl':
</del><ins>+ elif platform == 'win' or platform == 'gtk' or platform == 'efl':
</ins><span class="cx"> print "Extracting", configurationBuildDirectory
</span><span class="cx"> return unzipArchive(configurationBuildDirectory, configuration)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6005branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.5-branch/Tools/ChangeLog (180018 => 180019)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.5-branch/Tools/ChangeLog 2015-02-12 23:09:05 UTC (rev 180018)
+++ branches/safari-600.5-branch/Tools/ChangeLog 2015-02-12 23:10:30 UTC (rev 180019)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-02-12 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179996 to correct test system failures.
+
+ 2015-02-12 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Test bot infrastructure should not try to find/use old Safari DLLs
+ https://bugs.webkit.org/show_bug.cgi?id=141517
+
+ Reviewed by Anders Carlsson.
+
+ We do not need to locate or use the DLL's that came with Safari, so stop
+ failing when we cannot find them. Also remove some old Qt cruft from this
+ script.
+
+ * BuildSlaveSupport/built-product-archive:
+ (archiveBuiltProduct):
+ (extractBuiltProduct):
+
+2015-02-12 Brent Fulgham <bfulgham@apple.com>
+
</ins><span class="cx"> [Win] Unreviewed branch build fix.
</span><span class="cx">
</span><span class="cx"> * DumpRenderTree/AccessibilityUIElement.cpp:
</span></span></pre>
</div>
</div>
</body>
</html>