Changeset 47045 in webkit
- Timestamp:
- Aug 11, 2009 12:13:29 PM (15 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r47043 r47045 1 2009-08-11 Peter Kasting <pkasting@google.com> 2 3 Reviewed by Darin Adler. 4 5 https://bugs.webkit.org/show_bug.cgi?id=28183 6 Support VS2008 as well as VS2005 in a few scripts. 7 8 * Scripts/pdevenv: Check both $VS80COMNTOOLS and $VS90COMNTOOLS. 9 * Scripts/webkitdirs.pm: Use $VSINSTALLDIR if available instead of hardcoding the VS2005 dir. 10 1 11 2009-08-11 Eric Seidel <eric@webkit.org> 2 12 -
trunk/WebKitTools/Scripts/pdevenv
r42183 r47045 12 12 chomp(my $scriptsPath = `cygpath -w "$FindBin::Bin"`); 13 13 14 my $vsToolsVar; 15 if ($ENV{'VS80COMNTOOLS'}) { 16 $vsToolsVar = "VS80COMNTOOLS"; 17 } elsif ($ENV{'VS90COMNTOOLS'}) { 18 $vsToolsVar = "VS90COMNTOOLS"; 19 } else { 20 print "*************************************************************\n"; 21 print "Cannot find Visual Studio tools dir.\n"; 22 print "Please ensure that \$VS80COMNTOOLS or \$VS90COMNTOOLS\n"; 23 print "is set to a valid location.\n"; 24 print "*************************************************************\n"; 25 die; 26 } 27 14 28 print $fh "\@echo off\n\n"; 15 print $fh "call \"\% VS80COMNTOOLS\%\\vsvars32.bat\"\n\n";29 print $fh "call \"\%" . $vsToolsVar . "\%\\vsvars32.bat\"\n\n"; 16 30 print $fh "set PATH=$vcBin;$scriptsPath;\%PATH\%\n\n"; 17 31 print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com /useenv " . join(" ", @ARGV) . ") ELSE "; -
trunk/WebKitTools/Scripts/webkitdirs.pm
r46575 r47045 953 953 return if $vcBuildPath; 954 954 955 my $programFilesPath = `cygpath "$ENV{'PROGRAMFILES'}"`; 956 chomp $programFilesPath; 957 $vcBuildPath = "$programFilesPath/Microsoft Visual Studio 8/Common7/IDE/devenv.com"; 955 my $vsInstallDir; 956 my $programFilesPath = $ENV{'PROGRAMFILES'} || "C:\\Program Files"; 957 if ($ENV{'VSINSTALLDIR'}) { 958 $vsInstallDir = $ENV{'VSINSTALLDIR'}; 959 } else { 960 $vsInstallDir = "$programFilesPath/Microsoft Visual Studio 8"; 961 } 962 $vsInstallDir = `cygpath "$vsInstallDir"`; 963 chomp $vsInstallDir; 964 $vcBuildPath = "$vsInstallDir/Common7/IDE/devenv.com"; 958 965 if (-e $vcBuildPath) { 959 966 # Visual Studio is installed; we can use pdevenv to build. … … 961 968 } else { 962 969 # Visual Studio not found, try VC++ Express 963 my $vsInstallDir;964 if ($ENV{'VSINSTALLDIR'}) {965 $vsInstallDir = $ENV{'VSINSTALLDIR'};966 } else {967 $programFilesPath = $ENV{'PROGRAMFILES'} || "C:\\Program Files";968 $vsInstallDir = "$programFilesPath/Microsoft Visual Studio 8";969 }970 $vsInstallDir = `cygpath "$vsInstallDir"`;971 chomp $vsInstallDir;972 970 $vcBuildPath = "$vsInstallDir/Common7/IDE/VCExpress.exe"; 973 971 if (! -e $vcBuildPath) {
Note: See TracChangeset
for help on using the changeset viewer.