Reviewed by Maciej.

        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=7357
          REGRESSION: Warnings from WebKit scripts if PBXProductDirectory is undefined

        * Scripts/webkitdirs.pm: only call chomp if PBXProductDirectory is configured.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 97b20c1f761bc0c13f22abfcc64a28d36cc045cb..a6082576ef24fe1fadfe24b082a8dca7fdf0de7c 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-19  Alexey Proskuryakov  <ap@nypop.com>
+
+        Reviewed by Maciej.
+
+        - fix http://bugzilla.opendarwin.org/show_bug.cgi?id=7357
+          REGRESSION: Warnings from WebKit scripts if PBXProductDirectory is undefined
+
+        * Scripts/webkitdirs.pm: only call chomp if PBXProductDirectory is configured.
+
 2006-02-18  Darin Adler  <darin@apple.com>
 
         * Scripts/commit-log-editor: Added.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 33b97f014f3ffc91f0cdd563cc46c2f576f3e85b..47692438c197808e66ba33691c0181e12347679a 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -71,7 +71,9 @@ sub determineBaseProductDir
         open PRODUCT, "defaults read com.apple.Xcode PBXProductDirectory 2> /dev/null |" or die;
         $baseProductDir = <PRODUCT>;
         close PRODUCT;
-        chomp $baseProductDir;
+        if ($baseProductDir) {
+            chomp $baseProductDir;
+        }
     } else {
         $baseProductDir = $ENV{"WebKitOutputDir"};
         if (isCygwin() && $baseProductDir) {