Title: [94288] trunk
- Revision
- 94288
- Author
- [email protected]
- Date
- 2011-09-01 05:24:41 -0700 (Thu, 01 Sep 2011)
Log Message
[Qt] Build dependency problems
https://bugs.webkit.org/show_bug.cgi?id=38054
Make clean build after the defines are changed.
Patch by Kristóf Kosztyó <[email protected]> on 2011-09-01
Reviewed by Csaba Osztrogonác.
Source/WebCore:
* features.pri:
Tools:
* Scripts/webkitdirs.pm:
(buildQMakeProject):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (94287 => 94288)
--- trunk/Source/WebCore/ChangeLog 2011-09-01 12:16:10 UTC (rev 94287)
+++ trunk/Source/WebCore/ChangeLog 2011-09-01 12:24:41 UTC (rev 94288)
@@ -1,3 +1,14 @@
+2011-09-01 Kristóf Kosztyó <[email protected]>
+
+ [Qt] Build dependency problems
+ https://bugs.webkit.org/show_bug.cgi?id=38054
+
+ Make clean build after the defines are changed.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * features.pri:
+
2011-09-01 Vsevolod Vlasov <[email protected]>
Web Inspector: Network error messages in console should link to the respective request in network panel if there is one.
Modified: trunk/Source/WebCore/features.pri (94287 => 94288)
--- trunk/Source/WebCore/features.pri 2011-09-01 12:16:10 UTC (rev 94287)
+++ trunk/Source/WebCore/features.pri 2011-09-01 12:24:41 UTC (rev 94288)
@@ -215,12 +215,6 @@
}
}
-# Used to compute defaults for the build-webkit script
-CONFIG(compute_defaults) {
- message($$DEFINES)
- error("Done computing defaults")
-}
-
contains(DEFINES, ENABLE_WCSS=1) {
contains(DEFINES, ENABLE_XHTMLMP=0) {
DEFINES -= ENABLE_XHTMLMP=0
@@ -267,3 +261,10 @@
contains(DEFINES, ENABLE_MEDIA_STREAM=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_MEDIA_STREAM=1
contains(DEFINES, ENABLE_VIDEO_TRACK=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_VIDEO_TRACK=1
contains(DEFINES, ENABLE_DATA_TRANSFER_ITEMS=1): FEATURE_DEFINES_JAVASCRIPT += ENABLE_DATA_TRANSFER_ITEMS=1
+
+# Used to compute defaults for the build-webkit script
+# Don't place anything after this!
+CONFIG(compute_defaults) {
+ message($$DEFINES)
+ error("Done computing defaults")
+}
Modified: trunk/Tools/ChangeLog (94287 => 94288)
--- trunk/Tools/ChangeLog 2011-09-01 12:16:10 UTC (rev 94287)
+++ trunk/Tools/ChangeLog 2011-09-01 12:24:41 UTC (rev 94288)
@@ -1,3 +1,15 @@
+2011-09-01 Kristóf Kosztyó <[email protected]>
+
+ [Qt] Build dependency problems
+ https://bugs.webkit.org/show_bug.cgi?id=38054
+
+ Make clean build after the defines are changed.
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/webkitdirs.pm:
+ (buildQMakeProject):
+
2011-08-31 Adam Barth <[email protected]>
Move DumpRenderTree to WebKitPlatformSupport
Modified: trunk/Tools/Scripts/webkitdirs.pm (94287 => 94288)
--- trunk/Tools/Scripts/webkitdirs.pm 2011-09-01 12:16:10 UTC (rev 94287)
+++ trunk/Tools/Scripts/webkitdirs.pm 2011-09-01 12:24:41 UTC (rev 94288)
@@ -1671,6 +1671,10 @@
push @buildArgs, "INSTALL_LIBS=" . $installLibs if defined($installLibs);
my $dir = File::Spec->canonpath(productDir());
+ my $originalCwd = getcwd();
+ chdir File::Spec->catfile(sourceDir(), "Source", "WebCore");
+ my $defaults = `$qmakebin CONFIG+=compute_defaults 2>&1`;
+ chdir $originalCwd;
# On Symbian qmake needs to run in the same directory where the pro file is located.
if (isSymbian()) {
@@ -1680,6 +1684,23 @@
File::Path::mkpath($dir);
chdir $dir or die "Failed to cd into " . $dir . "\n";
+ my $pathToDefaultsTxt = File::Spec->catfile( $dir, "defaults.txt" );
+ my $defaultsTxt = "";
+ if(open DEFAULTS, "$pathToDefaultsTxt"){
+ $defaultsTxt = <DEFAULTS>.<DEFAULTS>;
+ close (DEFAULTS);
+ }
+ if(not($defaults eq $defaultsTxt)){
+ print "Make clean build because the Defines are changed.\n";
+ chdir $originalCwd;
+ File::Path::remove_tree($dir);
+ File::Path::mkpath($dir);
+ chdir $dir or die "Failed to cd into " . $dir . "\n";
+ open DEFAULTS, ">$pathToDefaultsTxt";
+ print DEFAULTS $defaults;
+ close (DEFAULTS);
+ }
+
print "Generating derived sources\n\n";
push @buildArgs, "OUTPUT_DIR=" . $dir;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
