Changeset 220335 in webkit

Timestamp:

Aug 7, 2017 9:22:23 AM (7 years ago)

Author:

pvollan@apple.com

Message:

[Win] Use Visual Studio 2017 if installed.
​https://bugs.webkit.org/show_bug.cgi?id=175188

Reviewed by Sam Weinig.

If installed, use VS2017 to build WebKit. If not, fall back to VS2015.

• Scripts/webkitdirs.pm:

(visualStudioInstallDir):
(msBuildInstallDir):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2017-08-07  Per Arne Vollan  <pvollan@apple.com>
+
+        [Win] Use Visual Studio 2017 if installed.
+        https://bugs.webkit.org/show_bug.cgi?id=175188
+
+        Reviewed by Sam Weinig.
+
+        If installed, use VS2017 to build WebKit. If not, fall back to VS2015.
+
+        * Scripts/webkitdirs.pm:
+        (visualStudioInstallDir):
+        (msBuildInstallDir):
+
 2017-08-05  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -573 +573 @@
         $vsInstallDir =~ s|[\\/]$||;
     } else {
-        $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 14.0");
+        $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio", "2017", "Community");
+        if (not -e $vsInstallDir) {
+            $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 14.0");
+        }
     }
     chomp($vsInstallDir = `cygpath "$vsInstallDir"`) if isCygwin();
@@ -585 +588 @@
     return $msBuildInstallDir if defined $msBuildInstallDir;
 
-    $msBuildInstallDir = File::Spec->catdir(programFilesPath(), "MSBuild", "14.0", "Bin");
-   
+    $msBuildInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio", "2017", "Community", "MSBuild", "15.0", "Bin");
+    if (not -e $msBuildInstallDir) {
+        $msBuildInstallDir = File::Spec->catdir(programFilesPath(), "MSBuild", "14.0", "Bin");
+    }
     chomp($msBuildInstallDir = `cygpath "$msBuildInstallDir"`) if isCygwin();