Changeset 121775 in webkit
- Timestamp:
- Jul 3, 2012 9:04:50 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 1 deleted
- 29 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ChangeLog
r121774 r121775 1 2012-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 1 15 2012-07-03 George Staikos <staikos@webkit.org> 2 16 -
trunk/Source/QtWebKit.pro
r121766 r121775 4 4 # See 'Tools/qmake/README' for an overview of the build system 5 5 # ------------------------------------------------------------------- 6 7 load(features) 6 8 7 9 TEMPLATE = subdirs -
trunk/Source/WTF/ChangeLog
r121766 r121775 1 2012-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 1 12 2012-07-03 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 13 -
trunk/Source/WTF/WTF.pri
r121766 r121775 5 5 # See 'Tools/qmake/README' for an overview of the build system 6 6 # ------------------------------------------------------------------- 7 8 load(features) 7 9 8 10 # All external modules should include WTF headers by prefixing with "wtf" (#include <wtf/some/thing.h>). -
trunk/Source/WebCore/ChangeLog
r121774 r121775 1 2012-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 1 13 2012-07-03 George Staikos <staikos@webkit.org> 2 14 -
trunk/Source/WebCore/DerivedSources.pri
r121766 r121775 11 11 sanitizedFile = $$toSanitizedPath($$_FILE_) 12 12 equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived 13 14 load(features) 13 15 14 16 mac { -
trunk/Source/WebCore/WebCore.pri
r121766 r121775 5 5 # See 'Tools/qmake/README' for an overview of the build system 6 6 # ------------------------------------------------------------------- 7 8 load(features) 7 9 8 10 SOURCE_DIR = $${ROOT_WEBKIT_DIR}/Source/WebCore -
trunk/Source/WebKit/qt/ChangeLog
r121766 r121775 1 2012-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 1 14 2012-07-03 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 15 -
trunk/Source/WebKit/qt/declarative/declarative.pro
r121766 r121775 7 7 TEMPLATE = subdirs 8 8 CONFIG += ordered 9 10 load(features) 9 11 10 12 public_api.file = public.pri -
trunk/Source/WebKit/qt/declarative/public.pri
r121766 r121775 11 11 12 12 CONFIG += qt plugin 13 14 load(features) 13 15 14 16 QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir -
trunk/Source/WebKit/qt/tests/qgraphicswebview/qgraphicswebview.pro
r121766 r121775 2 2 exists($${TARGET}.qrc):RESOURCES += $${TARGET}.qrc 3 3 4 load(features) 4 5 contains(DEFINES, ENABLE_WEBGL=1) { 5 6 QT += opengl -
trunk/Source/WebKit2/ChangeLog
r121771 r121775 1 2012-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 1 13 2012-07-03 Carlos Garcia Campos <cgarcia@igalia.com> 2 14 -
trunk/Source/WebKit2/DerivedSources.pri
r121766 r121775 11 11 sanitizedFile = $$toSanitizedPath($$_FILE_) 12 12 equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived 13 14 load(features) 13 15 14 16 WEBCORE_GENERATED_SOURCES_DIR = ../WebCore/$${GENERATED_SOURCES_DESTDIR} -
trunk/Source/WebKit2/Target.pri
r121766 r121775 7 7 TEMPLATE = lib 8 8 TARGET = WebKit2 9 10 load(features) 9 11 10 12 include(WebKit2.pri) -
trunk/Source/api.pri
r121766 r121775 125 125 runSyncQt() # Generate forwarding headers for the QtWebKit API 126 126 127 load(features) 128 127 129 WEBKIT += wtf 128 130 -
trunk/Source/tests.pri
r121766 r121775 7 7 TEMPLATE = subdirs 8 8 CONFIG += ordered 9 10 load(features) 9 11 10 12 WEBKIT_TESTS_DIR = $$PWD/WebKit/qt/tests -
trunk/Tools/ChangeLog
r121774 r121775 1 2012-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 1 25 2012-07-03 George Staikos <staikos@webkit.org> 2 26 -
trunk/Tools/DumpRenderTree/qt/DumpRenderTree.pro
r121766 r121775 9 9 TARGET = DumpRenderTree 10 10 DESTDIR = $$ROOT_BUILD_DIR/bin 11 12 load(features) 11 13 12 14 WEBKIT += wtf webcore -
trunk/Tools/QtTestBrowser/QtTestBrowser.pro
r121766 r121775 11 11 $${ROOT_WEBKIT_DIR}/Tools/DumpRenderTree/qt/ \ 12 12 $${ROOT_WEBKIT_DIR}/Source/WTF 13 14 load(features) 13 15 14 16 SOURCES += \ -
trunk/Tools/Scripts/webkitdirs.pm
r121766 r121775 825 825 my $file; 826 826 my @buildArgs; 827 my $qconfigs;828 827 829 828 if (@_) { 830 829 @buildArgs = (@buildArgs, @{$_[0]}); 831 $qconfigs = $_[1];832 830 my $dir = File::Spec->catfile(productDir(), "Tools", "qmake"); 833 831 File::Path::mkpath($dir); … … 836 834 } else { 837 835 # 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 tests839 836 $file = File::Spec->catfile($qmakepath, "mkspecs", "features", "features.prf"); 840 837 push @buildArgs, "CONFIG+=compute_defaults"; 841 838 } 842 839 843 my @defaults = `$qmakecommand @buildArgs $file 2>&1`;840 my $defaults = `$qmakecommand @buildArgs $file 2>&1`; 844 841 845 842 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; 861 845 } 862 846 … … 2247 2231 2248 2232 my @buildArgs = (); 2249 my $qconfigs = "";2250 2233 2251 2234 my $make = qtMakeCommand($qmakebin); … … 2304 2287 chdir $dir or die "Failed to cd into " . $dir . "\n"; 2305 2288 2306 my %defines = qtFeatureDefaults(\@buildArgs , \$qconfigs);2289 my %defines = qtFeatureDefaults(\@buildArgs); 2307 2290 2308 2291 my $svnRevision = currentSVNRevision(); … … 2312 2295 my $pathToDefinesCache = File::Spec->catfile($dir, ".webkit.config"); 2313 2296 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.cache2316 2297 2317 2298 # Ease transition to new build layout … … 2377 2358 # After removing WebKitBuild directory, we have to call qtFeatureDefaults() 2378 2359 # to run config tests and generate the removed Tools/qmake/.qmake.cache again. 2379 qtFeatureDefaults(\@buildArgs , \$qconfigs);2360 qtFeatureDefaults(\@buildArgs); 2380 2361 #} 2381 2362 2382 2363 # Still trigger an incremental build 2383 2364 $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);2395 2365 } 2396 2366 -
trunk/Tools/Tools.pro
r121766 r121775 7 7 TEMPLATE = subdirs 8 8 CONFIG += ordered 9 10 load(features) 9 11 10 12 !no_webkit1 { -
trunk/Tools/WebKitTestRunner/InjectedBundle/DerivedSources.pri
r121766 r121775 11 11 sanitizedFile = $$toSanitizedPath($$_FILE_) 12 12 equals(sanitizedFile, $$toSanitizedPath($$_PRO_FILE_)):TEMPLATE = derived 13 14 load(features) 13 15 14 16 IDL_BINDINGS += \ -
trunk/Tools/WebKitTestRunner/InjectedBundle/Target.pri
r121766 r121775 53 53 QT += declarative widgets webkit 54 54 55 load(features) 56 55 57 WEBKIT += wtf javascriptcore webcore 56 58 -
trunk/Tools/WebKitTestRunner/Target.pri
r121766 r121775 28 28 QT = core gui widgets network declarative testlib quick quick-private webkit 29 29 30 load(features) 31 30 32 WEBKIT += wtf javascriptcore webkit2 31 33 -
trunk/Tools/qmake/configure.pro
r121766 r121775 1 # -------------------------------------------------------------------2 # This file is used by build-webkit to compute the various feature3 # defines, which are then cached in .qmake.cache.4 #5 # See 'Tools/qmake/README' for an overview of the build system6 # -------------------------------------------------------------------7 8 # Will compute features based on command line arguments, config tests,9 # dependency availability, and defaults.10 1 load(features) 11 12 # Compute delta 13 CONFIG -= $$BASE_CONFIG 14 DEFINES -= $$BASE_DEFINES 15 16 message(CONFIG: $$CONFIG) 17 message(DEFINES: $$DEFINES) 2 message($$DEFINES) 18 3 error("Done computing defaults") -
trunk/Tools/qmake/mkspecs/features/default_post.prf
r121766 r121775 5 5 # See 'Tools/qmake/README' for an overview of the build system 6 6 # ------------------------------------------------------------------- 7 8 load(features) 7 9 8 10 # Flag that we're now done processing the project file. This allows -
trunk/Tools/qmake/mkspecs/features/default_pre.prf
r121766 r121775 28 28 ROOT_BUILD_DIR = $$replace(OUT_PWD, $${WEBKIT_SUBDIR}$,) 29 29 30 # Detect if we're running the initial configure step31 pro_file_name = $$basename(_PRO_FILE_)32 equals(pro_file_name, configure.pro): CONFIG += configure_pass33 34 30 # We want the QtWebKit API forwarding includes to live in the root build dir, 35 31 # except when we are running the config.tests in Tools/qmake. 36 !configure_pass: QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR 32 pro_file_name = $$basename(_PRO_FILE_) 33 !equals(pro_file_name, configure.pro): QMAKE_SYNCQT_OUTDIR = $$ROOT_BUILD_DIR 37 34 38 35 # Load Qt's defaults after we've resolved the build directory. This will also … … 127 124 # Set some defaults for specific platforms 128 125 CONFIG += 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 macros140 FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1141 v8: FEATURE_DEFINES_JAVASCRIPT += V8_BINDING=1142 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_define148 }149 150 configure_pass {151 # Save the base config and defines so we can compute the delta between152 # what features.prf introduced and what was already there.153 BASE_CONFIG = $$CONFIG154 BASE_DEFINES = $$DEFINES155 } -
trunk/Tools/qmake/mkspecs/features/features.prf
r121766 r121775 20 20 ## load mobilityconfig if mobility is available 21 21 load(mobilityconfig, true) 22 23 # Try to locate sqlite3 source 24 SQLITE3SRCDIR = $$(SQLITE3SRCDIR) 25 isEmpty(SQLITE3SRCDIR) { 26 haveQt(5):SQLITE3SRCDIR = $$QT.core.sources/../3rdparty/sqlite/ 27 else:SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/ 28 } 22 29 23 30 # ---------- Dynamically detect optional features ------------- … … 214 221 } 215 222 223 # --------- Make features available to JSC ------------ 224 225 ## Forward enabled feature macros to JavaScript enabled features macros 226 FEATURE_DEFINES_JAVASCRIPT = LANGUAGE_JAVASCRIPT=1 227 v8: FEATURE_DEFINES_JAVASCRIPT += V8_BINDING=1 228 229 for(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 216 236 # ---------------------- The end ---------------------- 217 237 … … 219 239 # Don't place anything after this! 220 240 CONFIG(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) 224 242 error("Done computing defaults") 225 243 } -
trunk/WebKit.pro
r121766 r121775 8 8 TEMPLATE = subdirs 9 9 CONFIG += ordered 10 11 load(features) 10 12 11 13 QMAKEPATH = $$(QMAKEPATH)
Note: See TracChangeset
for help on using the changeset viewer.