Modified: trunk/Tools/ChangeLog (112371 => 112372)
--- trunk/Tools/ChangeLog 2012-03-28 08:16:24 UTC (rev 112371)
+++ trunk/Tools/ChangeLog 2012-03-28 08:22:33 UTC (rev 112372)
@@ -1,3 +1,19 @@
+2012-03-28 Philippe Normand <[email protected]>
+
+ [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 <[email protected]>
kill-old-processes doesn't do anything on linux
Modified: trunk/Tools/Scripts/webkitdirs.pm (112371 => 112372)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-03-28 08:16:24 UTC (rev 112371)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-03-28 08:22:33 UTC (rev 112372)
@@ -1791,14 +1791,6 @@
print "Calling autogen.sh in " . $dir . "\n\n";
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.
if ($project eq 'WebKit') {
@@ -1830,7 +1822,8 @@
sub jhbuildConfigurationChanged()
{
foreach my $file (qw(jhbuildrc.md5sum jhbuild.modules.md5sum)) {
- if (! -e $file) {
+ my $path = join('/', $sourceDir, "WebKitBuild", "Dependencies", $file);
+ if (! -e $path) {
return 1;
}
@@ -1840,7 +1833,7 @@
my $currentSum = getMD5HashForFile($actualFile);
# Get our previous record.
- open(PREVIOUS_MD5, $file);
+ open(PREVIOUS_MD5, $path);
chomp(my $previousSum = <PREVIOUS_MD5>);
close(PREVIOUS_MD5);
@@ -1964,6 +1957,15 @@
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);
+ }
+
# If GNUmakefile exists, don't run autogen.sh unless its arguments
# have changed. The makefile should be smart enough to track autotools
# dependencies and re-run autogen.sh when build files change.
