<!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>[279232] 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/279232">279232</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-06-24 09:44:47 -0700 (Thu, 24 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WPE] Uninstalled Cog now requires a COG_MODULEDIR environment variable
https://bugs.webkit.org/show_bug.cgi?id=227351

Patch by Philippe Normand <pnormand@igalia.com> on 2021-06-24
Reviewed by Adrian Perez de Castro.

Renamed the cog_path() method to cog_path_to() which requires a file_or_directory argument.
This is useful when setting the COG_MODULEDIR environment variable.

* Scripts/webkitpy/port/wpe.py:
(WPEPort.cog_path_to):
(WPEPort.browser_name):
(WPEPort.browser_env):
(WPEPort.run_minibrowser):
(WPEPort.cog_path): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportwpepy">trunk/Tools/Scripts/webkitpy/port/wpe.py</a></li>
<li><a href="#trunkToolsScriptswebkitpywebdriver_testswebdriver_driver_wpepy">trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_wpe.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (279231 => 279232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-06-24 16:29:20 UTC (rev 279231)
+++ trunk/Tools/ChangeLog       2021-06-24 16:44:47 UTC (rev 279232)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-06-24  Philippe Normand  <pnormand@igalia.com>
+
+        [WPE] Uninstalled Cog now requires a COG_MODULEDIR environment variable
+        https://bugs.webkit.org/show_bug.cgi?id=227351
+
+        Reviewed by Adrian Perez de Castro.
+
+        Renamed the cog_path() method to cog_path_to() which requires a file_or_directory argument.
+        This is useful when setting the COG_MODULEDIR environment variable.
+
+        * Scripts/webkitpy/port/wpe.py:
+        (WPEPort.cog_path_to):
+        (WPEPort.browser_name):
+        (WPEPort.browser_env):
+        (WPEPort.run_minibrowser):
+        (WPEPort.cog_path): Deleted.
+
</ins><span class="cx"> 2021-06-24  Martin Robinson  <mrobinson@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         [css-scroll-snap] Remove ENABLE_SCROLL_SNAP compile-time option
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportwpepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/wpe.py (279231 => 279232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/wpe.py 2021-06-24 16:29:20 UTC (rev 279231)
+++ trunk/Tools/Scripts/webkitpy/port/wpe.py    2021-06-24 16:44:47 UTC (rev 279232)
</span><span class="lines">@@ -149,8 +149,8 @@
</span><span class="cx">         configuration['platform'] = 'WPE'
</span><span class="cx">         return configuration
</span><span class="cx"> 
</span><del>-    def cog_path(self):
-        return self._build_path('Tools', 'cog-prefix', 'src', 'cog-build', 'cog')
</del><ins>+    def cog_path_to(self, file_or_directory):
+        return self._build_path('Tools', 'cog-prefix', 'src', 'cog-build', file_or_directory)
</ins><span class="cx"> 
</span><span class="cx">     def browser_name(self):
</span><span class="cx">         """Returns the lower case name of the browser to be used (Cog or MiniBrowser)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">         if browser:
</span><span class="cx">             print("Unknown browser {}. Defaulting to Cog and MiniBrowser selection".format(browser))
</span><span class="cx"> 
</span><del>-        if self._filesystem.isfile(self.cog_path()):
</del><ins>+        if self._filesystem.isfile(self.cog_path_to('cog')):
</ins><span class="cx">             return "cog"
</span><span class="cx">         return "minibrowser"
</span><span class="cx"> 
</span><span class="lines">@@ -173,6 +173,7 @@
</span><span class="cx"> 
</span><span class="cx">         if self.browser_name() == "cog":
</span><span class="cx">             env.update({'WEBKIT_EXEC_PATH': self._build_path('bin'),
</span><ins>+                        'COG_MODULEDIR': self.cog_path_to('modules'),
</ins><span class="cx">                         'WEBKIT_INJECTED_BUNDLE_PATH': self._build_path('lib')})
</span><span class="cx"> 
</span><span class="cx">         return env
</span><span class="lines">@@ -182,7 +183,7 @@
</span><span class="cx">         miniBrowser = None
</span><span class="cx"> 
</span><span class="cx">         if self.browser_name() == "cog":
</span><del>-            miniBrowser = self.cog_path()
</del><ins>+            miniBrowser = self.cog_path_to('cog')
</ins><span class="cx">             if not self._filesystem.isfile(miniBrowser):
</span><span class="cx">                 print("Cog not found 😢. If you wish to enable it, rebuild with `-DENABLE_COG=ON`. Falling back to good old MiniBrowser")
</span><span class="cx">                 miniBrowser = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpywebdriver_testswebdriver_driver_wpepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_wpe.py (279231 => 279232)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_wpe.py     2021-06-24 16:29:20 UTC (rev 279231)
+++ trunk/Tools/Scripts/webkitpy/webdriver_tests/webdriver_driver_wpe.py        2021-06-24 16:44:47 UTC (rev 279232)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> 
</span><span class="cx">     def browser_path(self):
</span><span class="cx">         if self._port.browser_name() == "cog":
</span><del>-            return self._port.cog_path()
</del><ins>+            return self._port.cog_path_to('cog')
</ins><span class="cx">         return self._port._build_path('bin', 'MiniBrowser')
</span><span class="cx"> 
</span><span class="cx">     def browser_args(self):
</span></span></pre>
</div>
</div>

</body>
</html>