Changeset 53407 in webkit

Timestamp:

Jan 18, 2010 7:05:57 AM (14 years ago)

Author:

Adam Roben

Message:

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).

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/pdevenv (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-18  Adam Roben  <aroben@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@webkit.org>
 

trunk/WebKitTools/Scripts/pdevenv

@@ -33 +33 @@
 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";
 
 

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -1274 +1274 @@
     }
 
-    my $useenv = "/useenv";
-
-    my @command = ($vcBuildPath, $useenv, $winProjectPath, $action, $config);
+    my @command = ($vcBuildPath, $winProjectPath, $action, $config);
 
     print join(" ", @command), "\n";