Changeset 224291 in webkit

Timestamp:

Nov 1, 2017 1:44:55 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[Win] Detect Visual Studio 2017 location
​https://bugs.webkit.org/show_bug.cgi?id=175275

Patch by Stephan Szabo <​stephan.szabo@sony.com> on 2017-11-01
Reviewed by Yusuke Suzuki.

• Scripts/build-jsc:
• Scripts/build-webkit:
• Scripts/update-vswhere.py: Added.
• Scripts/webkitdirs.pm:

(requireModulesForVSWhere):
(pickCurrentVisualStudioInstallation):
(pickLegacyVisualStudioInstallation):
(visualStudioInstallDir):
(visualStudioInstallDirVSWhere):
(visualStudioInstallDirLegacy):
(visualStudioInstallDirFallback):
(msBuildInstallDir):
(visualStudioVersion):
(visualStudioVersionFromInstallDir):
(generateBuildSystemFromCMakeProject):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/build-jsc (modified) (1 diff)
• Scripts/build-webkit (modified) (1 diff)
• Scripts/update-vswhere.py (added)
• Scripts/webkitdirs.pm (modified) (6 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2017-11-01  Stephan Szabo  <stephan.szabo@sony.com>
+
+        [Win] Detect Visual Studio 2017 location
+        https://bugs.webkit.org/show_bug.cgi?id=175275
+
+        Reviewed by Yusuke Suzuki.
+
+        * Scripts/build-jsc:
+        * Scripts/build-webkit:
+        * Scripts/update-vswhere.py: Added.
+        * Scripts/webkitdirs.pm:
+        (requireModulesForVSWhere):
+        (pickCurrentVisualStudioInstallation):
+        (pickLegacyVisualStudioInstallation):
+        (visualStudioInstallDir):
+        (visualStudioInstallDirVSWhere):
+        (visualStudioInstallDirLegacy):
+        (visualStudioInstallDirFallback):
+        (msBuildInstallDir):
+        (visualStudioVersion):
+        (visualStudioVersionFromInstallDir):
+        (generateBuildSystemFromCMakeProject):
+
 2017-11-01  Tim Horton  <timothy_horton@apple.com>
 

trunk/Tools/Scripts/build-jsc

@@ -118 +118 @@
 if (isJSCOnly() && isWindows()) {
     (system("python Tools/Scripts/update-webkit-wincairo-libs.py") == 0) or die;
+    system("python Tools/Scripts/update-vswhere.py");
 }
 

trunk/Tools/Scripts/build-webkit

@@ -246 +246 @@
 }
 
+if (isAnyWindows()) {
+    system("python Tools/Scripts/update-vswhere.py");
+}
+
 # If asked to build just the WebKit project, overwrite the projects
 # list after all of the port specific tweaks have been made to

trunk/Tools/Scripts/webkitdirs.pm

@@ -161 +161 @@
 my $winVersion;
 my $willUseVCExpressWhenBuilding = 0;
+my $vsWhereFoundInstallation;
+my $vsWhereLegacyInstallation;
 
 # Defined in VCSUtils.
@@ -590 +592 @@
 }
 
+sub requireModulesForVSWhere
+{
+    require Encode;
+    require Encode::Locale;
+    require JSON::PP;
+}
+
+sub pickCurrentVisualStudioInstallation
+{
+    return $vsWhereFoundInstallation if defined $vsWhereFoundInstallation;
+
+    requireModulesForVSWhere();
+    determineSourceDir();
+
+    # Prefer Enterprise, then Professional, then Community, then
+    # anything else that provides MSBuild.
+    foreach my $productType ((
+        'Microsoft.VisualStudio.Product.Enterprise',
+        'Microsoft.VisualStudio.Product.Professional',
+        'Microsoft.VisualStudio.Product.Community',
+        undef
+    )) {
+        my $command = "$sourceDir/WebKitLibraries/win/tools/vswhere -nologo -latest -format json -requires Microsoft.Component.MSBuild";
+        if (defined $productType) {
+            $command .= " -products $productType";
+        }
+        my $vsWhereOut = `$command`;
+        my $installations = [];
+        eval {
+            $installations = JSON::PP::decode_json(Encode::encode('UTF-8' => Encode::decode(console_in => $vsWhereOut)));
+        };
+        print "Error getting Visual Studio Location: $@\n" if $@;
+        undef $@;
+
+        if (scalar @$installations) {
+            my $installation = $installations->[0];
+            $vsWhereFoundInstallation = $installation;
+            return $installation;
+        }
+    }
+    return undef;
+}
+
+sub pickLegacyVisualStudioInstallation
+{
+    return $vsWhereLegacyInstallation if defined $vsWhereLegacyInstallation;
+
+    requireModulesForVSWhere();
+    determineSourceDir();
+
+    my $vsWhereOut = `$sourceDir/WebKitLibraries/win/tools/vswhere -nologo -legacy -format json`;
+    my $installations_all = [];
+    eval {
+        $installations_all = JSON::PP::decode_json(Encode::encode('UTF-8' => Encode::decode(console_in => $vsWhereOut)));
+    };
+    print "Error getting Visual Studio Legacy Location: $@\n" if $@;
+    undef $@;
+
+    # It's possible that a non-legacy installation without msbuild
+    # would not be found by the latest, but would be found by this
+    # vswhere call, and we want to skip those, so check for versions
+    # with an installation version before 15.0.
+    my @installations = grep { $_->{installationVersion} < 15 } @$installations_all;
+
+    # We don't get much information that would let us choose between
+    # legacy installations, so we'll take the first.
+    if (scalar @installations) {
+        my $installation = $installations[0];
+        $vsWhereLegacyInstallation = $installation;
+        return $installation;
+    }
+    return undef;
+}
+
 sub visualStudioInstallDir
 {
@@ -598 +674 @@
         $vsInstallDir =~ s|[\\/]$||;
     } else {
-        $vsInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio", "2017", "Community");
+        $vsInstallDir = visualStudioInstallDirVSWhere();
         if (not -e $vsInstallDir) {
-            $vsInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio 14.0");
+            $vsInstallDir = visualStudioInstallDirLegacy();
+        }
+        if (not -e $vsInstallDir) {
+            $vsInstallDir = visualStudioInstallDirFallback();
+            print "Fallback $vsInstallDir\n";
         }
     }
