⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 184010 in webkit


Ignore:
Timestamp:
May 8, 2015, 1:29:45 PM (11 years ago)
Author:
Martin Robinson
Message:

.:
015-05-08 Michael Catanzaro <Michael Catanzaro>, Martin Robinson <​mrobinson@igalia.com>

[GTK] Checks for DEVELOPMENT_BUILD are all wrong
​https://bugs.webkit.org/show_bug.cgi?id=144746

Reviewed by Carlos Garcia Campos.

Don't set DEVELOPMENT_BUILD. We check whether it is defined for conditional compilation, not
what it is defined to, so defining it to 0 effectively turned it on always. Instead set
ENABLE_DEVELOPER_MODE so that we can use the ENABLE macro inside WebKit source code.

  • Source/cmake/OptionsGTK.cmake:

Source/WebCore:
[GTK] Checks for DEVELOPMENT_BUILD are all wrong
​https://bugs.webkit.org/show_bug.cgi?id=144746

Reviewed by Carlos Garcia Campos.

Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.

  • platform/gtk/GtkUtilities.cpp:
  • platform/gtk/GtkUtilities.h:
  • platform/text/gtk/HyphenationLibHyphen.cpp:

(WebCore::availableLocales):

Source/WebKit2:
[GTK] Checks for DEVELOPMENT_BUILD are all wrong
​https://bugs.webkit.org/show_bug.cgi?id=144746

Reviewed by Carlos Garcia Campos.

Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.

  • Shared/gtk/ProcessExecutablePathGtk.cpp:

(WebKit::findWebKitProcess):

  • UIProcess/API/gtk/WebKitWebContext.cpp:

(injectedBundleDirectory):

  • UIProcess/gtk/TextCheckerGtk.cpp:

(WebKit::enchantTextChecker):

Tools:
015-05-08 Michael Catanzaro <Michael Catanzaro>, Martin Robinson <​mrobinson@igalia.com>

[GTK] Checks for DEVELOPMENT_BUILD are all wrong
​https://bugs.webkit.org/show_bug.cgi?id=144746

Reviewed by Carlos Garcia Campos.

Use ENABLE_DEVELOPER_MODE rather than DEVELOPMENT_BUILD.

  • MiniBrowser/gtk/main.c:

(main):

