Changeset 224266 in webkit

Timestamp:

Oct 31, 2017 5:29:19 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r224143.
​https://bugs.webkit.org/show_bug.cgi?id=179091

The patch requires non-standard perl modules in macOS and
breaks AWFY (Requested by yusukesuzuki on #webkit).

Reverted changeset:

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

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2017-10-31  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r224143.
+        https://bugs.webkit.org/show_bug.cgi?id=179091
+
+        The patch requires non-standard perl modules in macOS and
+        breaks AWFY (Requested by yusukesuzuki on #webkit).
+
+        Reverted changeset:
+
+        "[Win] Detect Visual Studio 2017 location"
+        https://bugs.webkit.org/show_bug.cgi?id=175275
+        https://trac.webkit.org/changeset/224143
+
 2017-10-31  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

@@ -36 +36 @@
 use Cwd qw(realpath);
 use Digest::MD5 qw(md5_hex);
-use Encode;
-use Encode::Locale;
 use FindBin;
 use File::Basename;
@@ -45 +43 @@
 use File::Temp qw(tempdir);
 use File::stat;
-use JSON::PP;
 use List::Util;
 use POSIX;
@@ -164 +161 @@
 my $winVersion;
 my $willUseVCExpressWhenBuilding = 0;
-my $vsWhereFoundInstallation;
-my $vsWhereLegacyInstallation;
 
 # Defined in VCSUtils.
@@ -595 +590 @@
 }
 
-sub pickCurrentVisualStudioInstallation
-{
-    return $vsWhereFoundInstallation if defined $vsWhereFoundInstallation;
-
-    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 = 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;
-
-    determineSourceDir();
-
-    my $vsWhereOut = `$sourceDir/WebKitLibraries/win/tools/vswhere -nologo -legacy -format json`;
-    my $installations_all = [];
-    eval {
-        $installations_all = 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
 {
@@ -668 +598 @@
         $vsInstallDir =~ s|[\\/]$||;
     } else {
-        $vsInstallDir = visualStudioInstallDirVSWhere();
+        $vsInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio", "2017", "Community");
         if (not -e $vsInstallDir) {
-            $vsInstallDir = visualStudioInstallDirLegacy();
-        }
-        if (not -e $vsInstallDir) {
-            $vsInstallDir = visualStudioInstallDirFallback();
-            print "Fallback $vsInstallDir\n";
+            $vsInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio 14.0");
         }
     }
@@ -683 +609 @@
 }
 
-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;
 
-    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")
-    }
-
+    $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");
+    }
     chomp($msBuildInstallDir = `cygpath "$msBuildInstallDir"`) if isCygwin();
 
@@ -744 +628 @@
 
     my $installDir = visualStudioInstallDir();
-    $vsVersion = visualStudioVersionFromInstallDir($installDir);
+
+    $vsVersion = ($installDir =~ /Microsoft Visual Studio ([0-9]+\.[0-9]*)/) ? $1 : "14";
 
     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;
 }
 
@@ -2218 +2085 @@
         }
     } elsif (isAnyWindows() && isWin64()) {
-        if (visualStudioVersion() >= 15) {
-            push @args, '-G "Visual Studio 15 2017 Win64"';
-        } else {
-            push @args, '-G "Visual Studio 14 2015 Win64"';
-        }
+        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