Commit 9a0ca4c7 authored by aroben@apple.com's avatar aroben@apple.com

Don't use pdevenv when building with VC++ Express

        Fixes Bug 25308: REGRESSION (r42182): Build fails after following
        build instructions on webkit.org fail when using VC++ Express
        <https://bugs.webkit.org/show_bug.cgi?id=25308>

        Reviewed by Eric Seidel.

        * Scripts/webkitdirs.pm:
        (setupCygwinEnv): When Visual Studio is installed, set $vcBuildPath to
        point to pdevenv. When VC++ Express is installed, set $vcBuildPath to
        point to VC++ Express, as before.
        (buildVisualStudioProject): Use $vcBuildPath to build instead of
        hard-coding pdevenv.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43239 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 9a90e0cb
2009-05-05 Adam Roben <aroben@apple.com>
Don't use pdevenv when building with VC++ Express
Fixes Bug 25308: REGRESSION (r42182): Build fails after following
build instructions on webkit.org fail when using VC++ Express
<https://bugs.webkit.org/show_bug.cgi?id=25308>
Reviewed by Eric Seidel.
* Scripts/webkitdirs.pm:
(setupCygwinEnv): When Visual Studio is installed, set $vcBuildPath to
point to pdevenv. When VC++ Express is installed, set $vcBuildPath to
point to VC++ Express, as before.
(buildVisualStudioProject): Use $vcBuildPath to build instead of
hard-coding pdevenv.
2009-05-05 Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
Rubber-stamped by Simon Hausmann.
......
......@@ -912,8 +912,11 @@ sub setupCygwinEnv()
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
if (-e $vcBuildPath) {
# Visual Studio is installed; we can use pdevenv to build.
$vcBuildPath = File::Spec->catfile(sourceDir(), qw(WebKitTools Scripts pdevenv));
} else {
# Visual Studio not found, try VC++ Express
my $vsInstallDir;
if ($ENV{'VSINSTALLDIR'}) {
$vsInstallDir = $ENV{'VSINSTALLDIR'};
......@@ -980,9 +983,7 @@ sub buildVisualStudioProject
$action = "/clean";
}
my $pdevenvPath = File::Spec->catfile(sourceDir(), qw(WebKitTools Scripts pdevenv));
my @command = ($pdevenvPath, $winProjectPath, $action, $config);
my @command = ($vcBuildPath, $winProjectPath, $action, $config);
print join(" ", @command), "\n";
return system @command;
......
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