Changeset 56918 in webkit

Timestamp:

Apr 1, 2010 9:54:53 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-01 Adam Barth <​abarth@webkit.org>

Reviewed by Dimitri Glazkov.

Let Chromium Windows build with Visual Studio Express
​https://bugs.webkit.org/show_bug.cgi?id=36919

This is horrible, horrible copy/paste code, but that seems to be the
way of webkitdirs.pm. :(

Someone needs to go through an cleanup this code, but I don't have the
heart to do it in this patch.

• Scripts/webkitdirs.pm:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-01  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Let Chromium Windows build with Visual Studio Express
+        https://bugs.webkit.org/show_bug.cgi?id=36919
+
+        This is horrible, horrible copy/paste code, but that seems to be the
+        way of webkitdirs.pm.  :(
+
+        Someone needs to go through an cleanup this code, but I don't have the
+        heart to do it in this patch.
+
+        * Scripts/webkitdirs.pm:
+
 2010-04-01  Ilya Tikhonovsky  <loislo@chromium.org>
 

trunk/WebKitTools/Scripts/webkitdirs.pm

@@ -1452 +1452 @@
     chomp $vsInstallDir;
     $vcBuildPath = "$vsInstallDir/Common7/IDE/devenv.com";
+    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
+        $vcBuildPath = "$vsInstallDir/Common7/IDE/VCExpress.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;
+        }
+    }
 
     # Create command line and execute it.