Diff
Modified: releases/WebKitGTK/webkit-1.8/Tools/ChangeLog (116888 => 116889)
--- releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:44:05 UTC (rev 116888)
+++ releases/WebKitGTK/webkit-1.8/Tools/ChangeLog 2012-05-13 13:44:22 UTC (rev 116889)
@@ -1,3 +1,19 @@
+2012-04-27 Gustavo Noronha Silva <[email protected]>
+
+ [GTK] jhbuild cloning is not following WEBKITOUTPUTDIR.
+ https://bugs.webkit.org/show_bug.cgi?id=76161
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitdirs.pm:
+ (getJhbuildPath): New method to obtain the jhbuild base directory,
+ using the product base directory
+ (jhbuildConfigurationChanged): Use the new method
+ (buildAutotoolsProject): Ditto.
+ * efl/jhbuildrc: Use WEBKITOUTPUTDIR when calculating the path.
+ * gtk/jhbuildrc: Ditto.
+ * jhbuild/jhbuild-wrapper: Ditto.
+
2012-03-28 Philippe Normand <[email protected]>
[GTK] jhbuild wrongly tricked into clean-up
Modified: releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm (116888 => 116889)
--- releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm 2012-05-13 13:44:05 UTC (rev 116888)
+++ releases/WebKitGTK/webkit-1.8/Tools/Scripts/webkitdirs.pm 2012-05-13 13:44:22 UTC (rev 116889)
@@ -1821,10 +1821,15 @@
}
}
+sub getJhbuildPath()
+{
+ return join(baseProductDir(), "Dependencies");
+}
+
sub jhbuildConfigurationChanged()
{
foreach my $file (qw(jhbuildrc.md5sum jhbuild.modules.md5sum)) {
- my $path = join('/', $sourceDir, "WebKitBuild", "Dependencies", $file);
+ my $path = join(getJhbuildPath(), $file);
if (! -e $path) {
return 1;
}
@@ -1935,7 +1940,8 @@
# If the configuration changed, dependencies may have been removed.
# Since we lack a granular way of uninstalling those we wipe out the
# jhbuild root and start from scratch.
- if (system("rm -rf $baseProductDir/Dependencies/Root") ne 0) {
+ my $jhbuildPath = getJhbuildPath();
+ if (system("rm -rf $jhbuildPath/Root") ne 0) {
die "Cleaning jhbuild root failed!";
}
@@ -1960,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('/', $sourceDir, "WebKitBuild", "Dependencies", $file);
+ my $destination = join(getJhbuildPath(), $file);
open(SUM, ">$destination" . ".md5sum");
print SUM getMD5HashForFile($source);
close(SUM);
Modified: releases/WebKitGTK/webkit-1.8/Tools/efl/jhbuildrc (116888 => 116889)
--- releases/WebKitGTK/webkit-1.8/Tools/efl/jhbuildrc 2012-05-13 13:44:05 UTC (rev 116888)
+++ releases/WebKitGTK/webkit-1.8/Tools/efl/jhbuildrc 2012-05-13 13:44:22 UTC (rev 116889)
@@ -37,8 +37,12 @@
if __extra_modules != ['']:
modules.extend(__extra_modules)
-checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
-prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
+if os.environ.has_key('WEBKITOUTPUTDIR'):
+ checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Source'))
+ prefix = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Root'))
+else:
+ checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
+ prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
nonotify = True
notrayicon = True
Modified: releases/WebKitGTK/webkit-1.8/Tools/gtk/jhbuildrc (116888 => 116889)
--- releases/WebKitGTK/webkit-1.8/Tools/gtk/jhbuildrc 2012-05-13 13:44:05 UTC (rev 116888)
+++ releases/WebKitGTK/webkit-1.8/Tools/gtk/jhbuildrc 2012-05-13 13:44:22 UTC (rev 116889)
@@ -34,8 +34,12 @@
if __extra_modules != ['']:
modules.extend(__extra_modules)
-checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
-prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
+if os.environ.has_key('WEBKITOUTPUTDIR'):
+ checkoutroot = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Source'))
+ prefix = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Root'))
+else:
+ checkoutroot = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Source'))
+ prefix = os.path.abspath(common.top_level_path('WebKitBuild','Dependencies', 'Root'))
nonotify = True
notrayicon = True
Modified: releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper (116888 => 116889)
--- releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:44:05 UTC (rev 116888)
+++ releases/WebKitGTK/webkit-1.8/Tools/jhbuild/jhbuild-wrapper 2012-05-13 13:44:22 UTC (rev 116889)
@@ -35,10 +35,17 @@
jhbuild_revision = '1eedc423f75c605224b430579e4c303292199507'
-installation_prefix = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Root'))
-source_path = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Source'))
+if os.environ.has_key('WEBKITOUTPUTDIR'):
+ dependencies_path = os.path.abspath(os.path.join(os.environ['WEBKITOUTPUTDIR'], 'Dependencies', 'Root'))
+else:
+ dependencies_path = os.path.abspath(top_level_path('WebKitBuild', 'Dependencies', 'Root'))
+
+installation_prefix = os.path.abspath(os.path.join(dependencies_path, 'Root'))
+source_path = os.path.abspath(os.path.join(dependencies_path, 'Source'))
jhbuild_source_path = os.path.join(source_path, 'jhbuild')
-jhbuild_path = top_level_path('WebKitBuild', 'Dependencies', 'Root', 'bin', 'jhbuild')
+jhbuild_path = os.path.join(installation_prefix, 'bin', 'jhbuild')
+
+
platform = None;