Location:
trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r184002 r184010  
     1015-05-08  Michael Catanzaro  <mcatanzaro@igalia.com>, Martin Robinson <mrobinson@igalia.com>
     2
     3        [GTK] Checks for DEVELOPMENT_BUILD are all wrong
     4        https://bugs.webkit.org/show_bug.cgi?id=144746
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Don't set DEVELOPMENT_BUILD. We check whether it is defined for conditional compilation, not
     9        what it is defined to, so defining it to 0 effectively turned it on always. Instead set
     10        ENABLE_DEVELOPER_MODE so that we can use the ENABLE macro inside WebKit source code.
     11
     12        * Source/cmake/OptionsGTK.cmake:
     13
    1142015-05-08  Daniel Bates  <dabates@apple.com>
    215

  • trunk/Source/WebCore/ChangeLog

    r184005 r184010  
     12015-05-08  Michael Catanzaro  <mcatanzaro@igalia.com>, Martin Robinson <mrobinson@igalia.com>
     2
     3        [GTK] Checks for DEVELOPMENT_BUILD are all wrong
     4        https://bugs.webkit.org/show_bug.cgi?id=144746
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.
     9
     10        * platform/gtk/GtkUtilities.cpp:
     11        * platform/gtk/GtkUtilities.h:
     12        * platform/text/gtk/HyphenationLibHyphen.cpp:
     13        (WebCore::availableLocales):
     14
    1152015-05-08  Alexey Proskuryakov  <ap@apple.com>
    216

  • trunk/Source/WebCore/platform/gtk/GtkUtilities.cpp

    r183986 r184010  
    5555}
    5656
    57 #if defined(DEVELOPMENT_BUILD)
     57#if ENABLE(DEVELOPER_MODE)
    5858static CString topLevelPath()
    5959{

  • trunk/Source/WebCore/platform/gtk/GtkUtilities.h

    r183986 r184010  
    2929bool widgetIsOnscreenToplevelWindow(GtkWidget*);
    3030
    31 #if defined(DEVELOPMENT_BUILD)
     31#if ENABLE(DEVELOPER_MODE)
    3232CString webkitBuildDirectory();
    3333#endif

  • trunk/Source/WebCore/platform/text/gtk/HyphenationLibHyphen.cpp

    r183986 r184010  
    6464}
    6565
    66 #if defined(DEVELOPMENT_BUILD)
     66#if ENABLE(DEVELOPER_MODE)
    6767static void scanTestDictionariesDirectoryIfNecessary(HashMap<AtomicString, String>& availableLocales)
    6868{
    … …  
    9292            scanDirectoryForDicionaries(gDictionaryDirectories[i], availableLocales);
    9393
    94 #if defined(DEVELOPMENT_BUILD)
     94#if ENABLE(DEVELOPER_MODE)
    9595        scanTestDictionariesDirectoryIfNecessary(availableLocales);
    9696#endif

  • trunk/Source/WebKit2/ChangeLog

    r184004 r184010  
     12015-05-08  Michael Catanzaro  <mcatanzaro@igalia.com>, Martin Robinson <mrobinson@igalia.com>
     2
     3        [GTK] Checks for DEVELOPMENT_BUILD are all wrong
     4        https://bugs.webkit.org/show_bug.cgi?id=144746
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Use ENABLE(DEVELOPER_MODE) rather than DEVELOPMENT_BUILD.
     9
     10        * Shared/gtk/ProcessExecutablePathGtk.cpp:
     11        (WebKit::findWebKitProcess):
     12        * UIProcess/API/gtk/WebKitWebContext.cpp:
     13        (injectedBundleDirectory):
     14        * UIProcess/gtk/TextCheckerGtk.cpp:
     15        (WebKit::enchantTextChecker):
     16
    1172015-05-08  Anders Carlsson  <andersca@apple.com>
    218

  • trunk/Source/WebKit2/Shared/gtk/ProcessExecutablePathGtk.cpp

    r183986 r184010  
    3131#include <glib.h>
    3232
    33 #if defined(DEVELOPMENT_BUILD)
     33#if ENABLE(DEVELOPER_MODE)
    3434#include <wtf/gobject/GlibUtilities.h>
    3535#endif
    … …  
    3939namespace WebKit {
    4040
    41 #if defined(DEVELOPMENT_BUILD)
     41#if ENABLE(DEVELOPER_MODE)
    4242static String getExecutablePath()
    4343{
    … …  
    5151static String findWebKitProcess(const char* processName)
    5252{
    53 #if defined(DEVELOPMENT_BUILD)
     53#if ENABLE(DEVELOPER_MODE)
    5454    static const char* execDirectory = g_getenv("WEBKIT_EXEC_PATH");
    5555    if (execDirectory) {

  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp

    r183986 r184010  
    217217static const char* injectedBundleDirectory()
    218218{
    219 #if defined(DEVELOPMENT_BUILD)
     219#if ENABLE(DEVELOPER_MODE)
    220220    const char* bundleDirectory = g_getenv("WEBKIT_INJECTED_BUNDLE_PATH");
    221221    if (bundleDirectory && g_file_test(bundleDirectory, G_FILE_TEST_IS_DIR))

  • trunk/Source/WebKit2/UIProcess/gtk/TextCheckerGtk.cpp

    r183986 r184010  
    4545    static NeverDestroyed<WebCore::TextCheckerEnchant> checker;
    4646
    47 #if defined(DEVELOPMENT_BUILD)
     47#if ENABLE(DEVELOPER_MODE)
    4848    // This is a bit of a hack, but ensures that for testing purposes,
    4949    // spell checking is properly initialized in WebKitTestRunner while

  • trunk/Source/cmake/OptionsGTK.cmake

    r183986 r184010  
    7777WEBKIT_OPTION_DEPEND(USE_GSTREAMER_MPEGTS ENABLE_VIDEO)
    7878
    79 # FIXME: There is no reason these should be different.
    80 SET_AND_EXPOSE_TO_BUILD(DEVELOPMENT_BUILD ${DEVELOPER_MODE})
     79SET_AND_EXPOSE_TO_BUILD(ENABLE_DEVELOPER_MODE ${DEVELOPER_MODE})
    8180if (DEVELOPER_MODE)
    8281    WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_MINIBROWSER PUBLIC ON)

  • trunk/Tools/ChangeLog

    r184003 r184010  
     1015-05-08  Michael Catanzaro  <mcatanzaro@igalia.com>, Martin Robinson <mrobinson@igalia.com>
     2
     3        [GTK] Checks for DEVELOPMENT_BUILD are all wrong
     4        https://bugs.webkit.org/show_bug.cgi?id=144746
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        Use ENABLE_DEVELOPER_MODE rather than DEVELOPMENT_BUILD.
     9
     10        * MiniBrowser/gtk/main.c:
     11        (main):
     12
    1132015-05-08  Commit Queue  <commit-queue@webkit.org>
    214

  • trunk/Tools/MiniBrowser/gtk/main.c

    r183986 r184010  
    257257{
    258258    gtk_init(&argc, &argv);
    259 #if defined(DEVELOPMENT_BUILD)
     259#if ENABLE_DEVELOPER_MODE
    260260    g_setenv("WEBKIT_INJECTED_BUNDLE_PATH", WEBKIT_INJECTED_BUNDLE_PATH, FALSE);
    261261#endif
Note: See TracChangeset for help on using the changeset viewer.