Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (236872 => 236873)
--- trunk/Source/_javascript_Core/ChangeLog 2018-10-05 13:05:15 UTC (rev 236872)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-10-05 15:06:22 UTC (rev 236873)
@@ -1,3 +1,18 @@
+2018-10-05 Carlos Eduardo Ramalho <[email protected]>
+
+ [WPE][JSC] Use Unified Sources for Platform-specific sources
+ https://bugs.webkit.org/show_bug.cgi?id=190300
+
+ Reviewed by Yusuke Suzuki.
+
+ Currently the GTK port already used Unified Sources with the same source files.
+ As WPE has conditional code using gmodule, we need to add GLIB_GMODULE_LIBRARIES
+ to the list of libraries to link with.
+
+ * PlatformWPE.cmake:
+ * SourcesWPE.txt: Added.
+ * shell/PlatformWPE.cmake:
+
2018-10-05 Mike Gorse <[email protected]>
[GTK] build fails with python 3 if LANG and LC_TYPE are unset
Modified: trunk/Source/_javascript_Core/PlatformWPE.cmake (236872 => 236873)
--- trunk/Source/_javascript_Core/PlatformWPE.cmake 2018-10-05 13:05:15 UTC (rev 236872)
+++ trunk/Source/_javascript_Core/PlatformWPE.cmake 2018-10-05 15:06:22 UTC (rev 236873)
@@ -8,18 +8,8 @@
${GLIB_INCLUDE_DIRS}
)
-list(APPEND _javascript_Core_SOURCES
- API/JSRemoteInspector.cpp
-
- inspector/remote/RemoteAutomationTarget.cpp
- inspector/remote/RemoteControllableTarget.cpp
- inspector/remote/RemoteInspectionTarget.cpp
- inspector/remote/RemoteInspector.cpp
-
- inspector/remote/glib/RemoteConnectionToTargetGlib.cpp
- inspector/remote/glib/RemoteInspectorGlib.cpp
- inspector/remote/glib/RemoteInspectorServer.cpp
- inspector/remote/glib/RemoteInspectorUtils.cpp
+list(APPEND _javascript_Core_UNIFIED_SOURCE_LIST_FILES
+ "SourcesWPE.txt"
)
list(APPEND _javascript_Core_PRIVATE_FRAMEWORK_HEADERS
Added: trunk/Source/_javascript_Core/SourcesWPE.txt (0 => 236873)
--- trunk/Source/_javascript_Core/SourcesWPE.txt (rev 0)
+++ trunk/Source/_javascript_Core/SourcesWPE.txt 2018-10-05 15:06:22 UTC (rev 236873)
@@ -0,0 +1,34 @@
+// Copyright (C) 2017 Apple Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
+// 1. Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+// 2. Redistributions in binary form must reproduce the above copyright
+// notice, this list of conditions and the following disclaimer in the
+// documentation and/or other materials provided with the distribution.
+//
+// THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+// THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+// PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+// BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+// CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+// SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+// CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+// THE POSSIBILITY OF SUCH DAMAGE.
+
+API/JSRemoteInspector.cpp
+
+inspector/remote/RemoteAutomationTarget.cpp
+inspector/remote/RemoteControllableTarget.cpp
+inspector/remote/RemoteInspectionTarget.cpp
+inspector/remote/RemoteInspector.cpp
+
+inspector/remote/glib/RemoteConnectionToTargetGlib.cpp
+inspector/remote/glib/RemoteInspectorGlib.cpp
+inspector/remote/glib/RemoteInspectorServer.cpp
+inspector/remote/glib/RemoteInspectorUtils.cpp
Modified: trunk/Source/_javascript_Core/shell/PlatformWPE.cmake (236872 => 236873)
--- trunk/Source/_javascript_Core/shell/PlatformWPE.cmake 2018-10-05 13:05:15 UTC (rev 236872)
+++ trunk/Source/_javascript_Core/shell/PlatformWPE.cmake 2018-10-05 15:06:22 UTC (rev 236873)
@@ -1,3 +1,4 @@
list(APPEND JSC_LIBRARIES
${GLIB_LIBRARIES}
+ ${GLIB_GMODULE_LIBRARIES}
)
Modified: trunk/Tools/ChangeLog (236872 => 236873)
--- trunk/Tools/ChangeLog 2018-10-05 13:05:15 UTC (rev 236872)
+++ trunk/Tools/ChangeLog 2018-10-05 15:06:22 UTC (rev 236873)
@@ -1,3 +1,16 @@
+2018-10-05 Carlos Eduardo Ramalho <[email protected]>
+
+ [WPE][JSC] Use Unified Sources for Platform-specific sources
+ https://bugs.webkit.org/show_bug.cgi?id=190300
+
+ Reviewed by Yusuke Suzuki.
+
+ Currently the GTK port already used Unified Sources with the same source files.
+ As WPE has conditional code using gmodule, we need to add GLIB_GMODULE_LIBRARIES
+ to the list of libraries to link with.
+
+ * TestWebKitAPI/PlatformWPE.cmake:
+
2018-10-05 Zach Li <[email protected]>
Expose whether WKWebProcessPlugInNodeHandle is a select element to clients
Modified: trunk/Tools/TestWebKitAPI/PlatformWPE.cmake (236872 => 236873)
--- trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2018-10-05 13:05:15 UTC (rev 236872)
+++ trunk/Tools/TestWebKitAPI/PlatformWPE.cmake 2018-10-05 15:06:22 UTC (rev 236873)
@@ -95,6 +95,7 @@
add_executable(TestJSC ${TESTWEBKITAPI_DIR}/Tests/_javascript_Core/glib/TestJSC.cpp)
target_link_libraries(TestJSC
${GLIB_LIBRARIES}
+ ${GLIB_GMODULE_LIBRARIES}
_javascript_Core
)
add_test(TestJSC ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/_javascript_Core/TestJSC)
