Commit 095ec63b authored by ddkilzer's avatar ddkilzer
Browse files

WebKitTools:

        Reviewed by NOBODY (build fix).

        - http://bugzilla.opendarwin.org/show_bug.cgi?id=7802
          devenv.com not available in VC++ Express installations

        * Scripts/webkitdirs.pm: Restore Hyatt's original logic to make buildbot
        work again.  Add VC++ Express check as the fallback.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15254 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent b53ebdcb
2006-07-09 David Kilzer <ddkilzer@kilzer.net>
Reviewed by NOBODY (build fix).
- http://bugzilla.opendarwin.org/show_bug.cgi?id=7802
devenv.com not available in VC++ Express installations
* Scripts/webkitdirs.pm: Restore Hyatt's original logic to make buildbot
work again. Add VC++ Express check as the fallback.
2006-07-09 Bjoern Graf <bjoern.graf@gmail.com>
Reviewed by Timothy Hatcher.
......
......@@ -51,7 +51,7 @@ my $currentSVNRevision;
# Variables for Win32 support
my $vcbuildPath;
my $vcBuildPath;
my $windowsTmpPath;
sub determineSourceDir
......@@ -345,24 +345,32 @@ sub checkRequiredSystemConfig
sub setupCygwinEnv()
{
return if !isCygwin();
return if $vcbuildPath;
my $vcInstallDir = $ENV{'VCINSTALLDIR'};
if (!$vcInstallDir) {
my $pf = $ENV{'PROGRAMFILES'} || "C:/Program Files";
$vcInstallDir = "$pf/Microsoft Visual Studio 8/VC";
}
$vcInstallDir = `cygpath "$vcInstallDir"`;
chomp $vcInstallDir;
$vcbuildPath = "$vcInstallDir/vcpackages/vcbuild.exe";
if (! -e $vcbuildPath) {
print "*************************************************************\n";
print "Cannot find 'vcbuild.exe' in '$vcInstallDir/vcpackages/'\n";
print "Please execute the file 'vcvars32.bat' from\n";
print "'<Program Files>\\Microsoft Visual Studio 8\\VC\\bin\\'\n";
print "to setup the necessary environment variables.\n";
print "*************************************************************\n";
die;
return if $vcBuildPath;
my $programFilesPath = `cygpath "$ENV{'PROGRAMFILES'}"`;
chomp $programFilesPath;
$vcBuildPath = "$programFilesPath/Microsoft Visual Studio 8/Common7/IDE/devenv.com";
if (! -e $vcBuildPath) {
# VC++ not found, try VC++ Express
my $vcInstallDir;
if ($ENV{'VCINSTALLDIR'}) {
$vcInstallDir = $ENV{'VCINSTALLDIR'};
} else {
$programFilesPath = $ENV{'PROGRAMFILES'} || "C:\\Program Files";
$vcInstallDir = "$programFilesPath/Microsoft Visual Studio 8/VC";
}
$vcInstallDir = `cygpath "$vcInstallDir"`;
chomp $vcInstallDir;
$vcBuildPath = "$vcInstallDir/vcpackages/vcbuild.exe";
if (! -e $vcBuildPath) {
print "*************************************************************\n";
print "Cannot find '$vcBuildPath'\n";
print "Please execute the file 'vcvars32.bat' from\n";
print "'$programFilesPath\\Microsoft Visual Studio 8\\VC\\bin\\'\n";
print "to setup the necessary environment variables.\n";
print "*************************************************************\n";
die;
}
}
$windowsTmpPath = `cygpath -w /tmp`;
......@@ -379,8 +387,8 @@ sub buildVisualStudioProject($)
chdir "$project.vcproj" or die "Failed to cd into $project.vcproj\n";
my $config = configuration();
print "$vcbuildPath $project.sln /u /time \"$config|Win32\"\n";
my $result = system $vcbuildPath, "$project.sln", "/u", "/time", "$config|Win32";
print "$vcBuildPath $project.sln /u /time \"$config|Win32\"\n";
my $result = system $vcBuildPath, "$project.sln", "/u", "/time", "$config|Win32";
chdir ".." or die;
return $result;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment