Changeset 112372 in webkit

Timestamp:

Mar 28, 2012 1:22:33 AM (12 years ago)

Author:

Philippe Normand

Message:

[GTK] jhbuild wrongly tricked into clean-up
​https://bugs.webkit.org/show_bug.cgi?id=82216

Reviewed by Gustavo Noronha Silva.

Save jhbuild{rc,.modules}.md5sum in Dependencies instead of the
build tree. Also when checking if the jhbuild configuration
changed use absolute md5sum paths.

• Scripts/webkitdirs.pm:

(runAutogenForAutotoolsProjectIfNecessary):
(jhbuildConfigurationChanged):
(buildAutotoolsProject):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-28  Philippe Normand  <pnormand@igalia.com>
+
+        [GTK] jhbuild wrongly tricked into clean-up
+        https://bugs.webkit.org/show_bug.cgi?id=82216
+
+        Reviewed by Gustavo Noronha Silva.
+
+        Save jhbuild{rc,.modules}.md5sum in Dependencies instead of the
+        build tree. Also when checking if the jhbuild configuration
+        changed use absolute md5sum paths.
+
+        * Scripts/webkitdirs.pm:
+        (runAutogenForAutotoolsProjectIfNecessary):
+        (jhbuildConfigurationChanged):
+        (buildAutotoolsProject):
+
 2012-03-28  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1792 +1792 @@
     print "Installation prefix directory: $prefix\n" if(defined($prefix));
 
-    # Save md5sum for jhbuild-related files.
-    foreach my $file (qw(jhbuildrc jhbuild.modules)) {
-        my $path = join('/', $sourceDir, 'Tools', 'gtk', $file);
-        open(SUM, ">$file.md5sum");
-        print SUM getMD5HashForFile($path);
-        close(SUM);
-    }
-
     # Only for WebKit, write the autogen.sh arguments to a file so that we can detect
     # when they change and automatically re-run it.
@@ -1831 +1823 @@
 {
     foreach my $file (qw(jhbuildrc.md5sum jhbuild.modules.md5sum)) {
-        if (! -e $file) {
+        my $path = join('/', $sourceDir, "WebKitBuild", "Dependencies", $file);
+        if (! -e $path) {
             return 1;
         }
@@ -1841 +1834 @@
 
         # Get our previous record.
-        open(PREVIOUS_MD5, $file);
+        open(PREVIOUS_MD5, $path);
         chomp(my $previousSum = <PREVIOUS_MD5>);
         close(PREVIOUS_MD5);
@@ -1963 +1956 @@
 
         system("perl", "$sourceDir/Tools/Scripts/update-webkitgtk-libs") == 0 or die $!;
+    }
+
+    # Save md5sum for jhbuild-related files.
+    foreach my $file (qw(jhbuildrc jhbuild.modules)) {
+        my $source = join('/', $sourceDir, "Tools", "gtk", $file);
+        my $destination = join('/', $sourceDir, "WebKitBuild", "Dependencies", $file);
+        open(SUM, ">$destination" . ".md5sum");
+        print SUM getMD5HashForFile($source);
+        close(SUM);
     }