WebKitTools:

        Reviewed by Timothy Hatcher.

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

        * Scripts/webkitdirs.pm: Make Windows build work with Visual C++ Express.

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 395b51303619436f8a8bfb08a2b9f9e77c0f6656..f25497c91423391b52fb96e012f59c4e9695a2d1 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-09  Bjoern Graf  <bjoern.graf@gmail.com>
+
+        Reviewed by Timothy Hatcher.
+
+        - http://bugzilla.opendarwin.org/show_bug.cgi?id=7802
+          devenv.com not available in VC++ Express installations
+
+        * Scripts/webkitdirs.pm: Make Windows build work with Visual C++ Express.
+
 2006-07-09  Joost de Valk  <jdevalk@opendarwin.org>
 
         Reviewed by Eric.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index c1dc8af1351953014b694e7b60401f15c68273ac..8fcea6ac42c5ab715179db5d24fd79f850e8904d 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -51,7 +51,7 @@ my $currentSVNRevision;
 
 
 # Variables for Win32 support
-my $devenvPath;
+my $vcbuildPath;
 my $windowsTmpPath;
 
 sub determineSourceDir
@@ -345,11 +345,26 @@ sub checkRequiredSystemConfig
 sub setupCygwinEnv()
 {
     return if !isCygwin();
-    return if $devenvPath;
+    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;
+    }
 
-    my $programFilesPath = `cygpath "$ENV{'PROGRAMFILES'}"`;
-    chomp $programFilesPath;
-    $devenvPath = "$programFilesPath/Microsoft Visual Studio 8/Common7/IDE/devenv.com";
     $windowsTmpPath = `cygpath -w /tmp`;
     chomp $windowsTmpPath;
     print "Building results into: ", baseProductDir(), "\n";
@@ -364,8 +379,8 @@ sub buildVisualStudioProject($)
     chdir "$project.vcproj" or die "Failed to cd into $project.vcproj\n";
     my $config = configuration();
 
-    print "$devenvPath $project.sln /build $config";
-    my $result = system $devenvPath, "$project.sln", "/build", $config;
+    print "$vcbuildPath $project.sln /u /time \"$config|Win32\"\n";
+    my $result = system $vcbuildPath, "$project.sln", "/u", "/time", "$config|Win32";
     chdir ".." or die;
     return $result;
 }