<!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>[182315] trunk</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/182315">182315</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2015-04-03 05:23:06 -0700 (Fri, 03 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix the EFL and GTK build after <a href="http://trac.webkit.org/projects/webkit/changeset/182243">r182243</a>
https://bugs.webkit.org/show_bug.cgi?id=143361
Reviewed by Csaba Osztrogonác.
.:
* Source/PlatformEfl.cmake: Add a custom command that copies
the InspectorBackendCommands.js file into the proper directory
under DerivedSources/WebInspectorUI/.
Source/JavaScriptCore:
* CMakeLists.txt: InspectorBackendCommands.js is generated in the
DerivedSources/JavaScriptCore/inspector/ directory.
Source/WebKit2:
* PlatformGTK.cmake: Add a custom command that copies the
InspectorBackendCommands.js file into the proper directory
under DerivedSources/WebInspectorUI/.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourcePlatformEflcmake">trunk/Source/PlatformEfl.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (182314 => 182315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2015-04-03 12:20:06 UTC (rev 182314)
+++ trunk/ChangeLog 2015-04-03 12:23:06 UTC (rev 182315)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-03 Zan Dobersek <zdobersek@igalia.com>
+
+ Fix the EFL and GTK build after r182243
+ https://bugs.webkit.org/show_bug.cgi?id=143361
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Source/PlatformEfl.cmake: Add a custom command that copies
+ the InspectorBackendCommands.js file into the proper directory
+ under DerivedSources/WebInspectorUI/.
+
</ins><span class="cx"> 2015-04-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards CMake on Windows and Mac.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (182314 => 182315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-04-03 12:20:06 UTC (rev 182314)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-04-03 12:23:06 UTC (rev 182315)
</span><span class="lines">@@ -1088,7 +1088,7 @@
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp
</span><span class="cx"> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h
</span><del>- ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/inspector/InspectorBackendCommands.js
</del><ins>+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
</ins><span class="cx"> MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
</span><span class="cx"> DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/CombinedDomains.json
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (182314 => 182315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-04-03 12:20:06 UTC (rev 182314)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-04-03 12:23:06 UTC (rev 182315)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-04-03 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ Fix the EFL and GTK build after r182243
+ https://bugs.webkit.org/show_bug.cgi?id=143361
+
+ Reviewed by Csaba Osztrogonác.
+
+ * CMakeLists.txt: InspectorBackendCommands.js is generated in the
+ DerivedSources/JavaScriptCore/inspector/ directory.
+
+2015-04-03 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> Unreviewed, fixing Clang builds of the GTK port on Linux.
</span><span class="cx">
</span><span class="cx"> * runtime/Options.cpp:
</span></span></pre></div>
<a id="trunkSourcePlatformEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformEfl.cmake (182314 => 182315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformEfl.cmake 2015-04-03 12:20:06 UTC (rev 182314)
+++ trunk/Source/PlatformEfl.cmake 2015-04-03 12:23:06 UTC (rev 182315)
</span><span class="lines">@@ -1,12 +1,20 @@
</span><span class="cx"> add_subdirectory(${WEBCORE_DIR}/platform/efl/DefaultTheme)
</span><span class="cx">
</span><ins>+# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
+# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
+ COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+)
+
</ins><span class="cx"> add_custom_target(
</span><span class="cx"> web-inspector-resources ALL
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
</span><span class="cx"> COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
</span><del>- DEPENDS JavaScriptCore WebCore
</del><ins>+ DEPENDS JavaScriptCore WebCore ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
</ins><span class="cx"> WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
</span><span class="cx"> )
</span><span class="cx"> install(DIRECTORY "${CMAKE_BINARY_DIR}/${WEB_INSPECTOR_DIR}"
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182314 => 182315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-03 12:20:06 UTC (rev 182314)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-03 12:23:06 UTC (rev 182315)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-04-03 Zan Dobersek <zdobersek@igalia.com>
+
+ Fix the EFL and GTK build after r182243
+ https://bugs.webkit.org/show_bug.cgi?id=143361
+
+ Reviewed by Csaba Osztrogonác.
+
+ * PlatformGTK.cmake: Add a custom command that copies the
+ InspectorBackendCommands.js file into the proper directory
+ under DerivedSources/WebInspectorUI/.
+
</ins><span class="cx"> 2015-04-03 Philippe Normand <pnormand@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, GTK build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (182314 => 182315)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2015-04-03 12:20:06 UTC (rev 182314)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2015-04-03 12:23:06 UTC (rev 182315)
</span><span class="lines">@@ -422,6 +422,14 @@
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/UserInterface/Images/gtk/*.svg
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+# DerivedSources/JavaScriptCore/inspector/InspectorBackendCommands.js is
+# expected in DerivedSources/WebInspectorUI/UserInterface/Protocol/.
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+ DEPENDS ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js
+ COMMAND cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+)
+
</ins><span class="cx"> list(APPEND InspectorFiles
</span><span class="cx"> ${CMAKE_SOURCE_DIR}/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js
</span><span class="cx"> ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
</span></span></pre>
</div>
</div>
</body>
</html>