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: https://svn.webkit.org/repository/webkit/trunk@15254 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f25497c91423391b52fb96e012f59c4e9695a2d1..40e14d8f9ad216424c5c25dddd2a5a6263e5fbbc 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+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.

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 8fcea6ac42c5ab715179db5d24fd79f850e8904d..804e49a428397361db35e8e148bd783ed3d1fe98 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -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;
 }