<!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>[181530] releases/WebKitGTK/webkit-2.8</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/181530">181530</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-03-16 02:36:19 -0700 (Mon, 16 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181395">r181395</a> - [GTK] Add an option to enable MiniBrowser for non developer builds and always install it
https://bugs.webkit.org/show_bug.cgi?id=126688
Reviewed by Gustavo Noronha Silva.
.:
Add ENABLE_MINIBROWSER option, enabled by default for development
builds and disabled for production builds unless explicilty enabled.
* Source/cmake/OptionsGTK.cmake:
Tools:
* CMakeLists.txt: Build testing tools only for developer builds,
but MiniBrowser when ENABLE_MINIBROWSER option is ON.
* MiniBrowser/gtk/CMakeLists.txt: Only add
-DWEBKIT_INJECTED_BUNDLE_PATH to the build for developer builds,
and add a rule to install the MiniBrowser.
* MiniBrowser/gtk/main.c:
(main): Only set WEBKIT_INJECTED_BUNDLE_PATH env var for developer
builds.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28ChangeLog">releases/WebKitGTK/webkit-2.8/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourcecmakeOptionsGTKcmake">releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#releasesWebKitGTKwebkit28ToolsCMakeListstxt">releases/WebKitGTK/webkit-2.8/Tools/CMakeLists.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28ToolsChangeLog">releases/WebKitGTK/webkit-2.8/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28ToolsMiniBrowsergtkCMakeListstxt">releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/CMakeLists.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28ToolsMiniBrowsergtkmainc">releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/main.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/ChangeLog (181529 => 181530)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-16 09:06:09 UTC (rev 181529)
+++ releases/WebKitGTK/webkit-2.8/ChangeLog 2015-03-16 09:36:19 UTC (rev 181530)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Add an option to enable MiniBrowser for non developer builds and always install it
+ https://bugs.webkit.org/show_bug.cgi?id=126688
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Add ENABLE_MINIBROWSER option, enabled by default for development
+ builds and disabled for production builds unless explicilty enabled.
+
+ * Source/cmake/OptionsGTK.cmake:
+
+2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Do not look for child processes in the UI process binary path
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=135752
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake (181529 => 181530)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-16 09:06:09 UTC (rev 181529)
+++ releases/WebKitGTK/webkit-2.8/Source/cmake/OptionsGTK.cmake 2015-03-16 09:36:19 UTC (rev 181530)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx">
</span><span class="cx"> WEBKIT_OPTION_BEGIN()
</span><span class="cx"> WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." ON)
</span><ins>+WEBKIT_OPTION_DEFINE(ENABLE_MINIBROWSER "Whether to enable MiniBrowser compilation." OFF)
</ins><span class="cx">
</span><span class="cx"> if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND))
</span><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL ON)
</span><span class="lines">@@ -125,10 +126,10 @@
</span><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (DEVELOPER_MODE)
</span><del>- set(ENABLE_TOOLS ON)
</del><ins>+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER ON)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
</span><span class="cx"> else ()
</span><del>- set(ENABLE_TOOLS OFF)
</del><ins>+ WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER OFF)
</ins><span class="cx"> WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
</span><span class="cx"> set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
</span><span class="cx"> endif ()
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28ToolsCMakeListstxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Tools/CMakeLists.txt (181529 => 181530)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Tools/CMakeLists.txt 2015-03-16 09:06:09 UTC (rev 181529)
+++ releases/WebKitGTK/webkit-2.8/Tools/CMakeLists.txt 2015-03-16 09:36:19 UTC (rev 181530)
</span><span class="lines">@@ -1,21 +1,24 @@
</span><del>-if (ENABLE_WEBKIT2)
</del><ins>+if ("${PORT}" STREQUAL "Efl")
</ins><span class="cx"> add_subdirectory(WebKitTestRunner)
</span><del>-endif ()
-
-if ("${PORT}" STREQUAL "Efl")
</del><span class="cx"> add_subdirectory(ImageDiff)
</span><span class="cx">
</span><span class="cx"> add_subdirectory(MiniBrowser/efl)
</span><span class="cx"> add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
</span><span class="cx"> elseif ("${PORT}" STREQUAL "GTK")
</span><del>- add_subdirectory(ImageDiff)
- if (ENABLE_WEBKIT2)
</del><ins>+ if (DEVELOPER_MODE)
+ add_subdirectory(WebKitTestRunner)
+ add_subdirectory(ImageDiff)
+ if (ENABLE_API_TESTS)
+ add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
+ endif ()
+ if (ENABLE_X11_TARGET)
+ add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
+ endif ()
+ endif ()
+
+ if (ENABLE_MINIBROWSER)
</ins><span class="cx"> add_subdirectory(MiniBrowser/gtk)
</span><del>- add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
</del><span class="cx"> endif ()
</span><del>- if (ENABLE_X11_TARGET)
- add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
- endif ()
</del><span class="cx"> endif ()
</span><span class="cx">
</span><span class="cx"> if (ENABLE_WEBKIT2 AND ENABLE_API_TESTS)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Tools/ChangeLog (181529 => 181530)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Tools/ChangeLog 2015-03-16 09:06:09 UTC (rev 181529)
+++ releases/WebKitGTK/webkit-2.8/Tools/ChangeLog 2015-03-16 09:36:19 UTC (rev 181530)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Add an option to enable MiniBrowser for non developer builds and always install it
+ https://bugs.webkit.org/show_bug.cgi?id=126688
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * CMakeLists.txt: Build testing tools only for developer builds,
+ but MiniBrowser when ENABLE_MINIBROWSER option is ON.
+ * MiniBrowser/gtk/CMakeLists.txt: Only add
+ -DWEBKIT_INJECTED_BUNDLE_PATH to the build for developer builds,
+ and add a rule to install the MiniBrowser.
+ * MiniBrowser/gtk/main.c:
+ (main): Only set WEBKIT_INJECTED_BUNDLE_PATH env var for developer
+ builds.
+
</ins><span class="cx"> 2015-03-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Test /webkit2/WebKitWebView/sync-request-on-max-conns might fail after finished
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28ToolsMiniBrowsergtkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/CMakeLists.txt (181529 => 181530)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/CMakeLists.txt 2015-03-16 09:06:09 UTC (rev 181529)
+++ releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/CMakeLists.txt 2015-03-16 09:36:19 UTC (rev 181530)
</span><span class="lines">@@ -45,10 +45,13 @@
</span><span class="cx"> COMMAND glib-genmarshal --prefix=browser_marshal ${MINIBROWSER_DIR}/browser-marshal.list --header > ${DERIVED_SOURCES_MINIBROWSER_DIR}/BrowserMarshal.h
</span><span class="cx"> VERBATIM)
</span><span class="cx">
</span><del>-add_definitions(-DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
-add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
</del><ins>+if (DEVELOPER_MODE)
+ add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
+endif ()
</ins><span class="cx">
</span><span class="cx"> include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
</span><span class="cx"> add_executable(MiniBrowser ${MiniBrowser_SOURCES})
</span><span class="cx"> target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
</span><span class="cx"> set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
</span><ins>+
+install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}")
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28ToolsMiniBrowsergtkmainc"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/main.c (181529 => 181530)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/main.c 2015-03-16 09:06:09 UTC (rev 181529)
+++ releases/WebKitGTK/webkit-2.8/Tools/MiniBrowser/gtk/main.c 2015-03-16 09:36:19 UTC (rev 181530)
</span><span class="lines">@@ -256,7 +256,9 @@
</span><span class="cx"> int main(int argc, char *argv[])
</span><span class="cx"> {
</span><span class="cx"> gtk_init(&argc, &argv);
</span><ins>+#if defined(DEVELOPMENT_BUILD)
</ins><span class="cx"> g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> const gchar *multiprocess = g_getenv("MINIBROWSER_MULTIPROCESS");
</span><span class="cx"> if (multiprocess && *multiprocess) {
</span></span></pre>
</div>
</div>
</body>
</html>