Changeset 181395 in webkit
- Timestamp:
- Mar 11, 2015 11:08:39 AM (9 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r181392 r181395 1 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Add an option to enable MiniBrowser for non developer builds and always install it 4 https://bugs.webkit.org/show_bug.cgi?id=126688 5 6 Reviewed by Gustavo Noronha Silva. 7 8 Add ENABLE_MINIBROWSER option, enabled by default for development 9 builds and disabled for production builds unless explicilty enabled. 10 11 * Source/cmake/OptionsGTK.cmake: 12 1 13 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com> 2 14 -
trunk/Source/cmake/OptionsGTK.cmake
r181392 r181395 79 79 WEBKIT_OPTION_BEGIN() 80 80 WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." ON) 81 WEBKIT_OPTION_DEFINE(ENABLE_MINIBROWSER "Whether to enable MiniBrowser compilation." OFF) 81 82 82 83 if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND)) … … 126 127 127 128 if (DEVELOPER_MODE) 128 set(ENABLE_TOOLSON)129 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER ON) 129 130 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON) 130 131 else () 131 set(ENABLE_TOOLSOFF)132 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER OFF) 132 133 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF) 133 134 set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter") -
trunk/Tools/CMakeLists.txt
r173949 r181395 1 if ( ENABLE_WEBKIT2)1 if ("${PORT}" STREQUAL "Efl") 2 2 add_subdirectory(WebKitTestRunner) 3 endif ()4 5 if ("${PORT}" STREQUAL "Efl")6 3 add_subdirectory(ImageDiff) 7 4 … … 9 6 add_subdirectory(DumpRenderTree/TestNetscapePlugIn) 10 7 elseif ("${PORT}" STREQUAL "GTK") 11 add_subdirectory(ImageDiff) 12 if (ENABLE_WEBKIT2) 8 if (DEVELOPER_MODE) 9 add_subdirectory(WebKitTestRunner) 10 add_subdirectory(ImageDiff) 11 if (ENABLE_API_TESTS) 12 add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk) 13 endif () 14 if (ENABLE_X11_TARGET) 15 add_subdirectory(DumpRenderTree/TestNetscapePlugIn) 16 endif () 17 endif () 18 19 if (ENABLE_MINIBROWSER) 13 20 add_subdirectory(MiniBrowser/gtk) 14 add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)15 endif ()16 if (ENABLE_X11_TARGET)17 add_subdirectory(DumpRenderTree/TestNetscapePlugIn)18 21 endif () 19 22 endif () -
trunk/Tools/ChangeLog
r181393 r181395 1 2015-03-11 Carlos Garcia Campos <cgarcia@igalia.com> 2 3 [GTK] Add an option to enable MiniBrowser for non developer builds and always install it 4 https://bugs.webkit.org/show_bug.cgi?id=126688 5 6 Reviewed by Gustavo Noronha Silva. 7 8 * CMakeLists.txt: Build testing tools only for developer builds, 9 but MiniBrowser when ENABLE_MINIBROWSER option is ON. 10 * MiniBrowser/gtk/CMakeLists.txt: Only add 11 -DWEBKIT_INJECTED_BUNDLE_PATH to the build for developer builds, 12 and add a rule to install the MiniBrowser. 13 * MiniBrowser/gtk/main.c: 14 (main): Only set WEBKIT_INJECTED_BUNDLE_PATH env var for developer 15 builds. 16 1 17 2015-03-11 Brent Fulgham <bfulgham@apple.com> 2 18 -
trunk/Tools/MiniBrowser/gtk/CMakeLists.txt
r165494 r181395 46 46 VERBATIM) 47 47 48 add_definitions(-DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") 49 add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") 48 if (DEVELOPER_MODE) 49 add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") 50 endif () 50 51 51 52 include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) … … 53 54 target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) 54 55 set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools") 56 57 install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}") -
trunk/Tools/MiniBrowser/gtk/main.c
r178699 r181395 257 257 { 258 258 gtk_init(&argc, &argv); 259 #if defined(DEVELOPMENT_BUILD) 259 260 g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE); 261 #endif 260 262 261 263 const gchar *multiprocess = g_getenv("MINIBROWSER_MULTIPROCESS");
Note: See TracChangeset
for help on using the changeset viewer.