Changeset 94288 in webkit

Timestamp:

Sep 1, 2011 5:24:41 AM (13 years ago)

Author:

Csaba Osztrogonác

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ó <​kkristof@inf.u-szeged.hu> on 2011-09-01
Reviewed by Csaba Osztrogonác.

Source/WebCore:

• features.pri:

Tools:

• Scripts/webkitdirs.pm:

(buildQMakeProject):

Location:

trunk

Files:

• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/features.pri (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-01  Kristóf Kosztyó  <kkristof@inf.u-szeged.hu>
+
+        [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  <vsevik@chromium.org>
 

trunk/Source/WebCore/features.pri

@@ -214 +214 @@
         DEFINES += WTF_USE_QT_MULTIMEDIA=1
     }
-}
-
-# Used to compute defaults for the build-webkit script
-CONFIG(compute_defaults) {
-    message($$DEFINES)
-    error("Done computing defaults")
 }
 
@@ -268 +262 @@
 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")
+}

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-01  Kristóf Kosztyó  <kkristof@inf.u-szeged.hu>
+
+        [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  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1672 +1672 @@
     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.
@@ -1680 +1684 @@
     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";