Changeset 53407 in webkit
- Timestamp:
- Jan 18, 2010 7:05:57 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r53404 r53407 1 2010-01-18 Adam Roben <aroben@apple.com> 2 3 Clean up use of /useenv when invoking Visual C++ 4 5 This change reverts things to their pre-r49485 state. That revision 6 (and, subsequently, r49664 and r51788) started passing /useenv to 7 Visual C++, even in cases where we don't want to do so (such as when 8 invoking Visual C++ Express), in the name of making the Chromium build 9 work. Now that Chromium isn't using buildVisualStudioProject or 10 pdevenv, we can put things back they way they were. 11 12 Fixes <http://webkit.org/b/33797> build-webkit fails with VC++ Express 13 (due to /useenv flag) 14 15 Reviewed by Sam Weinig. 16 17 * Scripts/pdevenv: Always pass /useenv. Chromium doesn't use this 18 script anymore. 19 * Scripts/webkitdirs.pm: 20 (buildVisualStudioProject): Never pass /useenv anymore. pdevenv takes 21 care of this itself, and we don't want to pass /useenv when not using 22 pdevenv (e.g., when using VC++ Express, because that will cause it to 23 ignore the Platform SDK). 24 1 25 2010-01-18 Adam Barth <abarth@webkit.org> 2 26 -
trunk/WebKitTools/Scripts/pdevenv
r49664 r53407 33 33 print $fh "set PATH=$vcBin;$scriptsPath;\%PATH\%\n\n"; 34 34 35 my $useenv = "/useenv "; 36 if (isChromium()) { 37 $useenv = ""; 38 } 39 40 print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com " . $useenv . join(" ", @ARGV) . ") ELSE "; 41 print $fh "VCExpress.exe " . $useenv . join(" ", @ARGV) . "\n"; 35 print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com /useenv " . join(" ", @ARGV) . ") ELSE "; 36 print $fh "VCExpress.exe /useenv " . join(" ", @ARGV) . "\n"; 42 37 43 38 -
trunk/WebKitTools/Scripts/webkitdirs.pm
r53266 r53407 1274 1274 } 1275 1275 1276 my $useenv = "/useenv"; 1277 1278 my @command = ($vcBuildPath, $useenv, $winProjectPath, $action, $config); 1276 my @command = ($vcBuildPath, $winProjectPath, $action, $config); 1279 1277 1280 1278 print join(" ", @command), "\n";
Note: See TracChangeset
for help on using the changeset viewer.