build-webkit launcher instructions use wrong relative path for Qt

https://bugs.webkit.org/show_bug.cgi?id=81357

Patch by Dave Tharp <dtharp@codeaurora.org> on 2012-03-16
Reviewed by Eric Seidel.

Ensure we are at the proper directory before generating run-launcher
instructions.

* Scripts/build-webkit:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@111093 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 9c42ee13601ae40fe6a73fd1e11d78f3c691c3c8..7945eef326fe2cdc98935d035d87b20216e18ee2 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-16  Dave Tharp  <dtharp@codeaurora.org>
+
+        build-webkit launcher instructions use wrong relative path for Qt
+        https://bugs.webkit.org/show_bug.cgi?id=81357
+
+        Reviewed by Eric Seidel.
+
+        Ensure we are at the proper directory before generating run-launcher
+        instructions.
+
+        * Scripts/build-webkit:
+
 2012-03-16  Brady Eidson  <beidson@apple.com>
 
         <rdar://problem/11027997> and https://bugs.webkit.org/show_bug.cgi?id=81412

diff --git a/Tools/Scripts/build-webkit b/Tools/Scripts/build-webkit
index ccc431575a0e001c95851369d7517e2011122fb3..0bdf8766ba4983a12b1bb7487189a4f1a0444785 100755 (executable)
--- a/Tools/Scripts/build-webkit
+++ b/Tools/Scripts/build-webkit
@@ -742,6 +742,10 @@ exit if $clean;
 # Don't report congrats message if build was interrupted by the user.
 exit if ($result & 127) == SIGINT;
 
+# Explicitly chdir back to where exit will take us anyway, since the following "launcher"
+# message is relative to that directory.
+chdir $originalWorkingDirectory;
+
 # Write out congratulations message.
 writeCongrats();