[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[bweinstein at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit 343bf62d27abfa3e2da4d10acf1044411303ee21
Author: bweinstein at apple.com <bweinstein at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 23:00:34 2009 +0000

    Fixes <http://webkit.org/b/30411>.
    REGRESSION(49485): pdevenv doesn't compile in parallel for non-chromium builds on Windows.
    
    Reviewed by Adam Roben.
    
    Added a check for isChromium() in pdevenv, and pass /useenv if we are not
    building Chromium.
    
    * Scripts/pdevenv:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49664 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 18a1219..5f91f97 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-15  Brian Weinstein  <bweinstein at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Fixes <http://webkit.org/b/30411>.
+        REGRESSION(49485): pdevenv doesn't compile in parallel for non-chromium builds on Windows.
+        
+        Added a check for isChromium() in pdevenv, and pass /useenv if we are not
+        building Chromium.
+
+        * Scripts/pdevenv:
+
 2009-10-15  Robin Dunn  <robin at alldunn.com>
 
         Reviewed by Kevin Ollivier.
diff --git a/WebKitTools/Scripts/pdevenv b/WebKitTools/Scripts/pdevenv
index 1530ff4..cab8b16 100755
--- a/WebKitTools/Scripts/pdevenv
+++ b/WebKitTools/Scripts/pdevenv
@@ -6,6 +6,9 @@ use warnings;
 use File::Temp qw/tempfile/;
 use FindBin;
 
+use lib $FindBin::Bin;
+use webkitdirs;
+
 my ($fh, $path) = tempfile(UNLINK => 0, SUFFIX => '.cmd') or die;
 
 chomp(my $vcBin = `cygpath -w "$FindBin::Bin/../vcbin"`);
@@ -28,8 +31,15 @@ if ($ENV{'VS80COMNTOOLS'}) {
 print $fh "\@echo off\n\n";
 print $fh "call \"\%" . $vsToolsVar . "\%\\vsvars32.bat\"\n\n";
 print $fh "set PATH=$vcBin;$scriptsPath;\%PATH\%\n\n";
-print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com " . join(" ", @ARGV) . ") ELSE ";
-print $fh "VCExpress.exe " . join(" ", @ARGV) . "\n";
+
+my $useenv = "/useenv ";
+if (isChromium()) {
+    $useenv = "";
+}
+
+print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com " . $useenv . join(" ", @ARGV) . ") ELSE ";
+print $fh "VCExpress.exe " . $useenv . join(" ", @ARGV) . "\n";
+
 
 close $fh;
 

-- 
WebKit Debian packaging