Changeset 121775 in webkit


Ignore:
Timestamp:
Jul 3, 2012 9:04:50 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

Unreviewed, rolling out r121766.
http://trac.webkit.org/changeset/121766
https://bugs.webkit.org/show_bug.cgi?id=90465

It caused flakey build errors on the bots (Requested by Ossy
on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-07-03

.:

  • Source/QtWebKit.pro:
  • Source/api.pri:
  • Source/tests.pri:
  • WebKit.pro:

Source/WebCore:

  • DerivedSources.pri:
  • WebCore.pri:

Source/WebKit/qt:

  • declarative/declarative.pro:
  • declarative/public.pri:
  • tests/qgraphicswebview/qgraphicswebview.pro:

Source/WebKit2:

  • DerivedSources.pri:
  • Target.pri:

Source/WTF:

  • WTF.pri:

Tools:

  • DumpRenderTree/qt/DumpRenderTree.pro:
  • QtTestBrowser/QtTestBrowser.pro:
  • Scripts/webkitdirs.pm:

(qtFeatureDefaults):
(buildQMakeProjects):

  • Tools.pro:
  • WebKitTestRunner/InjectedBundle/DerivedSources.pri:
  • WebKitTestRunner/InjectedBundle/Target.pri:
  • WebKitTestRunner/Target.pri:
  • qmake/.qmake.conf: Removed.
  • qmake/configure.pro:
  • qmake/mkspecs/features/default_post.prf:
  • qmake/mkspecs/features/default_pre.prf:
  • qmake/mkspecs/features/features.prf:
Location:
trunk
Files:
1 deleted
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r121774 r121775  
     12012-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121766.
     4        http://trac.webkit.org/changeset/121766
     5        https://bugs.webkit.org/show_bug.cgi?id=90465
     6
     7        It caused flakey build errors on the bots (Requested by Ossy
     8        on #webkit).
     9
     10        * Source/QtWebKit.pro:
     11        * Source/api.pri:
     12        * Source/tests.pri:
     13        * WebKit.pro:
     14
    1152012-07-03  George Staikos  <staikos@webkit.org>
    216
  • trunk/Source/QtWebKit.pro

    r121766 r121775  
    44# See 'Tools/qmake/README' for an overview of the build system
    55# -------------------------------------------------------------------
     6
     7load(features)
    68
    79TEMPLATE = subdirs
  • trunk/Source/WTF/ChangeLog

    r121766 r121775  
     12012-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121766.
     4        http://trac.webkit.org/changeset/121766
     5        https://bugs.webkit.org/show_bug.cgi?id=90465
     6
     7        It caused flakey build errors on the bots (Requested by Ossy
     8        on #webkit).
     9
     10        * WTF.pri:
     11
    1122012-07-03  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    213
  • trunk/Source/WTF/WTF.pri

    r121766 r121775  
    55# See 'Tools/qmake/README' for an overview of the build system
    66# -------------------------------------------------------------------
     7
     8load(features)
    79
    810# All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>).
  • trunk/Source/WebCore/ChangeLog

    r121774 r121775  
     12012-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121766.
     4        http://trac.webkit.org/changeset/121766
     5        https://bugs.webkit.org/show_bug.cgi?id=90465
     6
     7        It caused flakey build errors on the bots (Requested by Ossy
     8        on #webkit).
     9
     10        * DerivedSources.pri:
     11        * WebCore.pri:
     12
    1132012-07-03  George Staikos  <staikos@webkit.org>
    214
  • trunk/Source/WebCore/DerivedSources.pri

    r121766 r121775  
    1111sanitizedFile = $$toSanitizedPath($$_FILE_)
    1212equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived
     13
     14load(features)
    1315
    1416mac {
  • trunk/Source/WebCore/WebCore.pri

    r121766 r121775  
    55# See 'Tools/qmake/README' for an overview of the build system
    66# -------------------------------------------------------------------
     7
     8load(features)
    79
    810SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore
  • trunk/Source/WebKit/qt/ChangeLog

    r121766 r121775  
     12012-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121766.
     4        http://trac.webkit.org/changeset/121766
     5        https://bugs.webkit.org/show_bug.cgi?id=90465
     6
     7        It caused flakey build errors on the bots (Requested by Ossy
     8        on #webkit).
     9
     10        * declarative/declarative.pro:
     11        * declarative/public.pri:
     12        * tests/qgraphicswebview/qgraphicswebview.pro:
     13
    1142012-07-03  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
    215
  • trunk/Source/WebKit/qt/declarative/declarative.pro

    r121766 r121775  
    77TEMPLATE = subdirs
    88CONFIG += ordered
     9
     10load(features)
    911
    1012public_api.file = public.pri
  • trunk/Source/WebKit/qt/declarative/public.pri

    r121766 r121775  
    1111
    1212CONFIG += qt plugin
     13
     14load(features)
    1315
    1416QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
  • trunk/Source/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro

    r121766 r121775  
    22exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc
    33
     4load(features)
    45contains(DEFINES, ENABLE_WEBGL=1) {
    56    QT += opengl
  • trunk/Source/WebKit2/ChangeLog

    r121771 r121775  
     12012-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121766.
     4        http://trac.webkit.org/changeset/121766
     5        https://bugs.webkit.org/show_bug.cgi?id=90465
     6
     7        It caused flakey build errors on the bots (Requested by Ossy
     8        on #webkit).
     9
     10        * DerivedSources.pri:
     11        * Target.pri:
     12
    1132012-07-03  Carlos Garcia Campos  <cgarcia@igalia.com>
    214
  • trunk/Source/WebKit2/DerivedSources.pri

    r121766 r121775  
    1111sanitizedFile = $$toSanitizedPath($$_FILE_)
    1212equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived
     13
     14load(features)
    1315
    1416WEBCORE_GENERATED_SOURCES_DIR = ../WebCore/$${GENERATED_SOURCES_DESTDIR}
  • trunk/Source/WebKit2/Target.pri

    r121766 r121775  
    77TEMPLATE = lib
    88TARGET = WebKit2
     9
     10load(features)
    911
    1012include(WebKit2.pri)
  • trunk/Source/api.pri

    r121766 r121775  
    125125runSyncQt() # Generate forwarding headers for the QtWebKit API
    126126
     127load(features)
     128
    127129WEBKIT += wtf
    128130
  • trunk/Source/tests.pri

    r121766 r121775  
    77TEMPLATE = subdirs
    88CONFIG += ordered
     9
     10load(features)
    911
    1012WEBKIT_TESTS_DIR = $$PWD/WebKit/qt/tests
  • trunk/Tools/ChangeLog

    r121774 r121775  
     12012-07-03  Sheriff Bot  <webkit.review.bot@gmail.com>
     2
     3        Unreviewed, rolling out r121766.
     4        http://trac.webkit.org/changeset/121766
     5        https://bugs.webkit.org/show_bug.cgi?id=90465
     6
     7        It caused flakey build errors on the bots (Requested by Ossy
     8        on #webkit).
     9
     10        * DumpRenderTree/qt/DumpRenderTree.pro:
     11        * QtTestBrowser/QtTestBrowser.pro:
     12        * Scripts/webkitdirs.pm:
     13        (qtFeatureDefaults):
     14        (buildQMakeProjects):
     15        * Tools.pro:
     16        * WebKitTestRunner/InjectedBundle/DerivedSources.pri:
     17        * WebKitTestRunner/InjectedBundle/Target.pri:
     18        * WebKitTestRunner/Target.pri:
     19        * qmake/.qmake.conf: Removed.
     20        * qmake/configure.pro:
     21        * qmake/mkspecs/features/default_post.prf:
     22        * qmake/mkspecs/features/default_pre.prf:
     23        * qmake/mkspecs/features/features.prf:
     24
    1252012-07-03  George Staikos  <staikos@webkit.org>
    226
  • trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro

    r121766 r121775  
    99TARGET = DumpRenderTree
    1010DESTDIR = $$ROOT_BUILD_DIR/bin
     11
     12load(features)
    1113
    1214WEBKIT += wtf webcore
  • trunk/Tools/QtTestBrowser/QtTestBrowser.pro

    r121766 r121775  
    1111    $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \
    1212    $${ROOT_WEBKIT_DIR}/Source/WTF
     13
     14load(features)
    1315
    1416SOURCES += \
  • trunk/Tools/Scripts/webkitdirs.pm

    r121766 r121775  
    825825    my $file;
    826826    my @buildArgs;
    827     my $qconfigs;
    828827
    829828    if (@_) {
    830829        @buildArgs = (@buildArgs, @{$_[0]});
    831         $qconfigs = $_[1];
    832830        my $dir = File::Spec->catfile(productDir(), "Tools", "qmake");
    833831        File::Path::mkpath($dir);
     
    836834    } else {
    837835        # Do a quick check of the features without running the config tests
    838         # FIXME: When Qt supports it, go through configure.pro but without config tests
    839836        $file = File::Spec->catfile($qmakepath, "mkspecs", "features", "features.prf");
    840837        push @buildArgs, "CONFIG+=compute_defaults";
    841838    }
    842839
    843     my @defaults = `$qmakecommand @buildArgs $file 2>&1`;
     840    my $defaults = `$qmakecommand @buildArgs $file 2>&1`;
    844841
    845842    my %qtFeatureDefaults;
    846     for (@defaults) {
    847         if (/ DEFINES: /) {
    848             while (/(\S+?)=(\S+?)/gi) {
    849                 $qtFeatureDefaults{$1}=$2;
    850             }
    851         } elsif (/ CONFIG:(.*)$/) {
    852             if (@_) {
    853                 $$qconfigs = $1;
    854             }
    855         } elsif (/Done computing defaults/) {
    856             print "\n";
    857             last;
    858         } elsif (@_) {
    859             print $_;
    860         }
     843    while ($defaults =~ m/(\S+?)=(\S+?)/gi) {
     844        $qtFeatureDefaults{$1}=$2;
    861845    }
    862846
     
    22472231
    22482232    my @buildArgs = ();
    2249     my $qconfigs = "";
    22502233
    22512234    my $make = qtMakeCommand($qmakebin);
     
    23042287    chdir $dir or die "Failed to cd into " . $dir . "\n";
    23052288
    2306     my %defines = qtFeatureDefaults(\@buildArgs, \$qconfigs);
     2289    my %defines = qtFeatureDefaults(\@buildArgs);
    23072290
    23082291    my $svnRevision = currentSVNRevision();
     
    23122295    my $pathToDefinesCache = File::Spec->catfile($dir, ".webkit.config");
    23132296    my $pathToOldDefinesFile = File::Spec->catfile($dir, "defaults.txt");
    2314 
    2315     # FIXME: Get rid of .webkit.config and defaults.txt and move all the logic to .qmake.cache
    23162297
    23172298    # Ease transition to new build layout
     
    23772358            # After removing WebKitBuild directory, we have to call qtFeatureDefaults()
    23782359            # to run config tests and generate the removed Tools/qmake/.qmake.cache again.
    2379             qtFeatureDefaults(\@buildArgs, \$qconfigs);
     2360            qtFeatureDefaults(\@buildArgs);
    23802361        #}
    23812362
    23822363        # Still trigger an incremental build
    23832364        $buildHint = "incremental";
    2384     }
    2385 
    2386     if ($buildHint eq "incremental") {
    2387         my $qmakeDefines = "DEFINES +=";
    2388         foreach my $key (sort keys %defines) {
    2389             $qmakeDefines .= " \\\n    $key=$defines{$key}";
    2390         }
    2391         open(QMAKE_CACHE, ">.qmake.cache") or die "Cannot create .qmake.cache!\n";
    2392         print QMAKE_CACHE "CONFIG += webkit_configured $qconfigs\n";
    2393         print QMAKE_CACHE $qmakeDefines."\n";
    2394         close(QMAKE_CACHE);
    23952365    }
    23962366
  • trunk/Tools/Tools.pro

    r121766 r121775  
    77TEMPLATE = subdirs
    88CONFIG += ordered
     9
     10load(features)
    911
    1012!no_webkit1 {
  • trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri

    r121766 r121775  
    1111sanitizedFile = $$toSanitizedPath($$_FILE_)
    1212equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived
     13
     14load(features)
    1315
    1416IDL_BINDINGS += \
  • trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri

    r121766 r121775  
    5353QT += declarative widgets webkit
    5454
     55load(features)
     56
    5557WEBKIT += wtf javascriptcore webcore
    5658
  • trunk/Tools/WebKitTestRunner/Target.pri

    r121766 r121775  
    2828QT = core gui widgets network declarative testlib quick quick-private webkit
    2929
     30load(features)
     31
    3032WEBKIT += wtf javascriptcore webkit2
    3133
  • trunk/Tools/qmake/configure.pro

    r121766 r121775  
    1 # -------------------------------------------------------------------
    2 # This file is used by build-webkit to compute the various feature
    3 # defines, which are then cached in .qmake.cache.
    4 #
    5 # See 'Tools/qmake/README' for an overview of the build system
    6 # -------------------------------------------------------------------
    7 
    8 # Will compute features based on command line arguments, config tests,
    9 # dependency availability, and defaults.
    101load(features)
    11 
    12 # Compute delta
    13 CONFIG -= $$BASE_CONFIG
    14 DEFINES -= $$BASE_DEFINES
    15 
    16 message(CONFIG: $$CONFIG)
    17 message(DEFINES: $$DEFINES)
     2message($$DEFINES)
    183error("Done computing defaults")
  • trunk/Tools/qmake/mkspecs/features/default_post.prf

    r121766 r121775  
    55# See 'Tools/qmake/README' for an overview of the build system
    66# -------------------------------------------------------------------
     7
     8load(features)
    79
    810# Flag that we're now done processing the project file. This allows
  • trunk/Tools/qmake/mkspecs/features/default_pre.prf

    r121766 r121775  
    2828ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,)
    2929
    30 # Detect if we're running the initial configure step
    31 pro_file_name = $$basename(_PRO_FILE_)
    32 equals(pro_file_name, configure.pro): CONFIG += configure_pass
    33 
    3430# We want the QtWebKit API forwarding includes to live in the root build dir,
    3531# except when we are running the config.tests in Tools/qmake.
    36 !configure_pass: QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR
     32pro_file_name = $$basename(_PRO_FILE_)
     33!equals(pro_file_name, configure.pro): QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR
    3734
    3835# Load Qt's defaults after we've resolved the build directory. This will also
     
    127124# Set some defaults for specific platforms
    128125CONFIG += include_webinspector
    129 
    130 # Try to locate sqlite3 source (for WebCore)
    131 SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
    132 isEmpty(SQLITE3SRCDIR) {
    133     haveQt(5): SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
    134     else: SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
    135 }
    136 
    137 # --------- Make features available to JSC ------------
    138 
    139 ## Forward enabled feature macros to JavaScript enabled features macros
    140 FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1
    141 v8: FEATURE_DEFINES_JAVASCRIPT += V8_BINDING=1
    142 
    143 for(define, DEFINES) {
    144     enabled_feature_define = $$find(define, ^ENABLE_.+=1$)
    145     isEmpty(enabled_feature_define): next()
    146 
    147     FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define
    148 }
    149 
    150 configure_pass {
    151     # Save the base config and defines so we can compute the delta between
    152     # what features.prf introduced and what was already there.
    153     BASE_CONFIG = $$CONFIG
    154     BASE_DEFINES = $$DEFINES
    155 }
  • trunk/Tools/qmake/mkspecs/features/features.prf

    r121766 r121775  
    2020## load mobilityconfig if mobility is available
    2121load(mobilityconfig, true)
     22
     23# Try to locate sqlite3 source
     24SQLITE3SRCDIR = $$(SQLITE3SRCDIR)
     25isEmpty(SQLITE3SRCDIR) {
     26    haveQt(5):SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/
     27    else:SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
     28}
    2229
    2330# ---------- Dynamically detect optional features -------------
     
    214221}
    215222
     223# --------- Make features available to JSC ------------
     224
     225## Forward enabled feature macros to JavaScript enabled features macros
     226FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1
     227v8: FEATURE_DEFINES_JAVASCRIPT += V8_BINDING=1
     228
     229for(define, DEFINES) {
     230    enabled_feature_define = $$find(define, ^ENABLE_.+=1$)
     231    isEmpty(enabled_feature_define): next()
     232
     233    FEATURE_DEFINES_JAVASCRIPT += $$enabled_feature_define
     234}
     235
    216236# ---------------------- The end ----------------------
    217237
     
    219239# Don't place anything after this!
    220240CONFIG(compute_defaults) {
    221     # FIXME: We should have configure.pro do this when the config tests
    222     # can be selectivly run.
    223     message(DEFINES: $$DEFINES)
     241    message($$DEFINES)
    224242    error("Done computing defaults")
    225243}
  • trunk/WebKit.pro

    r121766 r121775  
    88TEMPLATE = subdirs
    99CONFIG += ordered
     10
     11load(features)
    1012
    1113QMAKEPATH = $$(QMAKEPATH)
Note: See TracChangeset for help on using the changeset viewer.