[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 60952d41a512a383c48c83c0b97245d674945b64
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 26 00:41:23 2009 +0000

    Patch by Mark Rowe.
    
    Reviewed by Dan Bernstein.
    
    The buildbots are failing on Windows because when they were upgraded
    to 4.0.4, Apple Application Support was not in their path. Add it to
    the path to fix the buildots.
    
    * Scripts/webkitdirs.pm:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 710657d..ab05574 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-11-25  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Dan Bernstein.
+        
+        Patch by Mark Rowe.
+
+        The buildbots are failing on Windows because when they were upgraded
+        to 4.0.4, Apple Application Support was not in their path. Add it to
+        the path to fix the buildots.
+
+        * Scripts/webkitdirs.pm:
+
 2009-11-25  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index d72390b..2bcc1cd 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1429,13 +1429,25 @@ sub buildChromium($@)
     return $result;
 }
 
+sub appleApplicationSupportPath
+{
+    open INSTALL_DIR, "</proc/registry/HKEY_LOCAL_MACHINE/SOFTWARE/Apple\ Inc./Apple\ Application\ Support/InstallDir";
+    my $path = <INSTALL_DIR>;
+    $path =~ s/[\r\n\x00].*//;
+    close INSTALL_DIR;
+
+    my $unixPath = `cygpath -u '$path'`;
+    chomp $unixPath;
+    return $unixPath;
+}
+
 sub setPathForRunningWebKitApp
 {
     my ($env) = @_;
 
     return unless isAppleWinWebKit();
 
-    $env->{PATH} = join(':', productDir(), dirname(installedSafariPath()), $env->{PATH} || "");
+    $env->{PATH} = join(':', productDir(), dirname(installedSafariPath()), appleApplicationSupportPath(), $env->{PATH} || "");
 }
 
 sub exitStatus($)

-- 
WebKit Debian packaging