<!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>[176391] releases/WebKitGTK/webkit-2.6</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/176391">176391</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-20 02:41:04 -0800 (Thu, 20 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/175450">r175450</a> - REGRESSION(CMake): Make it possible to build without introspection
https://bugs.webkit.org/show_bug.cgi?id=138006
Reviewed by Philippe Normand.
.:
Add ENABLE_INTROSPECTION option.
* Source/PlatformGTK.cmake: Dot not add gir global target if
introspection is disabled.
* Source/cmake/OptionsGTK.cmake: Do not add gir individual targets if
introspection is disabled.
Source/JavaScriptCore:
Do not install introspection files when introspection is disabled.
* PlatformGTK.cmake:
Source/WebKit2:
Do not install introspection files when introspection is disabled.
* PlatformGTK.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26ChangeLog">releases/WebKitGTK/webkit-2.6/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceJavaScriptCorePlatformGTKcmake">releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourcePlatformGTKcmake">releases/WebKitGTK/webkit-2.6/Source/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebKit2PlatformGTKcmake">releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.6/Source/cmake/OptionsGTK.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/ChangeLog (176390 => 176391)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/ChangeLog 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/ChangeLog 2014-11-20 10:41:04 UTC (rev 176391)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-01 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(CMake): Make it possible to build without introspection
+ https://bugs.webkit.org/show_bug.cgi?id=138006
+
+ Reviewed by Philippe Normand.
+
+ Add ENABLE_INTROSPECTION option.
+
+ * Source/PlatformGTK.cmake: Dot not add gir global target if
+ introspection is disabled.
+ * Source/cmake/OptionsGTK.cmake: Do not add gir individual targets if
+ introspection is disabled.
+
</ins><span class="cx"> 2014-11-12 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.6.3 release.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog (176390 => 176391)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/ChangeLog 2014-11-20 10:41:04 UTC (rev 176391)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-01 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(CMake): Make it possible to build without introspection
+ https://bugs.webkit.org/show_bug.cgi?id=138006
+
+ Reviewed by Philippe Normand.
+
+ Do not install introspection files when introspection is disabled.
+
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2014-11-14 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> STRH can store values with the wrong offset
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceJavaScriptCorePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/PlatformGTK.cmake (176390 => 176391)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/PlatformGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/JavaScriptCore/PlatformGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
</span><span class="lines">@@ -23,12 +23,15 @@
</span><span class="cx"> DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/JavaScriptCore"
</span><span class="cx"> )
</span><span class="cx">
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
- DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
-)
-install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
- DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
-)
</del><ins>+if (ENABLE_INTROSPECTION)
+ install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.gir
+ DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/JavaScriptCore-${WEBKITGTK_API_VERSION}.typelib
+ DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
+ )
+endif ()
+
</ins><span class="cx"> add_definitions(-DSTATICALLY_LINKED_WITH_WTF)
</span><span class="cx">
</span><span class="cx"> list(APPEND JavaScriptCore_LIBRARIES
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourcePlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/PlatformGTK.cmake (176390 => 176391)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/PlatformGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/PlatformGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
</span><span class="lines">@@ -1,7 +1,9 @@
</span><span class="cx"> add_subdirectory(${WEBCORE_DIR}/platform/gtk/po)
</span><span class="cx">
</span><span class="cx"> # This allows exposing a 'gir' target which builds all GObject introspection files.
</span><del>-add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
</del><ins>+if (ENABLE_INTROSPECTION)
+ add_custom_target(gir ALL DEPENDS ${GObjectIntrospectionTargets})
+endif ()
</ins><span class="cx">
</span><span class="cx"> list(APPEND DocumentationDependencies
</span><span class="cx"> GObjectDOMBindings
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog (176390 => 176391)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/ChangeLog 2014-11-20 10:41:04 UTC (rev 176391)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-11-01 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(CMake): Make it possible to build without introspection
+ https://bugs.webkit.org/show_bug.cgi?id=138006
+
+ Reviewed by Philippe Normand.
+
+ Do not install introspection files when introspection is disabled.
+
+ * PlatformGTK.cmake:
+
</ins><span class="cx"> 2014-11-19 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Error in documentation of webkit_print_operation_get_page_setup()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebKit2PlatformGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake (176390 => 176391)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/WebKit2/PlatformGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
</span><span class="lines">@@ -829,15 +829,18 @@
</span><span class="cx"> ${WebKit2WebExtension_INSTALLED_HEADERS}
</span><span class="cx"> DESTINATION "${WEBKITGTK_HEADER_INSTALL_DIR}/webkit2"
</span><span class="cx"> )
</span><del>-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
- ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
- DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
-)
-install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
- ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
- DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
-)
</del><span class="cx">
</span><ins>+if (ENABLE_INTROSPECTION)
+ install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.gir
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.gir
+ DESTINATION ${INTROSPECTION_INSTALL_GIRDIR}
+ )
+ install(FILES ${CMAKE_BINARY_DIR}/WebKit2-${WEBKITGTK_API_VERSION}.typelib
+ ${CMAKE_BINARY_DIR}/WebKit2WebExtension-${WEBKITGTK_API_VERSION}.typelib
+ DESTINATION ${INTROSPECTION_INSTALL_TYPELIBDIR}
+ )
+endif ()
+
</ins><span class="cx"> file(WRITE ${CMAKE_BINARY_DIR}/gtkdoc-webkit2gtk.cfg
</span><span class="cx"> "[webkit2gtk]\n"
</span><span class="cx"> "pkgconfig_file=${WebKit2_PKGCONFIG_FILE}\n"
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/cmake/OptionsGTK.cmake (176390 => 176391)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/cmake/OptionsGTK.cmake 2014-11-20 09:49:17 UTC (rev 176390)
+++ releases/WebKitGTK/webkit-2.6/Source/cmake/OptionsGTK.cmake 2014-11-20 10:41:04 UTC (rev 176391)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> set(ENABLE_GTKDOC OFF CACHE BOOL "Whether or not to use generate gtkdoc.")
</span><span class="cx"> set(ENABLE_X11_TARGET ON CACHE BOOL "Whether to enable support for the X11 windowing target.")
</span><span class="cx"> set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayland windowing target.")
</span><ins>+set(ENABLE_INTROSPECTION ON CACHE BOOL "Whether to enable GObject introspection.")
</ins><span class="cx">
</span><span class="cx"> # These are shared variables, but we special case their definition so that we can use the
</span><span class="cx"> # CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
</span><span class="lines">@@ -346,10 +347,12 @@
</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 class="cx"> macro(ADD_TYPELIB typelib)
</span><del>- 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)
</del><ins>+ if (ENABLE_INTROSPECTION)
+ 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)
+ endif ()
</ins><span class="cx"> endmacro()
</span><span class="cx">
</span><span class="cx"> # CMake does not automatically add --whole-archive when building shared objects from
</span></span></pre>
</div>
</div>
</body>
</html>