2006-03-16 Eric Seidel <eseidel@apple.com>

        Reviewed by darin.

        Make build-webkit print correctly to stdout on windows.

        * Scripts/webkitdirs.pm: Fix to use devenv.com instead of devenv.exe

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13333 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1bcfbebbb76e3c741f47be7160f7af3681b91762..c6950483d984642b3b2395d91ace5716a9d83a05 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-16  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by darin.
+
+        Make build-webkit print correctly to stdout on windows.
+
+        * Scripts/webkitdirs.pm: Fix to use devenv.com instead of devenv.exe
+
 2006-03-15  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by mjs.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 3abcc3b8b7090a2fc91bd9b4e64a7a58b6e03286..409ddc34da1e62817730499f831ccf7435d734be 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -330,7 +330,7 @@ sub setupCygwinEnv()
 
     my $programFilesPath = `cygpath "$ENV{'PROGRAMFILES'}"`;
     chomp $programFilesPath;
-    $devenvPath = "$programFilesPath/Microsoft Visual Studio 8/Common7/IDE/devenv.exe";
+    $devenvPath = "$programFilesPath/Microsoft Visual Studio 8/Common7/IDE/devenv.com";
     $windowsTmpPath = `cygpath -w /tmp`;
     chomp $windowsTmpPath;
     print "Building results into: ", baseProductDir(), "\n";
@@ -345,11 +345,8 @@ sub buildVisualStudioProject($)
     chdir "$project.vcproj" or die "Failed to cd into $project.vcproj\n";
     my $config = configuration();
 
-    my $resultsFile = "$windowsTmpPath\\buildresults.txt";
-    unlink($resultsFile);
-    print "$devenvPath $project.sln /build $config /Out $resultsFile\n";
-    my $result = system $devenvPath, "$project.sln", "/build", $config, "/Out", $resultsFile;
-    system "cat", $resultsFile;
+    print "$devenvPath $project.sln /build $config";
+    my $result = system $devenvPath, "$project.sln", "/build", $config;
     chdir ".." or die;
     return $result;
 }