Changeset 208948 in webkit

Timestamp:

Nov 21, 2016 8:25:49 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

[cmake][OpenWebRTC] Move SDPProcessorScriptResource rules to common WebCore
​https://bugs.webkit.org/show_bug.cgi?id=164937

Patch by Olivier Blin <Olivier Blin> 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:

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (2 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -2347 +2347 @@
     platform/mediastream/RealtimeMediaSourceCenter.cpp
     platform/mediastream/RealtimeMediaSourceSettings.cpp
+    platform/mediastream/SDPProcessorScriptResource.cpp
 
     platform/mock/DeviceMotionClientMock.cpp
@@ -3669 +3670 @@
 endif ()
 
-if (WebCore_SDP_PROCESSOR_SCRIPTS)
+if (ENABLE_WEB_RTC)
     # Necessary variables:
     # WebCore_SDP_PROCESSOR_SCRIPTS containing the JavaScript sources list
     # WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES containing the source file that will load the scripts to add the proper
     #   dependency and having them built at the right moment
+    set(WebCore_SDP_PROCESSOR_SCRIPTS ${WEBCORE_DIR}/Modules/mediastream/sdp.js)
+    set(WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/mediastream/SDPProcessorScriptResource.cpp)
 
     MAKE_JS_FILE_ARRAYS(

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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:
+
 2016-11-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/PlatformGTK.cmake

@@ -167 +167 @@
     platform/image-decoders/cairo/ImageBackingStoreCairo.cpp
 
-    platform/mediastream/SDPProcessorScriptResource.cpp
-
     platform/network/soup/AuthenticationChallengeSoup.cpp
     platform/network/soup/CertificateInfo.cpp
@@ -260 +258 @@
 
 set(WebCore_USER_AGENT_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/gtk/RenderThemeGtk.cpp)
-
-set(WebCore_SDP_PROCESSOR_SCRIPTS ${WEBCORE_DIR}/Modules/mediastream/sdp.js)
-set(WebCore_SDP_PROCESSOR_SCRIPTS_DEPENDENCIES ${WEBCORE_DIR}/platform/mediastream/openwebrtc/SDPProcessorScriptResource.cpp)
 
 list(APPEND WebCore_LIBRARIES