<!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>[192683] 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/192683">192683</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2015-11-20 06:41:50 -0800 (Fri, 20 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] install-dependencies should run installer exactly once
https://bugs.webkit.org/show_bug.cgi?id=151477
Reviewed by Carlos Garcia Campos.
* gtk/install-dependencies:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkinstalldependencies">trunk/Tools/gtk/install-dependencies</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (192682 => 192683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-11-20 11:38:10 UTC (rev 192682)
+++ trunk/Tools/ChangeLog 2015-11-20 14:41:50 UTC (rev 192683)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-11-20 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [GTK] install-dependencies should run installer exactly once
+ https://bugs.webkit.org/show_bug.cgi?id=151477
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/install-dependencies:
+
</ins><span class="cx"> 2015-11-20 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Enable FTL JIT by default on X86_64
</span></span></pre></div>
<a id="trunkToolsgtkinstalldependencies"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/install-dependencies (192682 => 192683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/install-dependencies 2015-11-20 11:38:10 UTC (rev 192682)
+++ trunk/Tools/gtk/install-dependencies 2015-11-20 14:41:50 UTC (rev 192683)
</span><span class="lines">@@ -22,20 +22,13 @@
</span><span class="cx"> exit 0
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- # dnf - Fedora 22 and above
</del><ins>+ # dnf - Fedora
</ins><span class="cx"> dnf --version &> /dev/null
</span><span class="cx"> if [ $? -eq 0 ]; then
</span><del>- installFedoraDependencies dnf
</del><ins>+ installDependenciesWithDnf
</ins><span class="cx"> exit 0
</span><span class="cx"> fi
</span><span class="cx">
</span><del>- # yum - Fedora 21 and below
- yum --version &> /dev/null
- if [ $? -eq 0 ]; then
- installFedoraDependencies yum
- exit 0
- fi
-
</del><span class="cx"> # pacman - Arch Linux
</span><span class="cx"> # pacman --version and pacman --help both return non-0
</span><span class="cx"> pacman -Ss &> /dev/null
</span><span class="lines">@@ -49,7 +42,7 @@
</span><span class="cx">
</span><span class="cx"> function installDependenciesWithApt {
</span><span class="cx"> # These are dependencies necessary for building WebKitGTK+.
</span><del>- apt-get install \
</del><ins>+ packages=" \
</ins><span class="cx"> autoconf \
</span><span class="cx"> automake \
</span><span class="cx"> autopoint \
</span><span class="lines">@@ -100,10 +93,10 @@
</span><span class="cx"> libxtst-dev \
</span><span class="cx"> libwayland-dev \
</span><span class="cx"> ruby \
</span><del>- xfonts-utils
</del><ins>+ xfonts-utils"
</ins><span class="cx">
</span><span class="cx"> # These are dependencies necessary for running tests.
</span><del>- apt-get install \
</del><ins>+ packages="$packages \
</ins><span class="cx"> apache2 \
</span><span class="cx"> curl \
</span><span class="cx"> dbus-x11 \
</span><span class="lines">@@ -115,10 +108,10 @@
</span><span class="cx"> ruby \
</span><span class="cx"> ruby-json \
</span><span class="cx"> ruby-highline \
</span><del>- xvfb
</del><ins>+ xvfb"
</ins><span class="cx">
</span><span class="cx"> # These are dependencies necessary for building the jhbuild.
</span><del>- apt-get install \
</del><ins>+ packages="$packages \
</ins><span class="cx"> git \
</span><span class="cx"> gobject-introspection \
</span><span class="cx"> icon-naming-utils \
</span><span class="lines">@@ -153,16 +146,14 @@
</span><span class="cx"> x11proto-xf86dri-dev \
</span><span class="cx"> xfonts-utils \
</span><span class="cx"> xtrans-dev \
</span><del>- xutils-dev
</del><ins>+ xutils-dev"
</ins><span class="cx">
</span><span class="cx"> # These are dependencies necessary for using webkit-patch
</span><del>- apt-get install \
</del><ins>+ packages="$packages \
</ins><span class="cx"> git-svn \
</span><del>- subversion
</del><ins>+ subversion"
</ins><span class="cx">
</span><del>- # ninja is a faster build system than GNU make, but it doesn't
- # exist on Ubuntu 12.04
- apt-get install ninja-build || true
</del><ins>+ apt-get install $packages
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function installDependenciesWithPacman {
</span><span class="lines">@@ -297,9 +288,9 @@
</span><span class="cx"> echo "https://wiki.archlinux.org/index.php/Python#Dealing_with_version_problem_in_build_scripts"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function installFedoraDependencies {
</del><ins>+function installDependenciesWithDnf {
</ins><span class="cx"> # These are dependencies necessary for building WebKitGTK+.
</span><del>- $1 install \
</del><ins>+ packages=" \
</ins><span class="cx"> atk-devel \
</span><span class="cx"> autoconf \
</span><span class="cx"> automake \
</span><span class="lines">@@ -351,10 +342,10 @@
</span><span class="cx"> python-devel \
</span><span class="cx"> orc-devel \
</span><span class="cx"> ruby \
</span><del>- sqlite-devel
</del><ins>+ sqlite-devel"
</ins><span class="cx">
</span><span class="cx"> # These are dependencies necessary for running tests.
</span><del>- $1 install \
</del><ins>+ packages="$packages \
</ins><span class="cx"> curl \
</span><span class="cx"> dbus-x11 \
</span><span class="cx"> hunspell-en \
</span><span class="lines">@@ -369,10 +360,10 @@
</span><span class="cx"> ruby \
</span><span class="cx"> rubygem-json \
</span><span class="cx"> rubygem-highline \
</span><del>- xorg-x11-server-Xvfb
</del><ins>+ xorg-x11-server-Xvfb"
</ins><span class="cx">
</span><span class="cx"> # These are dependencies necessary for building the jhbuild.
</span><del>- $1 install \
</del><ins>+ packages="$packages \
</ins><span class="cx"> docbook-utils \
</span><span class="cx"> docbook-utils-pdf \
</span><span class="cx"> git \
</span><span class="lines">@@ -393,12 +384,14 @@
</span><span class="cx"> xorg-x11-font-utils \
</span><span class="cx"> xorg-x11-proto-devel \
</span><span class="cx"> xorg-x11-util-macros \
</span><del>- xorg-x11-xtrans-devel
</del><ins>+ xorg-x11-xtrans-devel"
</ins><span class="cx">
</span><span class="cx"> # These are dependencies necessary for using webkit-patch
</span><del>- $1 install \
</del><ins>+ packages="$packages
</ins><span class="cx"> git-svn \
</span><del>- subversion
</del><ins>+ subversion"
+
+ dnf install $packages
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> checkInstaller
</span></span></pre>
</div>
</div>
</body>
</html>