<!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>[161325] 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/161325">161325</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-05 16:25:34 -0800 (Sun, 05 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [CMake] Ensure that the autotools build and the CMake install the same files
https://bugs.webkit.org/show_bug.cgi?id=116379
Reviewed by Gustavo Noronha Silva.
.:
* Source/PlatformGTK.cmake: Install the documentation.
* Source/cmake/OptionsCommon.cmake: Add a LIBEXEC variable for WebKit2 executables, and
don't use the default locations on GTK+. We will get them from the CMake-provided GNU installation
variables.
* Source/cmake/OptionsGTK.cmake: Setup the installation variables using the ones provided
by CMake's GNU installation directory support. Fix the definition of DATADIR. Always install
the jsc binary.
Source/JavaScriptCore:
* PlatformGTK.cmake: Install API headers, gir files, and the pkg-config file.
Source/WebCore:
* PlatformGTK.cmake: Reformat some install directives to be consistent with the rest of them.
Install the GObject DOM bindings headers.
Source/WebKit:
* PlatformGTK.cmake: Install API headers, gir files, and the pkg-config file. Move
a couple installed and generated headers to the installed headers list.
Source/WebKit2:
* CMakeLists.txt: Install the plugin process to the new LIBEXEC directory, which
for non-GTK+ platforms is the same as EXEC.
* PlatformGTK.cmake: Install API headers, gir files, and the pkg-config file. Move
a couple installed and generated headers to the installed headers list. Rename the
headers list to be consistent with the WebKit1 build. No longer use a variable for
the name of the plugin process, as it's unnecessary.</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="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</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="#trunkSourcecmakeOptionsCommoncmake">trunk/Source/cmake/OptionsCommon.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 (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/ChangeLog 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Ensure that the autotools build and the CMake install the same files
+ https://bugs.webkit.org/show_bug.cgi?id=116379
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Source/PlatformGTK.cmake: Install the documentation.
+ * Source/cmake/OptionsCommon.cmake: Add a LIBEXEC variable for WebKit2 executables, and
+ don't use the default locations on GTK+. We will get them from the CMake-provided GNU installation
+ variables.
+ * Source/cmake/OptionsGTK.cmake: Setup the installation variables using the ones provided
+ by CMake's GNU installation directory support. Fix the definition of DATADIR. Always install
+ the jsc binary.
+
</ins><span class="cx"> 2014-01-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Stop installing WebKit2 C API headers
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-01-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Ensure that the autotools build and the CMake install the same files
+ https://bugs.webkit.org/show_bug.cgi?id=116379
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Install API headers, gir files, and the pkg-config file.
+
</ins><span class="cx"> 2014-01-04 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Use Compiler macros instead of raw "final" and "override"
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformGTK.cmake (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformGTK.cmake 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/JavaScriptCore/PlatformGTK.cmake 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -8,3 +8,24 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> ADD_TYPELIB(${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib)
</span><ins>+
+install(FILES "${CMAKE_BINARY_DIR}/Source/JavaScriptCore/javascriptcoregtk-3.0.pc"
+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
+)
+
+install(FILES API/JavaScript.h
+ API/JSBase.h
+ API/JSContextRef.h
+ API/JSObjectRef.h
+ API/JSStringRef.h
+ API/JSValueRef.h
+ API/WebKitAvailability.h
+ DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/JavaScriptCore"
+)
+
+install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.gir
+ DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
+)
+install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-3.0.typelib
+ DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
+)
</ins></span></pre></div>
<a id="trunkSourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/PlatformGTK.cmake (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/PlatformGTK.cmake 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/PlatformGTK.cmake 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -22,6 +22,9 @@
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitgtk-docs.sgml"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source/WebKit/gtk/docs/webkitgtk-sections.txt"
</span><span class="cx"> )
</span><ins>+ install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkitgtk/html/
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkitgtk
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2)
</span><span class="lines">@@ -30,6 +33,9 @@
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml"
</span><span class="cx"> "${CMAKE_SOURCE_DIR}/Source/WebKit2/UIProcess/API/gtk/docs/webkit2gtk-sections.txt"
</span><span class="cx"> )
</span><ins>+ install(DIRECTORY ${CMAKE_BINARY_DIR}/Documentation/webkit2gtk/html/
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/gtk-doc/html/webkit2gtk
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/WebCore/ChangeLog 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Ensure that the autotools build and the CMake install the same files
+ https://bugs.webkit.org/show_bug.cgi?id=116379
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Reformat some install directives to be consistent with the rest of them.
+ Install the GObject DOM bindings headers.
+
</ins><span class="cx"> 2014-01-05 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Use lineageOfType to simplify two rendering helpers.
</span></span></pre></div>
<a id="trunkSourceWebCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/PlatformGTK.cmake (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/PlatformGTK.cmake 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/WebCore/PlatformGTK.cmake 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -385,22 +385,20 @@
</span><span class="cx"> )
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-install(FILES
- "${WEBCORE_DIR}/Resources/textAreaResizeCorner.png"
- "${WEBCORE_DIR}/Resources/nullPlugin.png"
- "${WEBCORE_DIR}/Resources/urlIcon.png"
- "${WEBCORE_DIR}/Resources/missingImage.png"
- "${WEBCORE_DIR}/Resources/panIcon.png"
- "${WEBCORE_DIR}/Resources/deleteButton.png"
- "${WEBCORE_DIR}/Resources/inputSpeech.png"
- DESTINATION
- "${DATA_INSTALL_DIR}/images")
</del><ins>+install(FILES "${WEBCORE_DIR}/Resources/textAreaResizeCorner.png"
+ "${WEBCORE_DIR}/Resources/nullPlugin.png"
+ "${WEBCORE_DIR}/Resources/urlIcon.png"
+ "${WEBCORE_DIR}/Resources/missingImage.png"
+ "${WEBCORE_DIR}/Resources/panIcon.png"
+ "${WEBCORE_DIR}/Resources/deleteButton.png"
+ "${WEBCORE_DIR}/Resources/inputSpeech.png"
+ DESTINATION "${DATA_INSTALL_DIR}/images"
+)
</ins><span class="cx">
</span><span class="cx"> if (ENABLE_WEB_AUDIO)
</span><del>- install(FILES
- "${WEBCORE_DIR}/platform/audio/resources/Composite.wav"
- DESTINATION
- "${DATA_INSTALL_DIR}/resources/audio")
</del><ins>+ install(FILES "${WEBCORE_DIR}/platform/audio/resources/Composite.wav"
+ DESTINATION "${DATA_INSTALL_DIR}/resources/audio"
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2)
</span><span class="lines">@@ -696,5 +694,12 @@
</span><span class="cx"> WebCore
</span><span class="cx"> fake-installed-webkitdom-headers
</span><span class="cx"> )
</span><ins>+
+ install(FILES ${GObjectDOMBindings_INSTALLED_HEADERS}
+ bindings/gobject/WebKitDOMEventTarget.h
+ bindings/gobject/WebKitDOMDeprecated.h
+ bindings/gobject/WebKitDOMObject.h
+ DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkitdom"
+ )
</ins><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/WebKit/ChangeLog 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Ensure that the autotools build and the CMake install the same files
+ https://bugs.webkit.org/show_bug.cgi?id=116379
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * PlatformGTK.cmake: Install API headers, gir files, and the pkg-config file. Move
+ a couple installed and generated headers to the installed headers list.
+
</ins><span class="cx"> 2014-01-04 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [CMake] Improve the way we locate gobject-introspection
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/PlatformGTK.cmake (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/PlatformGTK.cmake 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/WebKit/PlatformGTK.cmake 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -93,6 +93,8 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> list(APPEND WebKitGTK_INSTALLED_HEADERS
</span><ins>+ ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
+ ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitversion.h
</ins><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkit.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitapplicationcache.h
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/webkitdefines.h
</span><span class="lines">@@ -194,7 +196,6 @@
</span><span class="cx"> -I${DERIVED_SOURCES_WEBKITGTK_DIR}
</span><span class="cx"> -I${WEBCORE_DIR}/platform/gtk
</span><span class="cx"> ${GObjectDOMBindings_INSTALLED_HEADERS}
</span><del>- ${DERIVED_SOURCES_WEBKITGTK_API_DIR}/webkitenumtypes.h
</del><span class="cx"> ${WebKitGTK_INSTALLED_HEADERS}
</span><span class="cx"> ${WEBKIT_DIR}/gtk/webkit/*.cpp
</span><span class="cx"> )
</span><span class="lines">@@ -206,3 +207,19 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit-3.0.typelib)
</span><ins>+
+install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit/gtk/webkitgtk-3.0.pc"
+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
+)
+install(FILES "${WEBKIT_DIR}/gtk/resources/error.html"
+ DESTINATION "${DATA_INSTALL_DIR}/resources"
+)
+install(FILES ${WebKitGTK_INSTALLED_HEADERS}
+ DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit"
+)
+install(FILES ${CMAKE_BINARY_DIR}/WebKit-3.0.gir
+ DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
+)
+install(FILES ${CMAKE_BINARY_DIR}/WebKit-3.0.typelib
+ DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
+)
</ins></span></pre></div>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/WebKit2/CMakeLists.txt 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -709,4 +709,4 @@
</span><span class="cx"> set_target_properties(WebKit2 PROPERTIES VERSION ${WEBKIT2_VERSION} SOVERSION ${WEBKIT2_VERSION_MAJOR})
</span><span class="cx">
</span><span class="cx"> install(TARGETS WebKit2 DESTINATION "${LIB_INSTALL_DIR}")
</span><del>-install(TARGETS WebProcess DESTINATION "${EXEC_INSTALL_DIR}")
</del><ins>+install(TARGETS WebProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] Ensure that the autotools build and the CMake install the same files
+ https://bugs.webkit.org/show_bug.cgi?id=116379
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Install the plugin process to the new LIBEXEC directory, which
+ for non-GTK+ platforms is the same as EXEC.
+ * PlatformGTK.cmake: Install API headers, gir files, and the pkg-config file. Move
+ a couple installed and generated headers to the installed headers list. Rename the
+ headers list to be consistent with the WebKit1 build. No longer use a variable for
+ the name of the plugin process, as it's unnecessary.
+
</ins><span class="cx"> 2014-01-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Stop installing WebKit2 C API headers
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/PlatformGTK.cmake (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/WebKit2/PlatformGTK.cmake 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -297,7 +297,9 @@
</span><span class="cx"> WebProcess/soup/WebSoupRequestManager.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><del>-set(WebKit2_INSTALLED_HEADERS
</del><ins>+set(WebKit2GTK_INSTALLED_HEADERS
+ ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
+ ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitVersion.h
</ins><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitAuthenticationRequest.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitBackForwardList.h
</span><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitBackForwardListItem.h
</span><span class="lines">@@ -445,11 +447,11 @@
</span><span class="cx"> add_custom_command(
</span><span class="cx"> OUTPUT ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
</span><span class="cx"> ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
</span><del>- DEPENDS ${WebKit2_INSTALLED_HEADERS}
</del><ins>+ DEPENDS ${WebKit2GTK_INSTALLED_HEADERS}
</ins><span class="cx">
</span><del>- COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
</del><ins>+ COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.h.template ${WebKit2GTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ | sed s/WEBKIT_TYPE_KIT/WEBKIT_TYPE/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
</ins><span class="cx">
</span><del>- COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
</del><ins>+ COMMAND glib-mkenums --template ${WEBKIT2_DIR}/UIProcess/API/gtk/WebKitEnumTypes.cpp.template ${WebKit2GTK_INSTALLED_HEADERS} | sed s/web_kit/webkit/ > ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.cpp
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> add_custom_command(
</span><span class="lines">@@ -596,18 +598,18 @@
</span><span class="cx"> )
</span><span class="cx"> GENERATE_WEBKIT2_MESSAGE_SOURCES(PluginProcess_SOURCES "${PluginProcess_MESSAGES_IN_FILES}")
</span><span class="cx">
</span><del>- add_executable(${PluginProcess_EXECUTABLE_NAME} ${PluginProcess_SOURCES})
</del><ins>+ add_executable(WebKitPluginProcess ${PluginProcess_SOURCES})
</ins><span class="cx">
</span><span class="cx"> # We need ENABLE_PLUGIN_PROCESS for all targets in this directory, but
</span><span class="cx"> # we only want GTK_API_VERSION_2 for the plugin process target.
</span><span class="cx"> add_definitions(-DENABLE_PLUGIN_PROCESS=1)
</span><span class="cx"> set_property(
</span><del>- TARGET ${PluginProcess_EXECUTABLE_NAME}
</del><ins>+ TARGET WebKitPluginProcess
</ins><span class="cx"> APPEND
</span><span class="cx"> PROPERTY COMPILE_DEFINITIONS GTK_API_VERSION_2=1
</span><span class="cx"> )
</span><span class="cx"> set_property(
</span><del>- TARGET ${PluginProcess_EXECUTABLE_NAME}
</del><ins>+ TARGET WebKitPluginProcess
</ins><span class="cx"> APPEND
</span><span class="cx"> PROPERTY INCLUDE_DIRECTORIES
</span><span class="cx"> ${WebKit2CommonIncludeDirectories}
</span><span class="lines">@@ -615,15 +617,15 @@
</span><span class="cx"> ${GDK2_INCLUDE_DIRS}
</span><span class="cx"> )
</span><span class="cx">
</span><del>- target_link_libraries(${PluginProcess_EXECUTABLE_NAME}
</del><ins>+ target_link_libraries(WebKitPluginProcess
</ins><span class="cx"> ${SharedWebKit2Libraries}
</span><span class="cx"> WebCorePlatformGTK2
</span><span class="cx"> WebCore
</span><span class="cx"> )
</span><span class="cx">
</span><del>- add_dependencies(${PluginProcess_EXECUTABLE_NAME} WebKit2)
</del><ins>+ add_dependencies(WebKitPluginProcess WebKit2)
</ins><span class="cx">
</span><del>- install(TARGETS ${PluginProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
</del><ins>+ install(TARGETS WebKitPluginProcess DESTINATION "${LIBEXEC_INSTALL_DIR}")
</ins><span class="cx"> endif () # ENABLE_PLUGIN_PROCESS
</span><span class="cx">
</span><span class="cx"> # Commands for building the built-in injected bundle.
</span><span class="lines">@@ -680,8 +682,7 @@
</span><span class="cx"> -I${DERIVED_SOURCES_DIR}
</span><span class="cx"> -I${DERIVED_SOURCES_WEBKIT2GTK_DIR}
</span><span class="cx"> -I${FORWARDING_HEADERS_WEBKIT2GTK_DIR}
</span><del>- ${DERIVED_SOURCES_WEBKIT2GTK_API_DIR}/WebKitEnumTypes.h
- ${WebKit2_INSTALLED_HEADERS}
</del><ins>+ ${WebKit2GTK_INSTALLED_HEADERS}
</ins><span class="cx"> ${WEBKIT2_DIR}/UIProcess/API/gtk/*.cpp
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -742,3 +743,22 @@
</span><span class="cx">
</span><span class="cx"> ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib)
</span><span class="cx"> ADD_TYPELIB(${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib)
</span><ins>+
+install(TARGETS webkit2gtkinjectedbundle
+ DESTINATION "${LIB_INSTALL_DIR}/webkit2gtk-3.0/injected-bundle"
+)
+install(FILES "${CMAKE_BINARY_DIR}/Source/WebKit2/webkit2gtk-3.0.pc"
+ DESTINATION "${LIB_INSTALL_DIR}/pkgconfig"
+)
+install(FILES ${WebKit2GTK_INSTALLED_HEADERS}
+ ${WebKit2WebExtension_INSTALLED_HEADERS}
+ DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit2"
+)
+install(FILES ${CMAKE_BINARY_DIR}/WebKit2-3.0.gir
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.gir
+ DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
+)
+install(FILES ${CMAKE_BINARY_DIR}/WebKit2-3.0.typelib
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-3.0.typelib
+ DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
+)
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsCommon.cmake (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsCommon.cmake 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/cmake/OptionsCommon.cmake 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -42,7 +42,10 @@
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
-
-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries (lib${LIB_SUFFIX})")
-set(EXEC_INSTALL_DIR "bin" CACHE PATH "Where to install executables")
</del><ins>+# GTK uses the GNU installation directories.
+if (NOT PORT STREQUAL "GTK")
+ set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)")
+ set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Where to install libraries (lib${LIB_SUFFIX})")
+ set(EXEC_INSTALL_DIR "bin" CACHE PATH "Where to install executables")
+ set(LIBEXEC_INSTALL_DIR "bin" CACHE PATH "Where to install executables executed by the library")
+endif ()
</ins></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (161324 => 161325)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-01-05 19:17:27 UTC (rev 161324)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-01-06 00:25:34 UTC (rev 161325)
</span><span class="lines">@@ -117,18 +117,15 @@
</span><span class="cx"> set(WebKit2_WebProcess_OUTPUT_NAME WebKitWebProcess)
</span><span class="cx">
</span><span class="cx"> set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
</span><del>-set(DATA_INSTALL_DIR "${DATADIR}/webkitgtk-3.0")
</del><ins>+set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-3.0")
+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Where to install libraries")
+set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH "Where to install executables")
+set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_LIBEXECDIR}" CACHE PATH "Where to install executables executed by the library")
+set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-3.0")
</ins><span class="cx">
</span><del>-if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
- set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
- set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
-endif ()
-
</del><span class="cx"> add_definitions(-DBUILDING_GTK__=1)
</span><span class="cx"> add_definitions(-DGETTEXT_PACKAGE="WebKitGTK-3.0")
</span><del>-add_definitions(-DDATA_DIR="${DATADIR}")
</del><ins>+add_definitions(-DDATA_DIR="${CMAKE_INSTALL_DATADIR}")
</ins><span class="cx"> add_definitions(-DWEBKITGTK_API_VERSION_STRING="3.0")
</span><span class="cx"> add_definitions(-DUSER_AGENT_GTK_MAJOR_VERSION=537)
</span><span class="cx"> add_definitions(-DUSER_AGENT_GTK_MINOR_VERSION=30)
</span><span class="lines">@@ -145,6 +142,13 @@
</span><span class="cx"> add_definitions(-DWTF_PLATFORM_X11=1)
</span><span class="cx"> add_definitions(-DMOZ_X11)
</span><span class="cx">
</span><ins>+if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+ set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> cruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+ set(CMAKE_C_ARCHIVE_APPEND "<CMAKE_AR> ruT <TARGET> <LINK_FLAGS> <OBJECTS>")
+endif ()
+
</ins><span class="cx"> find_package(Cairo 1.10.2 REQUIRED)
</span><span class="cx"> find_package(Fontconfig 2.8.0 REQUIRED)
</span><span class="cx"> find_package(Freetype 2.4.2 REQUIRED)
</span><span class="lines">@@ -224,6 +228,7 @@
</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>+set(SHOULD_INSTALL_JS_SHELL ON)
</ins><span class="cx">
</span><span class="cx"> # Add a typelib file to the list of all typelib dependencies. This makes it easy to
</span><span class="cx"> # expose a 'gir' target with all gobject-introspection files.
</span></span></pre>
</div>
</div>
</body>
</html>