Changeset 47045 in webkit


Ignore:
Timestamp:
Aug 11, 2009 12:13:29 PM (15 years ago)
Author:
pkasting@chromium.org
Message:

https://bugs.webkit.org/show_bug.cgi?id=28183
Support VS2008 as well as VS2005 in a few scripts.

Reviewed by Darin Adler.

  • Scripts/pdevenv: Check both $VS80COMNTOOLS and $VS90COMNTOOLS.
  • Scripts/webkitdirs.pm: Use $VSINSTALLDIR if available instead of hardcoding the VS2005 dir.
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r47043 r47045  
     12009-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
    1112009-08-11  Eric Seidel  <eric@webkit.org>
    212
  • trunk/WebKitTools/Scripts/pdevenv

    r42183 r47045  
    1212chomp(my $scriptsPath = `cygpath -w "$FindBin::Bin"`);
    1313
     14my $vsToolsVar;
     15if ($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
    1428print $fh "\@echo off\n\n";
    15 print $fh "call \"\%VS80COMNTOOLS\%\\vsvars32.bat\"\n\n";
     29print $fh "call \"\%" . $vsToolsVar . "\%\\vsvars32.bat\"\n\n";
    1630print $fh "set PATH=$vcBin;$scriptsPath;\%PATH\%\n\n";
    1731print $fh "IF EXIST \"\%VSINSTALLDIR\%\\Common7\\IDE\\devenv.com\" (devenv.com /useenv " . join(" ", @ARGV) . ") ELSE ";
  • trunk/WebKitTools/Scripts/webkitdirs.pm

    r46575 r47045  
    953953    return if $vcBuildPath;
    954954
    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";
    958965    if (-e $vcBuildPath) {
    959966        # Visual Studio is installed; we can use pdevenv to build.
     
    961968    } else {
    962969        # 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;
    972970        $vcBuildPath = "$vsInstallDir/Common7/IDE/VCExpress.exe";
    973971        if (! -e $vcBuildPath) {
Note: See TracChangeset for help on using the changeset viewer.