Title: [116893] releases/WebKitGTK/webkit-1.8/Tools
- Revision
- 116893
- Author
- [email protected]
- Date
- 2012-05-13 06:45:18 -0700 (Sun, 13 May 2012)
Log Message
Merge 115975 - [GTK] join() is wrongly used in webkitdirs.pm since r115532
https://bugs.webkit.org/show_bug.cgi?id=85501
Patch by Philippe Normand <[email protected]> on 2012-05-03
Reviewed by Martin Robinson.
* Scripts/webkitdirs.pm:
(getJhbuildPath):
(buildAutotoolsProject):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116892 => 116893)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:45:04 UTC (rev 116892)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:45:18 UTC (rev 116893)
@@ -1,3 +1,14 @@
+2012-05-03 Philippe Normand <[email protected]>
+
+ [GTK] join() is wrongly used in webkitdirs.pm since r115532
+ https://bugs.webkit.org/show_bug.cgi?id=85501
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitdirs.pm:
+ (getJhbuildPath):
+ (buildAutotoolsProject):
+
2012-03-28 Philippe Normand <[email protected]>
[GTK] generate-gtk-doc doesn't cope with custom build directory
Modified: releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm (116892 => 116893)
--- releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm 2012-05-13 13:45:04 UTC (rev 116892)
+++ releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm 2012-05-13 13:45:18 UTC (rev 116893)
@@ -1823,7 +1823,7 @@
sub getJhbuildPath()
{
- return join(baseProductDir(), "Dependencies");
+ return join('/', baseProductDir(), "Dependencies");
}
sub jhbuildConfigurationChanged()
@@ -1966,7 +1966,7 @@
# Save md5sum for jhbuild-related files.
foreach my $file (qw(jhbuildrc jhbuild.modules)) {
my $source = join('/', $sourceDir, "Tools", "gtk", $file);
- my $destination = join(getJhbuildPath(), $file);
+ my $destination = join('/', getJhbuildPath(), $file);
open(SUM, ">$destination" . ".md5sum");
print SUM getMD5HashForFile($source);
close(SUM);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
