Changeset 150281 in webkit

Timestamp:

May 17, 2013, 12:06:43 PM (12 years ago)

Author:

Brent Fulgham

Message:

[Windows] Don't use pdevenv when building with VS2010.
​https://bugs.webkit.org/show_bug.cgi?id=116338.

Reviewed by Adam Roben.

• Scripts/webkitdirs.pm:

(setupCygwinEnv): Check if we are using VS2005, and only use
the 'pdevenv' hack if we are. Otherwise, just build with
our standard project since it uses VS2010+'s native
parallel building features.

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2013-05-17  Brent Fulgham  <bfulgham@apple.com>
+
+        [Windows] Don't use pdevenv when building with VS2010.
+        https://bugs.webkit.org/show_bug.cgi?id=116338.
+
+        Reviewed by Adam Roben.
+
+        * Scripts/webkitdirs.pm:
+        (setupCygwinEnv): Check if we are using VS2005, and only use
+        the 'pdevenv' hack if we are. Otherwise, just build with
+        our standard project since it uses VS2010+'s native
+        parallel building features.
+
 2013-05-17  Gustavo Noronha Silva  <gustavo.noronha@collabora.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -1635 +1635 @@
     if (-e $vcBuildPath) {
         # Visual Studio is installed; we can use pdevenv to build.
-        # FIXME: Make pdevenv work with non-Cygwin Perl.
-        $vcBuildPath = File::Spec->catfile(sourceDir(), qw(Tools Scripts pdevenv)) if isCygwin();
+        if (visualStudioVersion() eq "8") {
+            # FIXME: Make pdevenv work with non-Cygwin Perl.
+            $vcBuildPath = File::Spec->catfile(sourceDir(), qw(Tools Scripts pdevenv)) if isCygwin();
+        }
     } else {
         # Visual Studio not found, try VC++ Express