<!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>[179218] 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/179218">179218</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-01-27 14:29:33 -0800 (Tue, 27 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Mac] Disable building Java applets by default
https://bugs.webkit.org/show_bug.cgi?id=140957
rdar://problem/19619529
Reviewed by Anders Carlsson.
It was actually already disabled unconditionally, by accident.
* Scripts/webkitpy/layout_tests/run_webkit_tests.py: (parse_args):
* Scripts/webkitpy/port/mac.py:
(MacPort._check_port_build):
(MacPort._build_java_test_support):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179217 => 179218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-27 22:22:24 UTC (rev 179217)
+++ trunk/Tools/ChangeLog 2015-01-27 22:29:33 UTC (rev 179218)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-27 Alexey Proskuryakov <ap@apple.com>
+
+ [Mac] Disable building Java applets by default
+ https://bugs.webkit.org/show_bug.cgi?id=140957
+ rdar://problem/19619529
+
+ Reviewed by Anders Carlsson.
+
+ It was actually already disabled unconditionally, by accident.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py: (parse_args):
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort._check_port_build):
+ (MacPort._build_java_test_support):
+
</ins><span class="cx"> 2015-01-27 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] run-webkit-tests --platform=ios* --lint-test-files does not work
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsrun_webkit_testspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (179217 => 179218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-01-27 22:22:24 UTC (rev 179217)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-01-27 22:29:33 UTC (rev 179218)
</span><span class="lines">@@ -205,9 +205,9 @@
</span><span class="cx"> optparse.make_option("--nocheck-sys-deps", action="store_true",
</span><span class="cx"> default=False,
</span><span class="cx"> help="Don't check the system dependencies (themes)"),
</span><del>- optparse.make_option("--nojava", action="store_true",
</del><ins>+ optparse.make_option("--java", action="store_true",
</ins><span class="cx"> default=False,
</span><del>- help="Don't build java support files"),
</del><ins>+ help="Build java support files"),
</ins><span class="cx"> ]))
</span><span class="cx">
</span><span class="cx"> option_group_definitions.append(("Testing Options", [
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (179217 => 179218)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-27 22:22:24 UTC (rev 179217)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-27 22:29:33 UTC (rev 179218)
</span><span class="lines">@@ -147,7 +147,6 @@
</span><span class="cx"> return min(supportable_instances, default_count)
</span><span class="cx">
</span><span class="cx"> def _build_java_test_support(self):
</span><del>- return True
</del><span class="cx"> java_tests_path = self._filesystem.join(self.layout_tests_dir(), "java")
</span><span class="cx"> build_java = [self.make_command(), "-C", java_tests_path]
</span><span class="cx"> if self._executive.run_command(build_java, return_exit_code=True): # Paths are absolute, so we don't need to set a cwd.
</span><span class="lines">@@ -176,7 +175,7 @@
</span><span class="cx"> _log.info("%s unique leaks found." % unique_leaks)
</span><span class="cx">
</span><span class="cx"> def _check_port_build(self):
</span><del>- return self.get_option('nojava') or self._build_java_test_support()
</del><ins>+ return not self.get_option('java') or self._build_java_test_support()
</ins><span class="cx">
</span><span class="cx"> def _path_to_webcore_library(self):
</span><span class="cx"> return self._build_path('WebCore.framework/Versions/A/WebCore')
</span></span></pre>
</div>
</div>
</body>
</html>