<!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>[161144] 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/161144">161144</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-30 10:44:31 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] [GTK] Add support for GObject introspection
https://bugs.webkit.org/show_bug.cgi?id=126162
Reviewed by Daniel Bates.
.:
* Source/PlatformGTK.cmake: Add a 'gir' target that builds all GIR files.
* Source/cmake/OptionsGTK.cmake: Add a macro for propagating typelib
targets to the Source level of the build.
Source/JavaScriptCore:
* PlatformGTK.cmake: Add the GIR targets.
Source/WebCore:
* PlatformGTK.cmake: Build a list of WebKitDOM headers and expose it to the
parent scope of the build.
Source/WebKit:
* PlatformGTK.cmake: Add the GIR targets.
Source/WebKit2:
* PlatformGTK.cmake: Add the GIR targets, split the installed headers list
between WebKitWebExtension and the WebKit2 library. Update the headers list
with new headers.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformGTKcmake">trunk/Source/JavaScriptCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcePlatformGTKcmake">trunk/Source/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorePlatformGTKcmake">trunk/Source/WebCore/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformGTKcmake">trunk/Source/WebKit/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformGTKcmake">trunk/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/ChangeLog 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-30 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Add support for GObject introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126162
+
+ Reviewed by Daniel Bates.
+
+ * Source/PlatformGTK.cmake: Add a 'gir' target that builds all GIR files.
+ * Source/cmake/OptionsGTK.cmake: Add a macro for propagating typelib
+ targets to the Source level of the build.
+
</ins><span class="cx"> 2013-12-29 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][CMake] Translations must be built
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-30 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Add support for GObject introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126162
+
+ Reviewed by Daniel Bates.
+
+ * PlatformGTK.cmake: Add the GIR targets.
+
</ins><span class="cx"> 2013-12-28 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of DFG forward exiting
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -1,2 +1,10 @@
</span><span class="cx"> configure_file(javascriptcoregtk.pc.in ${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-3.0.pc @ONLY)
</span><ins>+configure_file(JavaScriptCore.gir.in ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir @ONLY)
</ins><span class="cx">
</span><ins>+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
+ COMMAND g-ir-compiler ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir -o ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
+)
+
+ADD_TYPELIB(${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib)
</ins></span></pre></div>
<a id="trunkSourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformGTK.cmake (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformGTK.cmake 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/PlatformGTK.cmake 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -1,5 +1,8 @@
</span><span class="cx"> add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
</span><span class="cx">
</span><ins>+# This allows exposing a 'gir' target which builds all GObject introspection files.
+add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
+
</ins><span class="cx"> if (ENABLE_API_TESTS)
</span><span class="cx"> if (ENABLE_WEBKIT)
</span><span class="cx"> add_subdirectory(${WEBKIT_DIR}/gtk/tests)
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/WebCore/ChangeLog 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-30 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Add support for GObject introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126162
+
+ Reviewed by Daniel Bates.
+
+ * PlatformGTK.cmake: Build a list of WebKitDOM headers and expose it to the
+ parent scope of the build.
+
</ins><span class="cx"> 2013-12-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Text::createTextRenderer() should return a RenderPtr.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -445,22 +445,13 @@
</span><span class="cx">
</span><span class="cx"> list(APPEND GObjectDOMBindings_SOURCES
</span><span class="cx"> bindings/gobject/ConvertToUTF8String.cpp
</span><del>- bindings/gobject/ConvertToUTF8String.h
</del><span class="cx"> bindings/gobject/DOMObjectCache.cpp
</span><del>- bindings/gobject/DOMObjectCache.h
</del><span class="cx"> bindings/gobject/GObjectEventListener.cpp
</span><del>- bindings/gobject/GObjectEventListener.h
</del><span class="cx"> bindings/gobject/WebKitDOMCustom.cpp
</span><del>- bindings/gobject/WebKitDOMCustom.h
</del><span class="cx"> bindings/gobject/WebKitDOMEventTarget.cpp
</span><del>- bindings/gobject/WebKitDOMEventTarget.h
- bindings/gobject/WebKitDOMEventTargetPrivate.h
</del><span class="cx"> bindings/gobject/WebKitDOMHTMLPrivate.cpp
</span><del>- bindings/gobject/WebKitDOMHTMLPrivate.h
</del><span class="cx"> bindings/gobject/WebKitDOMObject.cpp
</span><del>- bindings/gobject/WebKitDOMObject.h
</del><span class="cx"> bindings/gobject/WebKitDOMPrivate.cpp
</span><del>- bindings/gobject/WebKitDOMPrivate.h
</del><span class="cx"> ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
</span><span class="cx"> ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
</span><span class="cx"> )
</span><span class="lines">@@ -636,11 +627,22 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>- foreach (file Custom EventTarget Object Deprecated ${GObjectDOMBindings_IDL_FILES})
- get_filename_component(file ${file} NAME_WE)
- list(APPEND GObjectDOMBindings_CLASS_LIST ${file})
</del><ins>+ set(GObjectDOMBindings_CLASS_LIST Custom EventTarget Object Deprecated)
+ set(GObjectDOMBindings_INSTALLED_HEADERS
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdomdefines.h
+ ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/webkitdom.h
+ ${WEBCORE_DIR}/bindings/gobject/WebKitDOMCustom.h
+ )
+
+ foreach (file ${GObjectDOMBindings_IDL_FILES})
+ get_filename_component(classname ${file} NAME_WE)
+ list(APPEND GObjectDOMBindings_CLASS_LIST ${classname})
+ list(APPEND GObjectDOMBindings_INSTALLED_HEADERS ${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}/WebKitDOM${classname}.h)
</ins><span class="cx"> endforeach ()
</span><span class="cx">
</span><ins>+ # Propagate this variable to the parent scope, so that it can be used in other parts of the build.
+ set(GObjectDOMBindings_INSTALLED_HEADERS ${GObjectDOMBindings_INSTALLED_HEADERS} PARENT_SCOPE)
+
</ins><span class="cx"> set(GOBJECT_DOM_BINDINGS_FEATURES_DEFINES "LANGUAGE_GOBJECT=1 ${FEATURE_DEFINES_WITH_SPACE_SEPARATOR}")
</span><span class="cx"> string(REPLACE "ENABLE_INDEXED_DATABASE=1" "" GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
</span><span class="cx"> string(REPLACE REGEX "ENABLE_SVG[A-Z_]+=1" "" GOBJECT_DOM_BINDINGS_FEATURES_DEFINES ${GOBJECT_DOM_BINDINGS_FEATURES_DEFINES})
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/WebKit/ChangeLog 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2013-12-30 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Add support for GObject introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126162
+
+ Reviewed by Daniel Bates.
+
+ * PlatformGTK.cmake: Add the GIR targets.
+
</ins><span class="cx"> 2013-12-29 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Remove ewk_view_tiled
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformGTK.cmake (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformGTK.cmake 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -95,7 +95,6 @@
</span><span class="cx"> list(APPEND WebKitGTK_INSTALLED_HEADERS
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkit.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitapplicationcache.h
</span><del>- ${WEBKIT_DIR}/gtk/webkit/webkitauthenticationdialog.h
</del><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitdefines.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitdom.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitdownload.h
</span><span class="lines">@@ -111,7 +110,6 @@
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitsecurityorigin.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitsoupauthdialog.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitspellchecker.h
</span><del>- ${WEBKIT_DIR}/gtk/webkit/webkitspellcheckerenchant.h
</del><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitviewportattributes.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitwebbackforwardlist.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitwebdatabase.h
</span><span class="lines">@@ -161,3 +159,50 @@
</span><span class="cx"> COMMAND glib-mkenums --template ${WEBKIT_DIR}/gtk/webkit/webkitenumtypes.cpp.template ${WebKitGTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.cpp
</span><span class="cx"> VERBATIM
</span><span class="cx"> )
</span><ins>+
+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
+ DEPENDS WebKit
+ DEPENDS JavaScriptCore-3-gir
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
+ g-ir-scanner
+ --quiet
+ --warn-all
+ --symbol-prefix=webkit
+ --identifier-prefix=WebKit
+ --namespace=WebKit
+ --nsversion=3.0
+ --include=GObject-2.0
+ --include=Gtk-3.0
+ --include=Soup-2.4
+ --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
+ --library=webkitgtk-3.0
+ --library=javascriptcoregtk-3.0
+ -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ --no-libtool
+ --pkg=gobject-2.0
+ --pkg=gtk+-3.0
+ --pkg=libsoup-2.4
+ --pkg-export=webkitgtk-3.0
+ --output=${CMAKE_BINARY_DIR}/WebKit-3.0.gir
+ --c-include="webkit/webkit.h"
+ -DBUILDING_WEBKIT
+ -I${CMAKE_SOURCE_DIR}/Source
+ -I${WEBKIT_DIR}/gtk
+ -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders
+ -I${DERIVED_SOURCES_DIR}
+ -I${DERIVED_SOURCES_WEBKITGTK_DIR}
+ -I${WEBCORE_DIR}/platform/gtk
+ ${GObjectDOMBindings_INSTALLED_HEADERS}
+ ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
+ ${WebKitGTK_INSTALLED_HEADERS}
+ ${WEBKIT_DIR}/gtk/webkit/*.cpp
+)
+
+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
+ COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
+)
+
+ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit-3.0.typelib)
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2013-12-30 Martin Robinson <mrobinson@igalia.com>
+
+ [CMake] [GTK] Add support for GObject introspection
+ https://bugs.webkit.org/show_bug.cgi?id=126162
+
+ Reviewed by Daniel Bates.
+
+ * PlatformGTK.cmake: Add the GIR targets, split the installed headers list
+ between WebKitWebExtension and the WebKit2 library. Update the headers list
+ with new headers.
+
</ins><span class="cx"> 2013-12-30 Michał Pakuła vel Rutka <m.pakula@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL][WK2] Replace ecore_main_loop_iterate with waitUntilTrue in ewk tests
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -298,9 +298,11 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> set(WebKit2_INSTALLED_HEADERS
</span><ins>+ ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitAuthenticationRequest.h
</ins><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitBackForwardList.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitBackForwardListItem.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitCertificateInfo.h
</span><ins>+ ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitCredential.h
</ins><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenu.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenuActions.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitContextMenuItem.h
</span><span class="lines">@@ -338,19 +340,13 @@
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWebViewGroup.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitWindowProperties.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/webkit2.h
</span><ins>+)
</ins><span class="cx">
</span><del>- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.cpp
</del><ins>+set(WebKit2WebExtension_INSTALLED_HEADERS
</ins><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFrame.h
</span><del>- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitFramePrivate.h
- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.cpp
</del><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorld.h
</span><del>- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitScriptWorldPrivate.h
- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.cpp
</del><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtension.h
</span><del>- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebExtensionPrivate.h
- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.cpp
</del><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPage.h
</span><del>- ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/WebKitWebPagePrivate.h
</del><span class="cx"> ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/webkit-web-extension.h
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -650,3 +646,100 @@
</span><span class="cx"> "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp"
</span><span class="cx"> )
</span><span class="cx"> add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
</span><ins>+
+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
+ DEPENDS WebKit2
+ DEPENDS JavaScriptCore-3-gir
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
+ g-ir-scanner
+ --quiet
+ --warn-all
+ --symbol-prefix=webkit
+ --identifier-prefix=WebKit
+ --namespace=WebKit2
+ --nsversion=3.0
+ --include=GObject-2.0
+ --include=Gtk-3.0
+ --include=Soup-2.4
+ --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
+ --library=webkit2gtk-3.0
+ --library=javascriptcoregtk-3.0
+ -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ --no-libtool
+ --pkg=gobject-2.0
+ --pkg=gtk+-3.0
+ --pkg=libsoup-2.4
+ --pkg-export=webkit2gtk-3.0
+ --output=${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
+ --c-include="webkit2/webkit2.h"
+ -DBUILDING_WEBKIT
+ -DWEBKIT2_COMPILATION
+ -I${CMAKE_SOURCE_DIR}/Source
+ -I${WEBKIT2_DIR}
+ -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders
+ -I${DERIVED_SOURCES_DIR}
+ -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
+ -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
+ ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
+ ${WebKit2_INSTALLED_HEADERS}
+ ${WEBKIT2_DIR}/UIProcess/API/gtk/*.cpp
+)
+
+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
+ DEPENDS JavaScriptCore-3-gir
+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
+ COMMAND CC=${CMAKE_C_COMPILER} CFLAGS=-Wno-deprecated-declarations
+ g-ir-scanner
+ --quiet
+ --warn-all
+ --symbol-prefix=webkit
+ --identifier-prefix=WebKit
+ --namespace=WebKit2WebExtension
+ --nsversion=3.0
+ --include=GObject-2.0
+ --include=Gtk-3.0
+ --include=Soup-2.4
+ --include-uninstalled=${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
+ --include-uninstalled=${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
+ --library=webkit2gtk-3.0
+ --library=javascriptcoregtk-3.0
+ -L${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
+ --no-libtool
+ --pkg=gobject-2.0
+ --pkg=gtk+-3.0
+ --pkg=libsoup-2.4
+ --pkg-export=webkit2gtk-3.0
+ --output=${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
+ --c-include="webkit2/webkit-web-extension.h"
+ -DBUILDING_WEBKIT
+ -DWEBKIT2_COMPILATION
+ -I${CMAKE_SOURCE_DIR}/Source
+ -I${WEBKIT2_DIR}
+ -I${JAVASCRIPTCORE_DIR}/ForwardingHeaders
+ -I${DERIVED_SOURCES_DIR}
+ -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
+ -I${FORWARDING_HEADERS_DIR}
+ -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
+ -I${FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR}
+ -I${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk
+ ${GObjectDOMBindings_INSTALLED_HEADERS}
+ ${WebKit2WebExtension_INSTALLED_HEADERS}
+ ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk/*.cpp
+)
+
+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
+ COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
+)
+
+add_custom_command(
+ OUTPUT ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
+ DEPENDS ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
+ COMMAND g-ir-compiler --includedir=${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir -o ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
+)
+
+ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib)
+ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (161143 => 161144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2013-12-30 16:41:37 UTC (rev 161143)
+++ trunk/Source/cmake/OptionsGTK.cmake 2013-12-30 18:44:31 UTC (rev 161144)
</span><span class="lines">@@ -215,3 +215,12 @@
</span><span class="cx"> set(FORWARDING_HEADERS_DIR ${DERIVED_SOURCES_DIR}/ForwardingHeaders)
</span><span class="cx"> set(FORWARDING_HEADERS_WEBKIT2GTK_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk)
</span><span class="cx"> set(FORWARDING_HEADERS_WEBKIT2GTK_EXTENSION_DIR ${FORWARDING_HEADERS_DIR}/webkit2gtk-webextension)
</span><ins>+
+# Add a typelib file to the list of all typelib dependencies. This makes it easy to
+# expose a 'gir' target with all gobject-introspection files.
+macro(ADD_TYPELIB typelib)
+ get_filename_component(target_name ${typelib} NAME_WE)
+ add_custom_target(${target_name}-gir ALL DEPENDS ${typelib})
+ list(APPEND GObjectIntrospectionTargets ${target_name}-gir)
+ set(GObjectIntrospectionTargets ${GObjectIntrospectionTargets} PARENT_SCOPE)
+endmacro()
</ins></span></pre>
</div>
</div>
</body>
</html>