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

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 60f05a61ca81056b1b7b6170dd5e0815603c8221
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 15:05:57 2010 +0000

    Clean up use of /useenv when invoking Visual C++
    
    This change reverts things to their pre-r49485 state. That revision
    (and, subsequently, r49664 and r51788) started passing /useenv to
    Visual C++, even in cases where we don't want to do so (such as when
    invoking Visual C++ Express), in the name of making the Chromium build
    work. Now that Chromium isn't using buildVisualStudioProject or
    pdevenv, we can put things back they way they were.
    
    Fixes <http://webkit.org/b/33797> build-webkit fails with VC++ Express
    (due to /useenv flag)
    
    Reviewed by Sam Weinig.
    
    * Scripts/pdevenv: Always pass /useenv. Chromium doesn't use this
    script anymore.
    * Scripts/webkitdirs.pm:
    (buildVisualStudioProject): Never pass /useenv anymore. pdevenv takes
    care of this itself, and we don't want to pass /useenv when not using
    pdevenv (e.g., when using VC++ Express, because that will cause it to
    ignore the Platform SDK).
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53407 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9b0ae0d..6caba81 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,27 @@
+2010-01-18  Adam Roben  <aroben at apple.com>
+
+        Clean up use of /useenv when invoking Visual C++
+
+        This change reverts things to their pre-r49485 state. That revision
+        (and, subsequently, r49664 and r51788) started passing /useenv to
+        Visual C++, even in cases where we don't want to do so (such as when
+        invoking Visual C++ Express), in the name of making the Chromium build
+        work. Now that Chromium isn't using buildVisualStudioProject or
+        pdevenv, we can put things back they way they were.
+
+        Fixes <http://webkit.org/b/33797> build-webkit fails with VC++ Express
+        (due to /useenv flag)
+
+        Reviewed by Sam Weinig.
+
+        * Scripts/pdevenv: Always pass /useenv. Chromium doesn't use this
+        script anymore.
+        * Scripts/webkitdirs.pm:
+        (buildVisualStudioProject): Never pass /useenv anymore. pdevenv takes
+        care of this itself, and we don't want to pass /useenv when not using
+        pdevenv (e.g., when using VC++ Express, because that will cause it to
+        ignore the Platform SDK).
+
 2010-01-18  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/pdevenv b/WebKitTools/Scripts/pdevenv
index cab8b16..4643728 100755
--- a/WebKitTools/Scripts/pdevenv
+++ b/WebKitTools/Scripts/pdevenv
@@ -32,13 +32,8 @@ print $fh "\@echo off\n\n";
 print $fh "call \"\%" . $vsToolsVar . "\%\\vsvars32.bat\"\n\n";
 print $fh "set PATH=$vcBin;$scriptsPath;\%PATH\%\n\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";
+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;
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 6d6de56..98a47f6 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -1273,9 +1273,7 @@ sub buildVisualStudioProject
         $action = "/clean";
     }
 
-    my $useenv = "/useenv";
-
-    my @command = ($vcBuildPath, $useenv, $winProjectPath, $action, $config);
+    my @command = ($vcBuildPath, $winProjectPath, $action, $config);
 
     print join(" ", @command), "\n";
     return system @command;

-- 
WebKit Debian packaging