Title: [101928] trunk/Tools
- Revision
- 101928
- Author
- [email protected]
- Date
- 2011-12-03 07:39:02 -0800 (Sat, 03 Dec 2011)
Log Message
Fix the update-webkitgtk-libs script to properly trigger a jhbuild installation
when run for the first time.
Reviewed by Gustavo Noronha Silva.
* Scripts/update-webkitgtk-libs: Fix first run.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101927 => 101928)
--- trunk/Tools/ChangeLog 2011-12-03 14:07:44 UTC (rev 101927)
+++ trunk/Tools/ChangeLog 2011-12-03 15:39:02 UTC (rev 101928)
@@ -1,3 +1,12 @@
+2011-12-03 Martin Robinson <[email protected]>
+
+ Fix the update-webkitgtk-libs script to properly trigger a jhbuild installation
+ when run for the first time.
+
+ Reviewed by Gustavo Noronha Silva.
+
+ * Scripts/update-webkitgtk-libs: Fix first run.
+
2011-12-03 Philippe Normand <[email protected]>
Unreviewed, GTK build fix after r101922.
Modified: trunk/Tools/Scripts/update-webkitgtk-libs (101927 => 101928)
--- trunk/Tools/Scripts/update-webkitgtk-libs 2011-12-03 14:07:44 UTC (rev 101927)
+++ trunk/Tools/Scripts/update-webkitgtk-libs 2011-12-03 15:39:02 UTC (rev 101928)
@@ -23,9 +23,14 @@
chdir(relativeScriptsDir() . "/../gtk") or die $!;
+my @ensureJhbuildArgs = ("./run-with-jhbuild", "echo", "Ensured jhbuild setup.");
+if (system(@ensureJhbuildArgs) != 0) {
+ die "Failed to ensure jhbuild installed.\n";
+}
+
print "Updating GTK+ port dependencies using jhbuild...\n";
my @jhbuildArgs = ("../../WebKitBuild/Dependencies/Root/bin/jhbuild", "--no-interact", "-f", "jhbuildrc");
push(@jhbuildArgs, @ARGV[1..-1]);
if (system(@jhbuildArgs) != 0) {
- die "Running jhbuild failed."
+ die "Running jhbuild failed.\n"
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
