<!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>[168711] releases/WebKitGTK/webkit-2.4/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/168711">168711</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2014-05-13 12:29:34 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 164739 - [GTK] Reduplicate common.top_level_path in scripts
https://bugs.webkit.org/show_bug.cgi?id=129291
Reviewed by Philippe Normand.
Duplicate common.top_level_path and avoid polluting many scripts with awkward system
path manipulation and weird dependencies on the jhbuild infrastructure.
* Scripts/run-gtk-tests: Use common again.
(TestRunner._setup_testing_environment): Ditto.
* gtk/check-gdom-symbols: Ditto.
* gtk/common.py:
(top_level_path): Re-add top_level_path..
(get_build_path): Use the builtin top_level_path again.
* gtk/find-make-dist-errors: Use common again.
(get_missing_headers): Ditto.
* gtk/generate-inspector-gresource-manifest.py: Ditto.
Conflicts:
Tools/ChangeLog</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24ToolsScriptsrungtktests">releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsgtkcheckgdomsymbols">releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsgtkcommonpy">releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsgtkfindmakedisterrors">releases/WebKitGTK/webkit-2.4/Tools/gtk/find-make-dist-errors</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsgtkgenerateinspectorgresourcemanifestpy">releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24ToolsScriptsrungtktests"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests (168710 => 168711)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests 2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/Scripts/run-gtk-tests 2014-05-13 19:29:34 UTC (rev 168711)
</span><span class="lines">@@ -31,9 +31,6 @@
</span><span class="cx"> import common
</span><span class="cx"> import jhbuildutils
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild"))
-import jhbuildrc_common
-
</del><span class="cx"> class SkippedTest:
</span><span class="cx"> ENTIRE_SUITE = None
</span><span class="cx">
</span><span class="lines">@@ -198,7 +195,7 @@
</span><span class="cx"> def _setup_testing_environment(self):
</span><span class="cx"> self._test_env = os.environ
</span><span class="cx"> self._test_env['GSETTINGS_BACKEND'] = 'memory'
</span><del>- self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = jhbuildrc_common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
</del><ins>+ self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
</ins><span class="cx"> self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.tests_library_build_path()
</span><span class="cx"> self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsgtkcheckgdomsymbols"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols (168710 => 168711)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols 2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/check-gdom-symbols 2014-05-13 19:29:34 UTC (rev 168711)
</span><span class="lines">@@ -22,9 +22,6 @@
</span><span class="cx"> import sys
</span><span class="cx"> import tempfile
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild"))
-import jhbuildrc_common
-
</del><span class="cx"> def should_update_symbols_file(new, old):
</span><span class="cx"> if not os.path.exists(old):
</span><span class="cx"> return False
</span><span class="lines">@@ -52,7 +49,7 @@
</span><span class="cx"> tmp.write(file_handle.read())
</span><span class="cx"> tmp.flush()
</span><span class="cx">
</span><del>- gdom_source_path = jhbuildrc_common.top_level_path('Source', 'WebCore', 'bindings')
</del><ins>+ gdom_source_path = common.top_level_path('Source', 'WebCore', 'bindings')
</ins><span class="cx"> api_break_test_path = os.path.join(gdom_source_path, 'scripts', 'gobject-run-api-break-test')
</span><span class="cx"> subprocess.call([sys.executable, api_break_test_path, os.path.join(gdom_source_path, 'gobject', 'webkitdom.symbols'), tmp.name])
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsgtkcommonpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py (168710 => 168711)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py 2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/common.py 2014-05-13 19:29:34 UTC (rev 168711)
</span><span class="lines">@@ -21,9 +21,7 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild"))
-import jhbuildrc_common
-
</del><ins>+top_level_dir = None
</ins><span class="cx"> build_dir = None
</span><span class="cx"> library_build_dir = None
</span><span class="cx"> tests_library_build_dir = None
</span><span class="lines">@@ -31,6 +29,13 @@
</span><span class="cx"> build_types = ('Release', 'Debug')
</span><span class="cx">
</span><span class="cx">
</span><ins>+def top_level_path(*args):
+ global top_level_dir
+ if not top_level_dir:
+ top_level_dir = os.path.join(os.path.dirname(__file__), '..', '..')
+ return os.path.join(*(top_level_dir,) + args)
+
+
</ins><span class="cx"> def set_build_types(new_build_types):
</span><span class="cx"> global build_types
</span><span class="cx"> build_types = new_build_types
</span><span class="lines">@@ -100,20 +105,20 @@
</span><span class="cx">
</span><span class="cx"> global build_types
</span><span class="cx"> for build_type in build_types:
</span><del>- build_dir = jhbuildrc_common.top_level_path('WebKitBuild', build_type)
</del><ins>+ build_dir = top_level_path('WebKitBuild', build_type)
</ins><span class="cx"> if is_valid_build_directory(build_dir):
</span><span class="cx"> return build_dir
</span><span class="cx">
</span><span class="cx"> # distcheck builds in a directory named _build in the top-level path.
</span><del>- build_dir = jhbuildrc_common.top_level_path("_build")
</del><ins>+ build_dir = top_level_path("_build")
</ins><span class="cx"> if is_valid_build_directory(build_dir):
</span><span class="cx"> return build_dir
</span><span class="cx">
</span><del>- build_dir = jhbuildrc_common.top_level_path()
</del><ins>+ build_dir = top_level_path()
</ins><span class="cx"> if is_valid_build_directory(build_dir):
</span><span class="cx"> return build_dir
</span><span class="cx">
</span><del>- build_dir = jhbuildrc_common.top_level_path("WebKitBuild")
</del><ins>+ build_dir = top_level_path("WebKitBuild")
</ins><span class="cx"> if is_valid_build_directory(build_dir):
</span><span class="cx"> return build_dir
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsgtkfindmakedisterrors"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/find-make-dist-errors (168710 => 168711)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/gtk/find-make-dist-errors 2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/find-make-dist-errors 2014-05-13 19:29:34 UTC (rev 168711)
</span><span class="lines">@@ -20,9 +20,6 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild"))
-import jhbuildrc_common
-
</del><span class="cx"> def is_source_file_listing(line):
</span><span class="cx"> return line.strip().startswith('Source')
</span><span class="cx">
</span><span class="lines">@@ -89,7 +86,7 @@
</span><span class="cx"> def get_missing_headers(listed_makefile_headers):
</span><span class="cx"> missing = set()
</span><span class="cx"> for header in listed_makefile_headers:
</span><del>- if not os.path.exists(jhbuildrc_common.top_level_path(header)):
</del><ins>+ if not os.path.exists(common.top_level_path(header)):
</ins><span class="cx"> missing.add(header)
</span><span class="cx"> return missing
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsgtkgenerateinspectorgresourcemanifestpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py (168710 => 168711)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py 2014-05-13 19:29:19 UTC (rev 168710)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/generate-inspector-gresource-manifest.py 2014-05-13 19:29:34 UTC (rev 168711)
</span><span class="lines">@@ -20,10 +20,7 @@
</span><span class="cx"> import os
</span><span class="cx"> import sys
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild"))
-import jhbuildrc_common
-
-resources_path = jhbuildrc_common.top_level_path() + "/Source/WebInspectorUI/"
</del><ins>+resources_path = common.top_level_path() + "/Source/WebInspectorUI/"
</ins><span class="cx"> inspector_files = \
</span><span class="cx"> glob.glob(resources_path + 'UserInterface/*.html') + \
</span><span class="cx"> glob.glob(resources_path + 'UserInterface/*.js') + \
</span></span></pre>
</div>
</div>
</body>
</html>