Changeset 74124 in webkit


Ignore:
Timestamp:
Dec 15, 2010 10:49:59 AM (13 years ago)
Author:
Martin Robinson
Message:

2010-12-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r74117.
http://trac.webkit.org/changeset/74117
https://bugs.webkit.org/show_bug.cgi?id=51113

This broke the GTK1 build. (Requested by mrobinson on
#webkit).

  • GNUmakefile.am:
  • configure.ac:

2010-12-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r74117.
http://trac.webkit.org/changeset/74117
https://bugs.webkit.org/show_bug.cgi?id=51113

This broke the GTK1 build. (Requested by mrobinson on
#webkit).

  • GNUmakefile.am:
  • platform/network/soup/cache/webkit/soup-cache.h:

2010-12-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r74117.
http://trac.webkit.org/changeset/74117
https://bugs.webkit.org/show_bug.cgi?id=51113

This broke the GTK1 build. (Requested by mrobinson on
#webkit).

  • GNUmakefile.am:

2010-12-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r74117.
http://trac.webkit.org/changeset/74117
https://bugs.webkit.org/show_bug.cgi?id=51113

This broke the GTK1 build. (Requested by mrobinson on
#webkit).

  • GNUmakefile.am: Removed.
  • Scripts/generate-forwarding-headers.pl:
  • WebKit2Prefix.h:
  • gtk/webkit2.pc.in: Removed.

2010-12-15 Sheriff Bot <webkit.review.bot@gmail.com>

Unreviewed, rolling out r74117.
http://trac.webkit.org/changeset/74117
https://bugs.webkit.org/show_bug.cgi?id=51113

This broke the GTK1 build. (Requested by mrobinson on
#webkit).

  • Scripts/webkitdirs.pm:
Location:
trunk
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r74117 r74124  
     12010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r74117.
     4        http://trac.webkit.org/changeset/74117
     5        https://bugs.webkit.org/show_bug.cgi?id=51113
     6
     7        This broke the GTK1 build. (Requested by mrobinson on
     8        #webkit).
     9
     10        * GNUmakefile.am:
     11        * configure.ac:
     12
    1132010-12-15  Amruth Raj  <amruthraj@motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla@motorola.com>
    214
  • trunk/GNUmakefile.am

    r74117 r74124  
    3535GENSOURCES_WEBCORE := $(top_builddir)/DerivedSources/WebCore
    3636GENSOURCES_WEBKIT := $(top_builddir)/DerivedSources/webkit
    37 GENSOURCES_WEBKIT2 := $(top_builddir)/DerivedSources/WebKit2
    3837GENPROGRAMS := $(top_builddir)/Programs
    3938GENSOURCES_INSPECTOR := $(GENPROGRAMS)/resources/inspector
    4039WebCore := $(srcdir)/WebCore
    4140WebKit := $(srcdir)/WebKit/gtk
    42 WebKit2 := $(srcdir)/WebKit2
    4341
    4442# Libraries and support components
     
    7270webkitgtk_built_sources :=
    7371webkitgtk_built_nosources :=
    74 webkit2_built_sources :=
    7572global_cppflags :=
    7673global_cflags :=
     
    207204include JavaScriptCore/GNUmakefile.am
    208205include WebCore/GNUmakefile.am
    209 # Include module makefiles based on webkit arch
    210 if ENABLE_WEBKIT2
    211 include WebKit2/GNUmakefile.am
    212 else  #ENABLE_WEBKIT2
    213206include WebKit/gtk/GNUmakefile.am
    214207include WebCore/bindings/gobject/GNUmakefile.am
    215208include WebKitTools/GNUmakefile.am
    216209include WebKit/gtk/po/GNUmakefile.am
    217 endif  #ENABLE_WEBKIT2
    218210
    219211# Autogenerated sources
  • trunk/WebCore/ChangeLog

    r74122 r74124  
     12010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r74117.
     4        http://trac.webkit.org/changeset/74117
     5        https://bugs.webkit.org/show_bug.cgi?id=51113
     6
     7        This broke the GTK1 build. (Requested by mrobinson on
     8        #webkit).
     9
     10        * GNUmakefile.am:
     11        * platform/network/soup/cache/webkit/soup-cache.h:
     12
    1132010-12-15  Jian Li  <jianli@chromium.org>
    214
  • trunk/WebCore/GNUmakefile.am

    r74117 r74124  
    88        -I$(srcdir)/WebCore \
    99        -I$(srcdir)/WebCore/accessibility \
    10         -I$(srcdir)/WebCore/bindings \
    1110        -I$(srcdir)/WebCore/bindings/generic \
    1211        -I$(srcdir)/WebCore/bindings/js \
    1312        -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 \
    689704        WebCore/bindings/js/CachedScriptSourceProvider.h \
    690705        WebCore/bindings/js/DOMObjectHashTableMap.cpp \
     
    38173832endif
    38183833
     3834
    38193835# ---
    38203836# Channel mesaging support
  • trunk/WebCore/platform/network/soup/cache/webkit/soup-cache.h

    r74117 r74124  
    2424#define WEBKIT_SOUP_CACHE_H 1
    2525
    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
     26#if BUILDING_GTK__
     27#include <webkit/webkitdefines.h>
    3328#else
    34 #define WEBKIT_API __attribute__((visibility("default")))
    35 #define WEBKIT_OBSOLETE_API WEBKIT_API __attribute__((deprecated))
     29#ifndef WEBKIT_API
     30#define WEBKIT_API
     31#endif
    3632#endif
    3733
  • trunk/WebKit/gtk/ChangeLog

    r74117 r74124  
     12010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r74117.
     4        http://trac.webkit.org/changeset/74117
     5        https://bugs.webkit.org/show_bug.cgi?id=51113
     6
     7        This broke the GTK1 build. (Requested by mrobinson on
     8        #webkit).
     9
     10        * GNUmakefile.am:
     11
    1122010-12-15  Amruth Raj  <amruthraj@motorola.com> and Ravi Phaneendra Kasibhatla  <ravi.kasibhatla@motorola.com>
    213
  • trunk/WebKit/gtk/GNUmakefile.am

    r74117 r74124  
    155155
    156156webkitgtk_sources += \
    157         WebCore/bindings/gobject/ConvertToUTF8String.cpp \
    158         WebCore/bindings/gobject/ConvertToUTF8String.h \
    159         WebCore/bindings/gobject/GObjectEventListener.cpp \
    160         WebCore/bindings/gobject/GObjectEventListener.h \
    161         WebCore/bindings/gobject/WebKitDOMBinding.cpp \
    162         WebCore/bindings/gobject/WebKitDOMBinding.h \
    163         WebCore/bindings/gobject/WebKitDOMEventTarget.cpp \
    164         WebCore/bindings/gobject/WebKitDOMEventTarget.h \
    165         WebCore/bindings/gobject/WebKitDOMEventTargetPrivate.h \
    166         WebCore/bindings/gobject/WebKitDOMObject.cpp \
    167         WebCore/bindings/gobject/WebKitDOMObject.h \
    168         WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.cpp \
    169         WebCore/bindings/gobject/WebKitHTMLElementWrapperFactory.h \
    170157        WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp \
    171158        WebKit/gtk/WebCoreSupport/ChromeClientGtk.h \
  • trunk/WebKit2/ChangeLog

    r74117 r74124  
     12010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r74117.
     4        http://trac.webkit.org/changeset/74117
     5        https://bugs.webkit.org/show_bug.cgi?id=51113
     6
     7        This broke the GTK1 build. (Requested by mrobinson on
     8        #webkit).
     9
     10        * GNUmakefile.am: Removed.
     11        * Scripts/generate-forwarding-headers.pl:
     12        * WebKit2Prefix.h:
     13        * gtk/webkit2.pc.in: Removed.
     14
    1152010-12-15  Amruth Raj  <amruthraj@motorola.com> and Ravi Kasibhatla  <ravi.kasibhatla@motorola.com>
    216
  • trunk/WebKit2/Scripts/generate-forwarding-headers.pl

    r74117 r74124  
    4848my $platform  = $ARGV[0];
    4949
    50 my $network;
    51 if ($platform =~ "gtk") {
    52     shift;
    53     $network = $ARGV[0];
    54 }
    55 
    5650foreach my $prefix (@platformPrefixes) {
    57     if ($platform =~ "gtk") {
    58         push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform or $prefix =~ $network);
    59     } else {
    60         push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform);
    61     }
     51    push(@skippedPrefixes, $prefix) unless ($prefix =~ $platform);
    6252}
    6353
  • trunk/WebKit2/WebKit2Prefix.h

    r74117 r74124  
    11/*
    22 * Copyright (C) 2010 Apple Inc. All rights reserved.
    3  * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
    43 *
    54 * Redistribution and use in source and binary forms, with or without
     
    2524 */
    2625
    27 #if defined (BUILDING_GTK__)
    28 #include <WebCore/config.h>
    29 #endif /* defined (BUILDING_GTK__) */
    3026#include <wtf/Platform.h>
    3127#include <wtf/DisallowCType.h>
     
    114110
    115111#endif /* defined(WIN32) || defined(_WIN32) */
     112
  • trunk/WebKitTools/ChangeLog

    r74123 r74124  
     12010-12-15  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r74117.
     4        http://trac.webkit.org/changeset/74117
     5        https://bugs.webkit.org/show_bug.cgi?id=51113
     6
     7        This broke the GTK1 build. (Requested by mrobinson on
     8        #webkit).
     9
     10        * Scripts/webkitdirs.pm:
     11
    1122010-12-15  Lucas Forschler  <lforschler@apple.com>
    213
  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r74117 r74124  
    13531353        } elsif ($opt =~ /^--prefix=(.*)/i ) {
    13541354            $prefix = $1;
    1355         } elsif ($opt =~ /^--webkit2/i ) {
    1356             push @buildArgs, "--enable-webkit2";
    13571355        } else {
    13581356            push @buildArgs, $opt;
  • trunk/configure.ac

    r74117 r74124  
    901901if test "$enable_video" = "yes"; then
    902902    html_flags=yes
    903 fi
    904 
    905 # WebKit2
    906 AC_MSG_CHECKING([whether to build Webkit2])
    907 AC_ARG_ENABLE(webkit2,
    908             AC_HELP_STRING([--enable-webkit2],
    909                 [build webkit2 [default=no]]),
    910                 [], [enable_webkit2="no"])
    911 AC_MSG_RESULT([$enable_webkit2])
    912 if 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])
    920903fi
    921904
     
    994977AM_CONDITIONAL([ENABLE_WEB_TIMING],[test "$enable_web_timing" = "yes"])
    995978AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
    996 AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
    997979
    998980# Gtk conditionals
    999981AM_CONDITIONAL([ENABLE_INTROSPECTION],[test "$enable_introspection" = "yes"])
    1000982
     983
    1001984AC_CONFIG_FILES([
    1002985GNUmakefile
    1003 ])
    1004  
    1005 if 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     )
    1020 else
    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     )
    1026 fi
     986WebKit/gtk/webkit/webkitversion.h
     987WebKit/gtk/docs/GNUmakefile
     988WebKit/gtk/docs/version.xml
     989]
     990)
     991
     992AC_CONFIG_FILES([
     993WebKit/gtk/${WEBKITGTK_PC_NAME}-${WEBKITGTK_API_VERSION}.pc:WebKit/gtk/webkit.pc.in
     994WebKit/gtk/JSCore-${WEBKITGTK_API_VERSION}.gir:WebKit/gtk/JSCore.gir.in
     995WebKit/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)
    1027999
    10281000AC_OUTPUT
     
    10831055 Hildon UI extensions                                     : $with_hildon
    10841056 Introspection support                                    : $enable_introspection
    1085  WebKit2 support                                          : $enable_webkit2
    10861057"
    10871058if test "$with_unicode_backend" = "glib"; then
Note: See TracChangeset for help on using the changeset viewer.