Changeset 74766 in webkit


Ignore:
Timestamp:
Dec 29, 2010 3:46:42 PM (13 years ago)
Author:
Martin Robinson
Message:

2010-12-27 Amruth Raj <​amruthraj@motorola.com> and Ravi Kasibhatla <​ravi.kasibhatla@motorola.com>

Reviewed by Martin Robinson.

[GTK] Enable building whatever already exists of WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=37369

No new functionality added or deleted. Only makefile change. Hence, no tests added.

  • GNUmakefile.am: Removed bindings/gobject from webcore_sources & webcore_cppflags and added them to WebKit/gtk/GNUmakefile.am
  • platform/network/soup/cache/webkit/soup-cache.h: Remove include <webkit/webkitdefines.h> and declare WEBKIT_API directly

2010-12-15 Amruth Raj <​amruthraj@motorola.com> and Ravi Kasibhatla <​ravi.kasibhatla@motorola.com>

Reviewed by Martin Robinson.

[GTK] Enable building whatever already exists of WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=37369

  • GNUmakefile.am: Added.
  • WebKit2Prefix.h: Included WebCore/config.h for GTK port as the first header file for WebKit2 sources files.
  • gtk: Added.
  • gtk/webkit2.pc.in: Added.
Location:
trunk
Files:
2 added
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/GNUmakefile.am

    r74677 r74766  
    3535GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
    3636GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
     37GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
    3738GENPROGRAMS := $(top_builddir)/Programs
    3839GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
    3940WebCore := $(srcdir)/WebCore
    4041WebKit := $(srcdir)/WebKit/gtk
     42WebKit2 := $(srcdir)/WebKit2
    4143
    4244# Libraries and support components
    … …  
    7072webkitgtk_built_sources :=
    7173webkitgtk_built_nosources :=
     74webkit2_built_sources :=
    7275global_cppflags :=
    7376global_cflags :=
    … …  
    204207include JavaScriptCore/GNUmakefile.am
    205208include WebCore/GNUmakefile.am
     209if ENABLE_WEBKIT2
     210include WebKit2/GNUmakefile.am
     211else
    206212include WebKit/gtk/GNUmakefile.am
    207213include WebCore/bindings/gobject/GNUmakefile.am
    208214include Tools/GNUmakefile.am
    209215include WebKit/gtk/po/GNUmakefile.am
     216endif
    210217
    211218# Autogenerated sources

  • trunk/WebCore/ChangeLog

    r74764 r74766  
     12010-12-27  Amruth Raj  <amruthraj@motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla@motorola.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Enable building whatever already exists of WebKit2
     6        https://bugs.webkit.org/show_bug.cgi?id=37369
     7
     8        No new functionality added or deleted. Only makefile change. Hence, no tests added.
     9
     10        * GNUmakefile.am: Removed bindings/gobject from webcore_sources & webcore_cppflags and
     11        added them to WebKit/gtk/GNUmakefile.am
     12        * platform/network/soup/cache/webkit/soup-cache.h: Remove include <webkit/webkitdefines.h>
     13        and declare WEBKIT_API directly
     14
    1152010-12-29  Eric Seidel  <eric@webkit.org>
    216

  • trunk/WebCore/GNUmakefile.am

    r74761 r74766  
    88        -I$(srcdir)/WebCore \
    99        -I$(srcdir)/WebCore/accessibility \
     10        -I$(srcdir)/WebCore/bindings \
    1011        -I$(srcdir)/WebCore/bindings/generic \
    1112        -I$(srcdir)/WebCore/bindings/js \
    1213        -I$(srcdir)/WebCore/bindings/js/specialization \
    13         -I$(srcdir)/WebCore/bindings/gobject \
    1414        -I$(srcdir)/WebCore/bridge \
    1515        -I$(srcdir)/WebCore/bridge/c \
    … …  
    687687        WebCore/bindings/generic/RuntimeEnabledFeatures.cpp \
    688688        WebCore/bindings/generic/RuntimeEnabledFeatures.h \
    689         WebCore/bindings/gobject/ConvertToUTF8String.cpp \
    690         WebCore/bindings/gobject/ConvertToUTF8String.h \
    691         WebCore/bindings/gobject/DOMObjectCache.cpp \
    692         WebCore/bindings/gobject/DOMObjectCache.h \
    693         WebCore/bindings/gobject/GObjectEventListener.cpp \
    694         WebCore/bindings/gobject/GObjectEventListener.h \
    695         WebCore/bindings/gobject/WebKitDOMBinding.cpp \
    696         WebCore/bindings/gobject/WebKitDOMBinding.h \
    697         WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \
    698         WebCore/bindings/gobject/WebKitDOMEventTarget.h \
    699         WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \
    700         WebCore/bindings/gobject/WebKitDOMObject.cpp \
    701         WebCore/bindings/gobject/WebKitDOMObject.h \
    702         WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \
    703         WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \
    704689        WebCore/bindings/js/CachedScriptSourceProvider.h \
    705690        WebCore/bindings/js/DOMObjectHashTableMap.cpp \

  • trunk/WebCore/platform/network/soup/cache/webkit/soup-cache.h

    r74555 r74766  
    2424#define WEBKIT_SOUP_CACHE_H 1
    2525
    26 #ifdef BUILDING_GTK__
    27 #include <webkit/webkitdefines.h>
     26#ifdef G_OS_WIN32
     27    #ifdef BUILDING_WEBKIT
     28        #define WEBKIT_API __declspec(dllexport)
     29    #else
     30        #define WEBKIT_API __declspec(dllimport)
     31    #endif
     32    #define WEBKIT_OBSOLETE_API WEBKIT_API
    2833#else
    29 #ifndef WEBKIT_API
    30 #define WEBKIT_API
    31 #endif
     34    #define WEBKIT_API __attribute__((visibility("default")))
     35    #define WEBKIT_OBSOLETE_API WEBKIT_API __attribute__((deprecated))
    3236#endif
    3337

  • trunk/WebKit/gtk/GNUmakefile.am

    r74366 r74766  
    155155
    156156webkitgtk_sources += \
     157        WebCore/bindings/gobject/ConvertToUTF8String.cpp \
     158        WebCore/bindings/gobject/ConvertToUTF8String.h \
     159        WebCore/bindings/gobject/DOMObjectCache.cpp \
     160        WebCore/bindings/gobject/DOMObjectCache.h \
     161        WebCore/bindings/gobject/GObjectEventListener.cpp \
     162        WebCore/bindings/gobject/GObjectEventListener.h \
     163        WebCore/bindings/gobject/WebKitDOMBinding.cpp \
     164        WebCore/bindings/gobject/WebKitDOMBinding.h \
     165        WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \
     166        WebCore/bindings/gobject/WebKitDOMEventTarget.h \
     167        WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \
     168        WebCore/bindings/gobject/WebKitDOMObject.cpp \
     169        WebCore/bindings/gobject/WebKitDOMObject.h \
     170        WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \
     171        WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \
    157172        WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
    158173        WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \

  • trunk/WebKit2/ChangeLog

    r74738 r74766  
     12010-12-15  Amruth Raj  <amruthraj@motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla@motorola.com>
     2
     3        Reviewed by Martin Robinson.
     4
     5        [GTK] Enable building whatever already exists of WebKit2
     6        https://bugs.webkit.org/show_bug.cgi?id=37369
     7
     8        * GNUmakefile.am: Added.
     9        * WebKit2Prefix.h: Included WebCore/config.h for GTK port as the first header
     10        file for WebKit2 sources files.
     11        * gtk: Added.
     12        * gtk/webkit2.pc.in: Added.
     13
    1142010-12-29  Juha Savolainen  <juha.savolainen@weego.fi>
    215

  • trunk/WebKit2/WebKit2Prefix.h

    r74124 r74766  
    11/*
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
     3 * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
    34 *
    45 * Redistribution and use in source and binary forms, with or without
    … …  
    2324 * THE POSSIBILITY OF SUCH DAMAGE.
    2425 */
     26
     27#if defined (BUILDING_GTK__)
     28#include <WebCore/config.h>
     29#endif /* defined (BUILDING_GTK__) */
    2530
    2631#include <wtf/Platform.h>

  • trunk/configure.ac

    r74677 r74766  
    901901if test "$enable_video" = "yes"; then
    902902    html_flags=yes
     903fi
     904
     905# WebKit2
     906AC_MSG_CHECKING([whether to build Webkit2])
     907AC_ARG_ENABLE(webkit2,
     908            AC_HELP_STRING([--enable-webkit2],
     909                [build webkit2 [default=no]]),
     910                [], [enable_webkit2="no"])
     911AC_MSG_RESULT([$enable_webkit2])
     912if test "$enable_webkit2" = "yes"; then
     913    # Turn on this macro by default. It is used in inttypes.h for defining macros used by webkit.
     914    # In WebKit, this define is ensured by doing it before including config.h in any source file.
     915    # In WebKit2, WebKit2Prefix.h is included as first header file, so we need to define this
     916    # macro before actually WebKit2Prefix.h is included in any file.
     917    AC_DEFINE([__STDC_FORMAT_MACROS],[1],[Turn on the __STDC_FORMAT_MACROS used in inttypes.h]),
     918    WEBKITGTK_PC_NAME=${WEBKITGTK_PC_NAME}2
     919    AC_SUBST([WEBKITGTK_PC_NAME])
    903920fi
    904921
    … …  
    977994AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
    978995AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
     996AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
    979997
    980998# Gtk conditionals
    981999AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
    9821000
    983 
    9841001AC_CONFIG_FILES([
    9851002GNUmakefile
    986 WebKit/gtk/webkit/webkitversion.h
    987 WebKit/gtk/docs/GNUmakefile
    988 WebKit/gtk/docs/version.xml
    989 ]
    990 )
    991 
    992 AC_CONFIG_FILES([
    993 WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
    994 WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
    995 WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in
    996 ]
    997 ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
    998 )
     1003])
     1004 
     1005if test "$enable_webkit2" = "no"; then
     1006    AC_CONFIG_FILES([
     1007    WebKit/gtk/webkit/webkitversion.h
     1008    WebKit/gtk/docs/GNUmakefile
     1009    WebKit/gtk/docs/version.xml
     1010    ]
     1011    )
     1012
     1013    AC_CONFIG_FILES([
     1014    WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
     1015    WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
     1016    WebKit/gtk/org.webkitgtk-${WEBKITGTK_API_VERSION}.gschema.xml:WebKit/gtk/org.webkitgtk.gschema.xml.in
     1017    ]
     1018    ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
     1019    )
     1020else
     1021    AC_CONFIG_FILES([
     1022    WebKit2/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit2/gtk/webkit2.pc.in
     1023    ]
     1024    ,[WEBKITGTK_API_VERSION=$WEBKITGTK_API_VERSION,WEBKITGTK_PC_NAME=$WEBKITGTK_PC_NAME]
     1025    )
     1026fi
    9991027
    10001028AC_OUTPUT
    … …  
    10551083 Hildon UI extensions                                     : $with_hildon
    10561084 Introspection support                                    : $enable_introspection
     1085 WebKit2 support                                          : $enable_webkit2
    10571086"
    10581087if test "$with_unicode_backend" = "glib"; then
Note: See TracChangeset for help on using the changeset viewer.