<!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>[175555] 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/175555">175555</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-04 11:05:42 -0800 (Tue, 04 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[jhbuild] Make it possible to build GTK/EFL in same repository
https://bugs.webkit.org/show_bug.cgi?id=137448
Patch by Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com> on 2014-11-04
Reviewed by Martin Robinson.
* Scripts/webkitdirs.pm:
(getJhbuildPath):
* WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp:
(getPlatformFontsPath):
* WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
(WTR::getFontsPath):
* jhbuild/jhbuild-wrapper:
(determine_platform):
(install_jhbuild):
* jhbuild/jhbuildrc_common.py:
(init):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitdirspm">trunk/Tools/Scripts/webkitdirs.pm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleeflFontManagementcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlegtkActivateFontsGtkcpp">trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp</a></li>
<li><a href="#trunkToolsjhbuildjhbuildwrapper">trunk/Tools/jhbuild/jhbuild-wrapper</a></li>
<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 (175554 => 175555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-04 19:05:07 UTC (rev 175554)
+++ trunk/Tools/ChangeLog 2014-11-04 19:05:42 UTC (rev 175555)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-11-04 Tibor Meszaros <tmeszaros.u-szeged@partner.samsung.com>
+
+ [jhbuild] Make it possible to build GTK/EFL in same repository
+ https://bugs.webkit.org/show_bug.cgi?id=137448
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitdirs.pm:
+ (getJhbuildPath):
+ * WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp:
+ (getPlatformFontsPath):
+ * WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp:
+ (WTR::getFontsPath):
+ * jhbuild/jhbuild-wrapper:
+ (determine_platform):
+ (install_jhbuild):
+ * jhbuild/jhbuildrc_common.py:
+ (init):
+
</ins><span class="cx"> 2014-11-04 Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Bump LLVM to version 3.5.0
</span></span></pre></div>
<a id="trunkToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitdirs.pm (175554 => 175555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitdirs.pm 2014-11-04 19:05:07 UTC (rev 175554)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-11-04 19:05:42 UTC (rev 175555)
</span><span class="lines">@@ -1636,7 +1636,13 @@
</span><span class="cx"> if (isGit() && isGitBranchBuild() && gitBranch()) {
</span><span class="cx"> pop(@jhbuildPath);
</span><span class="cx"> }
</span><del>- push(@jhbuildPath, "Dependencies");
</del><ins>+ if (isEfl()) {
+ push(@jhbuildPath, "DependenciesEFL");
+ } elsif (isGtk()) {
+ push(@jhbuildPath, "DependenciesGTK");
+ } else {
+ die "Cannot get JHBuild path for platform that isn't GTK+ or EFL.\n";
+ }
</ins><span class="cx"> return File::Spec->catdir(@jhbuildPath);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleeflFontManagementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp (175554 => 175555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp 2014-11-04 19:05:07 UTC (rev 175554)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/efl/FontManagement.cpp 2014-11-04 19:05:42 UTC (rev 175555)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> {
</span><span class="cx"> CString customBuildDir = getCustomBuildDir();
</span><span class="cx"> if (!customBuildDir.isNull()) {
</span><del>- CString fontsPath = buildPath(customBuildDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", 0);
</del><ins>+ CString fontsPath = buildPath(customBuildDir.data(), "DependenciesEFL", "Root", "webkitgtk-test-fonts", 0);
</ins><span class="cx"> if (!ecore_file_exists(fontsPath.data()))
</span><span class="cx"> fprintf(stderr, "WEBKIT_OUTPUTDIR set to '%s', but could not local test fonts.\n", customBuildDir.data());
</span><span class="cx"> return fontsPath;
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlegtkActivateFontsGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp (175554 => 175555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2014-11-04 19:05:07 UTC (rev 175554)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/gtk/ActivateFontsGtk.cpp 2014-11-04 19:05:42 UTC (rev 175555)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> static CString getFontsPath()
</span><span class="cx"> {
</span><span class="cx"> CString webkitOutputDir = getOutputDir();
</span><del>- GUniquePtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "Dependencies", "Root", "webkitgtk-test-fonts", nullptr));
</del><ins>+ GUniquePtr<char> fontsPath(g_build_filename(webkitOutputDir.data(), "DependenciesGTK", "Root", "webkitgtk-test-fonts", nullptr));
</ins><span class="cx"> if (g_file_test(fontsPath.get(), static_cast<GFileTest>(G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR)))
</span><span class="cx"> return fontsPath.get();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsjhbuildjhbuildwrapper"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jhbuild/jhbuild-wrapper (175554 => 175555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jhbuild/jhbuild-wrapper 2014-11-04 19:05:07 UTC (rev 175554)
+++ trunk/Tools/jhbuild/jhbuild-wrapper 2014-11-04 19:05:42 UTC (rev 175555)
</span><span class="lines">@@ -26,9 +26,21 @@
</span><span class="cx">
</span><span class="cx"> jhbuild_revision = 'c0cb46177d79189ffe0f760703c732f1c7ea8b29'
</span><span class="cx">
</span><ins>+def determine_platform():
+ if '--efl' in sys.argv:
+ return "efl";
+ if '--gtk' in sys.argv:
+ return "gtk";
+ raise ValueError('No platform specified for jhbuild-wrapper.')
+
+try:
+ platform = determine_platform()
+except ValueError as e:
+ sys.exit(e)
+
</ins><span class="cx"> dependencies_path = jhbuildutils.get_dependencies_path()
</span><del>-installation_prefix = os.path.abspath(os.path.join(dependencies_path, 'Root'))
-source_path = os.path.abspath(os.path.join(dependencies_path, 'Source'))
</del><ins>+installation_prefix = os.path.abspath(os.path.join(dependencies_path + platform.upper(), 'Root'))
+source_path = os.path.abspath(os.path.join(dependencies_path + platform.upper(), 'Source'))
</ins><span class="cx"> jhbuild_source_path = os.path.join(source_path, 'jhbuild')
</span><span class="cx"> jhbuild_path = os.path.join(installation_prefix, 'bin', 'jhbuild')
</span><span class="cx">
</span><span class="lines">@@ -92,15 +104,6 @@
</span><span class="cx"> if process.returncode != 0:
</span><span class="cx"> raise Exception('jhbuild configure failed with return code: %i' % process.returncode)
</span><span class="cx">
</span><del>-
-def determine_platform():
- if '--efl' in sys.argv:
- return "efl";
- if '--gtk' in sys.argv:
- return "gtk";
- raise ValueError('No platform specified for jhbuild-wrapper.')
-
-
</del><span class="cx"> def ensure_jhbuild(platform):
</span><span class="cx"> if not jhbuild_cloned():
</span><span class="cx"> clone_jhbuild()
</span><span class="lines">@@ -116,10 +119,6 @@
</span><span class="cx"> if os.environ.has_key('UNDER_JHBUILD') and os.environ.has_key('ACLOCAL_FLAGS'):
</span><span class="cx"> del os.environ['ACLOCAL_FLAGS']
</span><span class="cx">
</span><del>-try:
- platform = determine_platform()
-except ValueError as e:
- sys.exit(e)
</del><span class="cx"> ensure_jhbuild(platform)
</span><span class="cx">
</span><span class="cx"> os.execve(jhbuild_path, [jhbuild_path, '--no-interact', '-f', jhbuildutils.get_config_file_for_platform(platform)] + sys.argv[2:], os.environ)
</span></span></pre></div>
<a id="trunkToolsjhbuildjhbuildrc_commonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/jhbuild/jhbuildrc_common.py (175554 => 175555)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/jhbuild/jhbuildrc_common.py 2014-11-04 19:05:07 UTC (rev 175554)
+++ trunk/Tools/jhbuild/jhbuildrc_common.py 2014-11-04 19:05:42 UTC (rev 175555)
</span><span class="lines">@@ -54,11 +54,11 @@
</span><span class="cx"> jhbuildrc_globals["modules"].extend(__extra_modules)
</span><span class="cx">
</span><span class="cx"> if 'WEBKIT_OUTPUTDIR' in os.environ:
</span><del>- 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'))
</del><ins>+ jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + platform.upper(), 'Source'))
+ jhbuildrc_globals["prefix"] = os.path.abspath(os.path.join(os.environ['WEBKIT_OUTPUTDIR'], 'Dependencies' + platform.upper(), 'Root'))
</ins><span class="cx"> else:
</span><del>- 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'))
</del><ins>+ jhbuildrc_globals["checkoutroot"] = checkoutroot = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + platform.upper(), 'Source'))
+ jhbuildrc_globals["prefix"] = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies' + platform.upper(), 'Root'))
</ins><span class="cx">
</span><span class="cx"> jhbuildrc_globals["nonotify"] = True
</span><span class="cx"> jhbuildrc_globals["notrayicon"] = True
</span></span></pre>
</div>
</div>
</body>
</html>