@@ -609 +689 @@
 }
 
+sub visualStudioInstallDirVSWhere
+{
+    pickCurrentVisualStudioInstallation();
+    if (defined($vsWhereFoundInstallation)) {
+        return $vsWhereFoundInstallation->{installationPath};
+    }
+    return undef;
+}
+
+sub visualStudioInstallDirLegacy
+{
+    pickLegacyVisualStudioInstallation();
+    if (defined($vsWhereLegacyInstallation)) {
+        return $vsWhereLegacyInstallation->{installationPath};
+    }
+    return undef;
+}
+
+sub visualStudioInstallDirFallback
+{
+    foreach my $productType ((
+        'Enterprise',
+        'Professional',
+        'Community',
+    )) {
+        my $installdir = File::Spec->catdir(programFilesPathX86(),
+            "Microsoft Visual Studio", "2017", $productType);
+        my $msbuilddir = File::Spec->catdir($installdir,
+            "MSBuild", "15.0", "bin");
+        if (-e $installdir && -e $msbuilddir) {
+            return $installdir;
+        }
+    }
+    return File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio 14.0");
+}
+
 sub msBuildInstallDir
 {
     return $msBuildInstallDir if defined $msBuildInstallDir;
 
-    $msBuildInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio", "2017", "Community", "MSBuild", "15.0", "Bin");
-    if (not -e $msBuildInstallDir) {
-        $msBuildInstallDir = File::Spec->catdir(programFilesPathX86(), "MSBuild", "14.0", "Bin");
-    }
+    my $version = visualStudioVersion();
+    if ($version >= 15.0) {
+        my $installDir = visualStudioInstallDir();
+        $msBuildInstallDir = File::Spec->catdir($installDir,
+            "MSBuild", $version, "bin");
+    } else {
+        $msBuildInstallDir = File::Spec->catdir(programFilesPathX86(), 
+            "MSBuild", "14.0", "Bin")
+    }
+
     chomp($msBuildInstallDir = `cygpath "$msBuildInstallDir"`) if isCygwin();
 
@@ -628 +750 @@
 
     my $installDir = visualStudioInstallDir();
-
-    $vsVersion = ($installDir =~ /Microsoft Visual Studio ([0-9]+\.[0-9]*)/) ? $1 : "14";
+    $vsVersion = visualStudioVersionFromInstallDir($installDir);
 
     print "Using Visual Studio $vsVersion\n";
     return $vsVersion;
+}
+
+sub visualStudioVersionFromInstallDir
+{
+    my ($dir) = @_;
+    my $version;
+
+    if ($dir =~ m|Microsoft Visual Studio[/\\]2017|) {
+        $version = "15.0";
+    }
+
+    if (!defined($version)) {
+        if ($dir =~ /Microsoft Visual Studio ([0-9]+\.[0-9]*)/) {
+            $version = $1;
+        }
+    }
+
+    return $version;
 }
 
@@ -2085 +2224 @@
         }
     } elsif (isAnyWindows() && isWin64()) {
-        push @args, '-G "Visual Studio 14 2015 Win64"';
+        if (visualStudioVersion() >= 15) {
+            push @args, '-G "Visual Studio 15 2017 Win64"';
+        } else {
+            push @args, '-G "Visual Studio 14 2015 Win64"';
+        }
     }
     # Do not show progress of generating bindings in interactive Ninja build not to leave noisy lines on tty