<!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>[168723] 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/168723">168723</a></dd>
<dt>Author</dt> <dd>gns@gnome.org</dd>
<dt>Date</dt> <dd>2014-05-13 12:32:18 -0700 (Tue, 13 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 165452 - [GTK] The jhbuild environment should set CMAKE_PREFIX_PATH and CMAKE_LIBRARY_PATH
https://bugs.webkit.org/show_bug.cgi?id=130064
Reviewed by Philippe Normand.
* efl/jhbuildrc: Remove duplicated code.
* gtk/jhbuildrc: Remove duplicated code.
* jhbuild/jhbuildrc_common.py:
(init): Move duplicated code from jhbuildrc's and extend setting CMake environment variables to
GTK+. We always set the CMAKE_LIBRARY_PATH, which should be harmless for EFL 32-bit systems.
and is apparently necessary for GTK+.
Conflicts:
Tools/ChangeLog</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24Toolsefljhbuildrc">releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsgtkjhbuildrc">releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc</a></li>
<li><a href="#releasesWebKitGTKwebkit24Toolsjhbuildjhbuildrc_commonpy">releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24Toolsefljhbuildrc"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc (168722 => 168723)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc 2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/efl/jhbuildrc 2014-05-13 19:32:18 UTC (rev 168723)
</span><span class="lines">@@ -22,33 +22,7 @@
</span><span class="cx"> import jhbuildrc_common
</span><span class="cx"> jhbuildrc_common.init(globals(), "efl")
</span><span class="cx">
</span><del>-if 'NUMBER_OF_PROCESSORS' in os.environ:
- jobs = os.environ['NUMBER_OF_PROCESSORS']
-
-# Use system libraries while building.
-if use_lib64:
- _libdir = 'lib64'
-else:
- _libdir = 'lib'
-addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _libdir, 'pkgconfig'))
-addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
-
</del><span class="cx"> addpath('XDG_DATA_DIRS', '/usr/share')
</span><span class="cx"> addpath('XDG_CONFIG_DIRS', '/etc/xdg')
</span><span class="cx">
</span><del>-addpath('CMAKE_PREFIX_PATH', prefix)
-
-# jhbuild installs libraries into lib64/ by default when building on
-# 64-bit Linux installations, while CMake does not look for libraries
-# in lib64/ if /etc/debian_version exists. For now we just pass the
-# lib64/ directory to the CMAKE_LIBRARY_PATH environment variable to
-# make sure the libraries installed by jhbuild are found by CMake on
-# Debian-based systems as well.
-if use_lib64:
- addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _libdir))
-
</del><span class="cx"> partial_build = False
</span><del>-
-# Avoid runtime conflicts with GStreamer system-wide plugins. We want
-# to use only the plugins we build in JHBuild.
-os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
</del></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsgtkjhbuildrc"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc (168722 => 168723)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc 2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/gtk/jhbuildrc 2014-05-13 19:32:18 UTC (rev 168723)
</span><span class="lines">@@ -25,16 +25,9 @@
</span><span class="cx"> sys.path = [__gtk_tools_directory] + sys.path
</span><span class="cx"> import common
</span><span class="cx">
</span><del>-if 'NUMBER_OF_PROCESSORS' in os.environ:
- jobs = os.environ['NUMBER_OF_PROCESSORS']
-
</del><span class="cx"> # GTK+ 3.0.12 misses the -lm flag when linking the tests.
</span><span class="cx"> module_makeargs['gtk+'] = 'LDFLAGS="-lm" ' + makeargs
</span><span class="cx">
</span><del>-# Avoid runtime conflicts with GStreamer system-wide plugins. We want
-# to use only the plugins we build in JHBuild.
-os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
-
</del><span class="cx"> # We always enable introspection so that we can sniff out problems with our
</span><span class="cx"> # annotations sooner rather than later.
</span><span class="cx"> autogenargs='--enable-introspection'
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24Toolsjhbuildjhbuildrc_commonpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py (168722 => 168723)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py 2014-05-13 19:32:04 UTC (rev 168722)
+++ releases/WebKitGTK/webkit-2.4/Tools/jhbuild/jhbuildrc_common.py 2014-05-13 19:32:18 UTC (rev 168723)
</span><span class="lines">@@ -62,3 +62,23 @@
</span><span class="cx">
</span><span class="cx"> jhbuildrc_globals["nonotify"] = True
</span><span class="cx"> jhbuildrc_globals["notrayicon"] = True
</span><ins>+
+ if 'NUMBER_OF_PROCESSORS' in os.environ:
+ jhbuildrc_globals['jobs'] = os.environ['NUMBER_OF_PROCESSORS']
+
+ # Avoid runtime conflicts with GStreamer system-wide plugins. We want
+ # to use only the plugins we build in JHBuild.
+ os.environ['GST_PLUGIN_SYSTEM_PATH'] = ''
+
+ # Use system libraries while building.
+ if jhbuildrc_globals['use_lib64']:
+ _library_dir = 'lib64'
+ else:
+ _library_dir = 'lib'
+ addpath = jhbuildrc_globals['addpath']
+ addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', _library_dir, 'pkgconfig'))
+ addpath('PKG_CONFIG_PATH', os.path.join(os.sep, 'usr', 'share', 'pkgconfig'))
+
+ prefix = jhbuildrc_globals['prefix']
+ addpath('CMAKE_PREFIX_PATH', prefix)
+ addpath('CMAKE_LIBRARY_PATH', os.path.join(prefix, _library_dir))
</ins></span></pre>
</div>
</div>
</body>
</html>