diff options
| author | Steve Block <steveblock@google.com> | 2009-11-05 09:23:40 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-11-10 22:41:12 +0000 |
| commit | cac0f67c402d107cdb10971b95719e2ff9c7c76b (patch) | |
| tree | d182c7f87211c6f201a5f038e332336493ebdbe7 /WebKitTools/Scripts/pdevenv | |
| parent | 4b2ef0f288e7c6c4602f621b7a0e9feed304b70e (diff) | |
| download | external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.zip external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.gz external_webkit-cac0f67c402d107cdb10971b95719e2ff9c7c76b.tar.bz2 | |
Merge webkit.org at r50258 : Initial merge by git.
Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
Diffstat (limited to 'WebKitTools/Scripts/pdevenv')
| -rwxr-xr-x | WebKitTools/Scripts/pdevenv | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/WebKitTools/Scripts/pdevenv b/WebKitTools/Scripts/pdevenv index 818e4ee..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 /useenv " . join(" ", @ARGV) . ") ELSE "; -print $fh "VCExpress.exe /useenv " . 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; |