<!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>[208948] trunk/Source/WebCore</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/208948">208948</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-21 08:25:49 -0800 (Mon, 21 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[cmake][OpenWebRTC] Move SDPProcessorScriptResource rules to common WebCore
https://bugs.webkit.org/show_bug.cgi?id=164937
Patch by Olivier Blin <olivier.blin@softathome.com> on 2016-11-21
Reviewed by Youenn Fablet.
SDPProcessorScriptResource has been moved in common mediastream directory (bug 163940).
Since it is not specific to the GTK port, the matching cmake rules should be
moved out from PlatformGTK.cmake to the main WebCore CMakeLists.txt.
This is needed to build OpenWebRTC support in other ports, WPE in my case,
probably Mac, EFL and Qt as well.
This also fixes the path in SDP scripts dependencies, the old openwebrtc subdir
was still being used.
No new tests, build fix only
* CMakeLists.txt:
* PlatformGTK.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (208947 => 208948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-11-21 13:12:26 UTC (rev 208947)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-11-21 16:25:49 UTC (rev 208948)
</span><span class="lines">@@ -2346,6 +2346,7 @@
</span><span class="cx"> platform/mediastream/RealtimeMediaSource.cpp
</span><span class="cx"> platform/mediastream/RealtimeMediaSourceCenter.cpp
</span><span class="cx"> platform/mediastream/RealtimeMediaSourceSettings.cpp
</span><ins>+ platform/mediastream/SDPProcessorScriptResource.cpp
</ins><span class="cx">
</span><span class="cx"> platform/mock/DeviceMotionClientMock.cpp
</span><span class="cx"> platform/mock/DeviceOrientationClientMock.cpp
</span><span class="lines">@@ -3668,11 +3669,13 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (WebCore_SDP_PROCESSOR_SCRIPTS)
</del><ins>+if (ENABLE_WEB_RTC)
</ins><span class="cx"> # Necessary variables:
</span><span class="cx"> # WebCore_SDP_PROCESSOR_SCRIPTS containing the JavaScript sources list
</span><span class="cx"> # WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES containing the source file that will load the scripts to add the proper
</span><span class="cx"> # dependency and having them built at the right moment
</span><ins>+ set(WebCore_SDP_PROCESSOR_SCRIPTS ${WEBCORE_DIR}/Modules/mediastream/sdp.js)
+ set(WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/mediastream/SDPProcessorScriptResource.cpp)
</ins><span class="cx">
</span><span class="cx"> MAKE_JS_FILE_ARRAYS(
</span><span class="cx"> ${DERIVED_SOURCES_WEBCORE_DIR}/SDPProcessorScriptsData.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208947 => 208948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-21 13:12:26 UTC (rev 208947)
+++ trunk/Source/WebCore/ChangeLog 2016-11-21 16:25:49 UTC (rev 208948)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-11-21 Olivier Blin <olivier.blin@softathome.com>
+
+ [cmake][OpenWebRTC] Move SDPProcessorScriptResource rules to common WebCore
+ https://bugs.webkit.org/show_bug.cgi?id=164937
+
+ Reviewed by Youenn Fablet.
+
+ SDPProcessorScriptResource has been moved in common mediastream directory (bug 163940).
+
+ Since it is not specific to the GTK port, the matching cmake rules should be
+ moved out from PlatformGTK.cmake to the main WebCore CMakeLists.txt.
+
+ This is needed to build OpenWebRTC support in other ports, WPE in my case,
+ probably Mac, EFL and Qt as well.
+
+ This also fixes the path in SDP scripts dependencies, the old openwebrtc subdir
+ was still being used.
+
+ No new tests, build fix only
+
+ * CMakeLists.txt:
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2016-11-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Add URL::hostAndPort()
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (208947 => 208948)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2016-11-21 13:12:26 UTC (rev 208947)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2016-11-21 16:25:49 UTC (rev 208948)
</span><span class="lines">@@ -166,8 +166,6 @@
</span><span class="cx">
</span><span class="cx"> platform/image-decoders/cairo/ImageBackingStoreCairo.cpp
</span><span class="cx">
</span><del>- platform/mediastream/SDPProcessorScriptResource.cpp
-
</del><span class="cx"> platform/network/soup/AuthenticationChallengeSoup.cpp
</span><span class="cx"> platform/network/soup/CertificateInfo.cpp
</span><span class="cx"> platform/network/soup/CookieJarSoup.cpp
</span><span class="lines">@@ -260,9 +258,6 @@
</span><span class="cx">
</span><span class="cx"> set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/gtk/RenderThemeGtk.cpp)
</span><span class="cx">
</span><del>-set(WebCore_SDP_PROCESSOR_SCRIPTS ${WEBCORE_DIR}/Modules/mediastream/sdp.js)
-set(WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp)
-
</del><span class="cx"> list(APPEND WebCore_LIBRARIES
</span><span class="cx"> ${ATK_LIBRARIES}
</span><span class="cx"> ${CAIRO_LIBRARIES}
</span></span></pre>
</div>
</div>
</body>
</html>