<!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>[163539] 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/163539">163539</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-06 09:49:32 -0800 (Thu, 06 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/163530">r163530</a>.
http://trac.webkit.org/changeset/163530
https://bugs.webkit.org/show_bug.cgi?id=128311
It broke run-gtk-tests (Requested by Ossy on #webkit).
* efl/common.py: Copied from Tools/gtk/jhbuildrc.
(script_path):
(top_level_path):
* efl/jhbuildrc:
* gtk/common.py:
(script_path):
(top_level_path):
* gtk/find-make-dist-errors:
(get_missing_headers):
* gtk/generate-gtkdoc:
(get_webkit2_options):
(get_webkit1_options.src_path):
(get_webkit1_options):
(get_webkitdom_options.src_path):
(get_webkitdom_options):
* gtk/generate-inspector-gresource-manifest.py:
* gtk/jhbuildrc:
* jhbuild/jhbuildrc_common.py: Removed.
* nix/common.py: Copied from Tools/nix/jhbuildrc.
(script_path):
(top_level_path):
* nix/jhbuildrc:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsefljhbuildrc">trunk/Tools/efl/jhbuildrc</a></li>
<li><a href="#trunkToolsgtkcommonpy">trunk/Tools/gtk/common.py</a></li>
<li><a href="#trunkToolsgtkfindmakedisterrors">trunk/Tools/gtk/find-make-dist-errors</a></li>
<li><a href="#trunkToolsgtkgenerategtkdoc">trunk/Tools/gtk/generate-gtkdoc</a></li>
<li><a href="#trunkToolsgtkgenerateinspectorgresourcemanifestpy">trunk/Tools/gtk/generate-inspector-gresource-manifest.py</a></li>
<li><a href="#trunkToolsgtkjhbuildrc">trunk/Tools/gtk/jhbuildrc</a></li>
<li><a href="#trunkToolsnixjhbuildrc">trunk/Tools/nix/jhbuildrc</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolseflcommonpy">trunk/Tools/efl/common.py</a></li>
<li><a href="#trunkToolsnixcommonpy">trunk/Tools/nix/common.py</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkToolsjhbuildjhbuildrc_commonpy">trunk/Tools/jhbuild/jhbuildrc_common.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/ChangeLog 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-06 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r163530.
+ http://trac.webkit.org/changeset/163530
+ https://bugs.webkit.org/show_bug.cgi?id=128311
+
+ It broke run-gtk-tests (Requested by Ossy on #webkit).
+
+ * efl/common.py: Copied from Tools/gtk/jhbuildrc.
+ (script_path):
+ (top_level_path):
+ * efl/jhbuildrc:
+ * gtk/common.py:
+ (script_path):
+ (top_level_path):
+ * gtk/find-make-dist-errors:
+ (get_missing_headers):
+ * gtk/generate-gtkdoc:
+ (get_webkit2_options):
+ (get_webkit1_options.src_path):
+ (get_webkit1_options):
+ (get_webkitdom_options.src_path):
+ (get_webkitdom_options):
+ * gtk/generate-inspector-gresource-manifest.py:
+ * gtk/jhbuildrc:
+ * jhbuild/jhbuildrc_common.py: Removed.
+ * nix/common.py: Copied from Tools/nix/jhbuildrc.
+ (script_path):
+ (top_level_path):
+ * nix/jhbuildrc:
+
</ins><span class="cx"> 2014-02-06 Denis Nomiyama <d.nomiyama@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Add myself as a committer.
</span></span></pre></div>
<a id="trunkToolseflcommonpyfromrev163538trunkToolsgtkjhbuildrc"></a>
<div class="copfile"><h4>Copied: trunk/Tools/efl/common.py (from rev 163538, trunk/Tools/gtk/jhbuildrc) (0 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/common.py (rev 0)
+++ trunk/Tools/efl/common.py 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+#!/usr/bin/env python
+# Copyright (C) 2011 Igalia S.L.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+
+script_dir = None
+
+
+def script_path(*args):
+ global script_dir
+ if not script_dir:
+ script_dir = os.path.join(os.path.dirname(__file__), '..', 'Scripts')
+ return os.path.join(*(script_dir,) + args)
+
+
+def top_level_path(*args):
+ return os.path.join(*((script_path('..', '..'),) + args))
</ins></span></pre></div>
<a id="trunkToolsefljhbuildrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/efl/jhbuildrc (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/efl/jhbuildrc 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/efl/jhbuildrc 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -16,10 +16,38 @@
</span><span class="cx"> # License along with this library; if not, write to the Free Software
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild") )
-import jhbuildrc_common
-jhbuildrc_common.init(globals(), "efl")
</del><ins>+import multiprocessing
+import sys
</ins><span class="cx">
</span><ins>+__efl_tools_directory = os.path.abspath(os.path.dirname(__file__))
+sys.path = [__efl_tools_directory] + sys.path
+import common
+
+build_policy = 'updated'
+
+# FIXME: move shared parts into ../jhbuild folder.
+
+__moduleset_file_uri = 'file://' + os.path.join(__efl_tools_directory, 'jhbuild.modules')
+__extra_modulesets = os.environ.get("WEBKIT_EXTRA_MODULESETS", "").split(",")
+moduleset = [ __moduleset_file_uri, ]
+if __extra_modulesets != ['']:
+ moduleset.extend(__extra_modulesets)
+
+__extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
+modules = [ 'webkitefl-testing-dependencies', ]
+if __extra_modules != ['']:
+ modules.extend(__extra_modules)
+
+if os.environ.has_key('WEBKIT_OUTPUTDIR'):
+ checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Source'))
+ prefix = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Root'))
+else:
+ checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
+ prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
+
+nonotify = True
+notrayicon = True
+
</ins><span class="cx"> if 'NUMBER_OF_PROCESSORS' in os.environ:
</span><span class="cx"> jobs = os.environ['NUMBER_OF_PROCESSORS']
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkcommonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/common.py (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/common.py 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/gtk/common.py 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import sys
</span><span class="cx">
</span><ins>+script_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">@@ -70,6 +71,17 @@
</span><span class="cx"> return library_build_dir
</span><span class="cx">
</span><span class="cx">
</span><ins>+def script_path(*args):
+ global script_dir
+ if not script_dir:
+ script_dir = os.path.join(os.path.dirname(__file__), '..', 'Scripts')
+ return os.path.join(*(script_dir,) + args)
+
+
+def top_level_path(*args):
+ return os.path.join(*((os.path.join(os.path.dirname(__file__), '..', '..'),) + args))
+
+
</ins><span class="cx"> def get_build_path(fatal=True):
</span><span class="cx"> global build_dir
</span><span class="cx"> if build_dir:
</span></span></pre></div>
<a id="trunkToolsgtkfindmakedisterrors"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/find-make-dist-errors (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/find-make-dist-errors 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/gtk/find-make-dist-errors 2014-02-06 17:49:32 UTC (rev 163539)
</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="trunkToolsgtkgenerategtkdoc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/generate-gtkdoc (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/generate-gtkdoc 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/gtk/generate-gtkdoc 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -22,9 +22,6 @@
</span><span class="cx"> import os.path
</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 configure_logging():
</span><span class="cx"> level = logging.DEBUG if '-v' in sys.argv else logging.INFO
</span><span class="cx"> logger = logging.getLogger('gtkdoc')
</span><span class="lines">@@ -79,8 +76,8 @@
</span><span class="cx"> return common.build_path('Documentation', 'webkitdomgtk', 'html')
</span><span class="cx">
</span><span class="cx"> def get_webkit2_options():
</span><del>- api_path = jhbuildrc_common.top_level_path('Source', 'WebKit2', 'UIProcess', 'API', 'gtk')
- injected_bundle_api_path = jhbuildrc_common.top_level_path('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk')
</del><ins>+ api_path = common.top_level_path('Source', 'WebKit2', 'UIProcess', 'API', 'gtk')
+ injected_bundle_api_path = common.top_level_path('Source', 'WebKit2', 'WebProcess', 'InjectedBundle', 'API', 'gtk')
</ins><span class="cx">
</span><span class="cx"> if common.is_cmake_build():
</span><span class="cx"> generated_api_path = common.build_path('DerivedSources', 'webkit2gtk', 'webkit2')
</span><span class="lines">@@ -104,7 +101,7 @@
</span><span class="cx"> 'source_dirs' : [src_path(), generated_api_path, injected_bundle_api_path],
</span><span class="cx"> 'cflags' :
</span><span class="cx"> # Common paths
</span><del>- ' -I' + jhbuildrc_common.top_level_path('Source') + \
</del><ins>+ ' -I' + common.top_level_path('Source') + \
</ins><span class="cx"> ' -I' + api_path + \
</span><span class="cx"> # Autotools paths
</span><span class="cx"> ' -I' + common.build_path('DerivedSources', 'webkit2gtk', 'include') + \
</span><span class="lines">@@ -130,7 +127,7 @@
</span><span class="cx">
</span><span class="cx"> def get_webkit1_options(gtk_version):
</span><span class="cx"> def src_path(*args):
</span><del>- return jhbuildrc_common.top_level_path(*(('Source', 'WebKit', 'gtk') + args))
</del><ins>+ return common.top_level_path(*(('Source', 'WebKit', 'gtk') + args))
</ins><span class="cx">
</span><span class="cx"> def webkitversionh_path():
</span><span class="cx"> if common.is_cmake_build():
</span><span class="lines">@@ -158,8 +155,8 @@
</span><span class="cx"> 'cflags' : ' -I' + common.build_path('WebKit', 'gtk') + \
</span><span class="cx"> ' -I' + common.build_path('DerivedSources') + \
</span><span class="cx"> ' -I' + src_path() + \
</span><del>- ' -I' + jhbuildrc_common.top_level_path('Source') + \
- ' -I' + jhbuildrc_common.top_level_path('Source', 'JavaScriptCore', 'ForwardingHeaders'),
</del><ins>+ ' -I' + common.top_level_path('Source') + \
+ ' -I' + common.top_level_path('Source', 'JavaScriptCore', 'ForwardingHeaders'),
</ins><span class="cx"> 'cross_reference_deps' : get_gtkdoc_module_paths(xref_deps) + [webkitdom_docs_html_path()],
</span><span class="cx"> 'ignored_files': glob.glob(src_path('webkit', '*private.*')) + \
</span><span class="cx"> glob.glob(src_path('webkit', 'webkitauthenticationdialog.*')) + \
</span><span class="lines">@@ -171,7 +168,7 @@
</span><span class="cx"> def derived_sources_path(*args):
</span><span class="cx"> return common.build_path(*(('DerivedSources', 'webkitdom') + args))
</span><span class="cx"> def src_path(*args):
</span><del>- return jhbuildrc_common.top_level_path(*(('Source', 'WebCore', 'bindings', 'gobject') + args))
</del><ins>+ return common.top_level_path(*(('Source', 'WebCore', 'bindings', 'gobject') + args))
</ins><span class="cx">
</span><span class="cx"> xref_deps = { 'glib-2.0' : ['glib', 'gobject', 'gio'] }
</span><span class="cx">
</span><span class="lines">@@ -184,7 +181,7 @@
</span><span class="cx"> 'source_dirs' : [derived_sources_path()],
</span><span class="cx"> 'cflags' : ' -I' + derived_sources_path() + \
</span><span class="cx"> ' -I' + src_path() + \
</span><del>- ' -I' + jhbuildrc_common.top_level_path('Source'),
</del><ins>+ ' -I' + common.top_level_path('Source'),
</ins><span class="cx"> 'cross_reference_deps' : get_gtkdoc_module_paths(xref_deps),
</span><span class="cx"> 'ignored_files': glob.glob(derived_sources_path('*Private.h'))
</span><span class="cx"> })
</span></span></pre></div>
<a id="trunkToolsgtkgenerateinspectorgresourcemanifestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/generate-inspector-gresource-manifest.py (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/gtk/generate-inspector-gresource-manifest.py 2014-02-06 17:49:32 UTC (rev 163539)
</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>
<a id="trunkToolsgtkjhbuildrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuildrc (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuildrc 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/gtk/jhbuildrc 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -15,14 +15,36 @@
</span><span class="cx"> # License along with this library; if not, write to the Free Software
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild") )
-import jhbuildrc_common
-jhbuildrc_common.init(globals(), "gtk")
</del><ins>+import multiprocessing
+import sys
</ins><span class="cx">
</span><span class="cx"> __gtk_tools_directory = os.path.abspath(os.path.dirname(__file__))
</span><span class="cx"> sys.path = [__gtk_tools_directory] + sys.path
</span><span class="cx"> import common
</span><span class="cx">
</span><ins>+build_policy = 'updated'
+
+__moduleset_file_uri = 'file://' + os.path.join(__gtk_tools_directory, 'jhbuild.modules')
+__extra_modulesets = os.environ.get("WEBKIT_EXTRA_MODULESETS", "").split(",")
+moduleset = [ __moduleset_file_uri, ]
+if __extra_modulesets != ['']:
+ moduleset.extend(__extra_modulesets)
+
+__extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
+modules = [ 'webkitgtk-testing-dependencies', ]
+if __extra_modules != ['']:
+ modules.extend(__extra_modules)
+
+if os.environ.has_key('WEBKIT_OUTPUTDIR'):
+ checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Source'))
+ prefix = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Root'))
+else:
+ checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
+ prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
+
+nonotify = True
+notrayicon = True
+
</ins><span class="cx"> if 'NUMBER_OF_PROCESSORS' in os.environ:
</span><span class="cx"> jobs = os.environ['NUMBER_OF_PROCESSORS']
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsjhbuildjhbuildrc_commonpy"></a>
<div class="delfile"><h4>Deleted: trunk/Tools/jhbuild/jhbuildrc_common.py (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jhbuild/jhbuildrc_common.py 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/jhbuild/jhbuildrc_common.py 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -1,64 +0,0 @@
</span><del>-#!/usr/bin/env python
-# Copyright (C) 2011 Igalia S.L.
-# Copyright (C) 2012 Intel Corporation
-# Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-import multiprocessing
-import sys
-import os
-
-script_dir = None
-
-
-def script_path(*args):
- global script_dir
- if not script_dir:
- script_dir = os.path.join(os.path.dirname(__file__), '..', 'Scripts')
- return os.path.join(*(script_dir,) + args)
-
-
-def top_level_path(*args):
- return os.path.join(*((os.path.join(os.path.dirname(__file__), '..', '..'),) + args))
-
-
-def init(jhbuildrc_globals, platform):
-
- __tools_directory = os.path.join(os.path.dirname(__file__), "../", platform)
- sys.path.insert(0, __tools_directory)
-
- jhbuildrc_globals["build_policy"] = 'updated'
-
- __moduleset_file_uri = 'file://' + os.path.join(__tools_directory, 'jhbuild.modules')
- __extra_modulesets = os.environ.get("WEBKIT_EXTRA_MODULESETS", "").split(",")
- jhbuildrc_globals["moduleset"] = [__moduleset_file_uri, ]
- if __extra_modulesets != ['']:
- jhbuildrc_globals["moduleset"].extend(__extra_modulesets)
-
- __extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
- jhbuildrc_globals["modules"] = ['webkit' + platform + '-testing-dependencies', ]
- if __extra_modules != ['']:
- jhbuildrc_globals["modules"].extend(__extra_modules)
-
- if 'WEBKIT_OUTPUTDIR' in os.environ:
- jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Source'))
- jhbuildrc_globals["prefix"] = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Root'))
- else:
- jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Source'))
- jhbuildrc_globals["prefix"] = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Root'))
-
- jhbuildrc_globals["nonotify"] = True
- jhbuildrc_globals["notrayicon"] = True
</del></span></pre></div>
<a id="trunkToolsnixcommonpyfromrev163538trunkToolsnixjhbuildrc"></a>
<div class="copfile"><h4>Copied: trunk/Tools/nix/common.py (from rev 163538, trunk/Tools/nix/jhbuildrc) (0 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/nix/common.py (rev 0)
+++ trunk/Tools/nix/common.py 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+#!/usr/bin/env python
+# Copyright (C) 2011 Igalia S.L.
+# Copyright (C) 2012, 2013 Nokia Corporation and/or its subsidiary(-ies).
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+import os
+
+script_dir = None
+
+
+def script_path(*args):
+ global script_dir
+ if not script_dir:
+ script_dir = os.path.join(os.path.dirname(__file__), '..', 'Scripts')
+ return os.path.join(*(script_dir,) + args)
+
+
+def top_level_path(*args):
+ return os.path.join(*((script_path('..', '..'),) + args))
</ins></span></pre></div>
<a id="trunkToolsnixjhbuildrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/nix/jhbuildrc (163538 => 163539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/nix/jhbuildrc 2014-02-06 17:42:12 UTC (rev 163538)
+++ trunk/Tools/nix/jhbuildrc 2014-02-06 17:49:32 UTC (rev 163539)
</span><span class="lines">@@ -17,10 +17,38 @@
</span><span class="cx"> # License along with this library; if not, write to the Free Software
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx">
</span><del>-sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild") )
-import jhbuildrc_common
-jhbuildrc_common.init(globals(), "nix")
</del><ins>+import multiprocessing
+import sys
+import os
</ins><span class="cx">
</span><ins>+__nix_tools_directory = os.path.abspath(os.path.dirname(__file__))
+sys.path = [__nix_tools_directory] + sys.path
+import common
+
+build_policy = 'updated'
+
+# FIXME: move shared parts into ../jhbuild folder.
+
+__moduleset_file_uri = 'file://' + os.path.join(__nix_tools_directory, 'jhbuild.modules')
+__extra_modulesets = os.environ.get("WEBKIT_EXTRA_MODULESETS", "").split(",")
+moduleset = [ __moduleset_file_uri, ]
+if __extra_modulesets != ['']:
+ moduleset.extend(__extra_modulesets)
+
+__extra_modules = os.environ.get("WEBKIT_EXTRA_MODULES", "").split(",")
+modules = [ 'webkitnix-testing-dependencies', ]
+if __extra_modules != ['']:
+ modules.extend(__extra_modules)
+
+if os.environ.has_key('WEBKIT_OUTPUTDIR'):
+ checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Source'))
+ prefix = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies', 'Root'))
+else:
+ checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
+ prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
+
+nonotify = True
+notrayicon = True
</ins><span class="cx"> if 'MAKEFLAGS' not in os.environ:
</span><span class="cx"> os.environ['MAKEFLAGS'] = '-j%d' % multiprocessing.cpu_count()
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>