Changeset 181395 in webkit


Ignore:
Timestamp:
Mar 11, 2015 11:08:39 AM (9 years ago)
Author:
Carlos Garcia Campos
Message:

[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.

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r181392 r181395  
     12015-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
    1132015-03-11  Carlos Garcia Campos  <cgarcia@igalia.com>
    214
  • trunk/Source/cmake/OptionsGTK.cmake

    r181392 r181395  
    7979WEBKIT_OPTION_BEGIN()
    8080WEBKIT_OPTION_DEFINE(ENABLE_PLUGIN_PROCESS_GTK2 "Whether to build WebKitPluginProcess2 to load GTK2 based plugins." ON)
     81WEBKIT_OPTION_DEFINE(ENABLE_MINIBROWSER "Whether to enable MiniBrowser compilation." OFF)
    8182
    8283if ((OPENGL_FOUND OR OPENGLES2_FOUND) AND (GLX_FOUND OR EGL_FOUND))
     
    126127
    127128if (DEVELOPER_MODE)
    128     set(ENABLE_TOOLS ON)
     129    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER ON)
    129130    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS ON)
    130131else ()
    131     set(ENABLE_TOOLS OFF)
     132    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER OFF)
    132133    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS OFF)
    133134    set(WebKit2_VERSION_SCRIPT "-Wl,--version-script,${CMAKE_MODULE_PATH}/gtksymbols.filter")
  • trunk/Tools/CMakeLists.txt

    r173949 r181395  
    1 if (ENABLE_WEBKIT2)
     1if ("${PORT}" STREQUAL "Efl")
    22    add_subdirectory(WebKitTestRunner)
    3 endif ()
    4 
    5 if ("${PORT}" STREQUAL "Efl")
    63    add_subdirectory(ImageDiff)
    74
     
    96    add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
    107elseif ("${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)
    1320        add_subdirectory(MiniBrowser/gtk)
    14         add_subdirectory(TestWebKitAPI/Tests/WebKit2Gtk)
    15     endif ()
    16     if (ENABLE_X11_TARGET)
    17         add_subdirectory(DumpRenderTree/TestNetscapePlugIn)
    1821    endif ()
    1922endif ()
  • trunk/Tools/ChangeLog

    r181393 r181395  
     12015-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
    1172015-03-11  Brent Fulgham  <bfulgham@apple.com>
    218
  • trunk/Tools/MiniBrowser/gtk/CMakeLists.txt

    r165494 r181395  
    4646    VERBATIM)
    4747
    48 add_definitions(-DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
    49 add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
     48if (DEVELOPER_MODE)
     49    add_definitions(-DWEBKIT_INJECTED_BUNDLE_PATH="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
     50endif ()
    5051
    5152include_directories(${MiniBrowser_INCLUDE_DIRECTORIES})
     
    5354target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES})
    5455set_target_properties(MiniBrowser PROPERTIES FOLDER "Tools")
     56
     57install(TARGETS MiniBrowser DESTINATION "${EXEC_INSTALL_DIR}")
  • trunk/Tools/MiniBrowser/gtk/main.c

    r178699 r181395  
    257257{
    258258    gtk_init(&argc, &argv);
     259#if defined(DEVELOPMENT_BUILD)
    259260    g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
     261#endif
    260262
    261263    const gchar *multiprocess = g_getenv("MINIBROWSER_MULTIPROCESS");
Note: See TracChangeset for help on using the changeset viewer.