Commit 08ac1c1b authored by ddkilzer's avatar ddkilzer
Browse files

WebKitTools:

        Build fix. Reviewed by NOBODY.

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

        * Scripts/webkitdirs.pm: Backed out previous change.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@15284 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent fc80442f
2006-07-09 David Kilzer <ddkilzer@kilzer.net>
Build fix. Reviewed by NOBODY.
- Backed out http://bugzilla.opendarwin.org/show_bug.cgi?id=7802
devenv.com not available in VC++ Express installations
* Scripts/webkitdirs.pm: Backed out previous change.
2006-07-09 David Kilzer <ddkilzer@kilzer.net>
Reviewed by Darin.
......
......@@ -51,7 +51,7 @@ my $currentSVNRevision;
# Variables for Win32 support
my $vcBuildPath;
my $devenvPath;
my $windowsTmpPath;
sub determineSourceDir
......@@ -345,34 +345,11 @@ sub checkRequiredSystemConfig
sub setupCygwinEnv()
{
return if !isCygwin();
return if $vcBuildPath;
return if $devenvPath;
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;
}
}
$devenvPath = "$programFilesPath/Microsoft Visual Studio 8/Common7/IDE/devenv.com";
$windowsTmpPath = `cygpath -w /tmp`;
chomp $windowsTmpPath;
print "Building results into: ", baseProductDir(), "\n";
......@@ -387,8 +364,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 "$devenvPath $project.sln /build $config";
my $result = system $devenvPath, "$project.sln", "/build", $config;
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