From 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf Mon Sep 17 00:00:00 2001
From: Steve Block <steveblock@google.com>
Date: Thu, 8 Oct 2009 17:19:54 +0100
Subject: Merge webkit.org at R49305 : Automatic merge by git.

Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
---
 WebKitTools/Scripts/pdevenv | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'WebKitTools/Scripts/pdevenv')

diff --git a/WebKitTools/Scripts/pdevenv b/WebKitTools/Scripts/pdevenv
index 9128912..818e4ee 100755
--- a/WebKitTools/Scripts/pdevenv
+++ b/WebKitTools/Scripts/pdevenv
@@ -11,8 +11,22 @@ my ($fh, $path) = tempfile(UNLINK => 0, SUFFIX => '.cmd') or die;
 chomp(my $vcBin = `cygpath -w "$FindBin::Bin/../vcbin"`);
 chomp(my $scriptsPath = `cygpath -w "$FindBin::Bin"`);
 
+my $vsToolsVar;
+if ($ENV{'VS80COMNTOOLS'}) {
+    $vsToolsVar = "VS80COMNTOOLS";
+} elsif ($ENV{'VS90COMNTOOLS'}) {
+    $vsToolsVar = "VS90COMNTOOLS";
+} else {
+    print "*************************************************************\n";
+    print "Cannot find Visual Studio tools dir.\n";
+    print "Please ensure that \$VS80COMNTOOLS or \$VS90COMNTOOLS\n";
+    print "is set to a valid location.\n";
+    print "*************************************************************\n";
+    die;
+}
+
 print $fh "\@echo off\n\n";
-print $fh "call \"\%VS80COMNTOOLS\%\\vsvars32.bat\"\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";
-- 
cgit v1.1