Changeset 244171 in webkit

Timestamp:

Apr 10, 2019 5:08:34 PM (5 years ago)

Author:

Fujii Hironori

Message:

[Win] Use a bundled vswhere.exe instead of downloading by update-vswhere.py
​https://bugs.webkit.org/show_bug.cgi?id=196760

Reviewed by Don Olmstead.

vswhere.exe has been bundled since Visual Studio 2017 version
15.2. We shouldn't download vswhere.exe.

• Scripts/build-jsc: Do not call update-vswhere.py.
• Scripts/build-webkit: Ditto.
• Scripts/update-vswhere.py: Removed.
• Scripts/webkitdirs.pm:

(requireModulesForVSWhere): Deleted.
(pickCurrentVisualStudioInstallation): Deleted.
(visualStudioInstallDirVSWhere): Return the latest installed VS
installation path by using the bundled vswhere.exe.
(setupCygwinEnv): Removed a unused variable $visualStudioPath.
(visualStudioInstallDirFallback): Removed.

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) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-10  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [Win] Use a bundled vswhere.exe instead of downloading by update-vswhere.py
+        https://bugs.webkit.org/show_bug.cgi?id=196760
+
+        Reviewed by Don Olmstead.
+
+        vswhere.exe has been bundled since Visual Studio 2017 version
+        15.2. We shouldn't download vswhere.exe.
+
+        * Scripts/build-jsc: Do not call update-vswhere.py.
+        * Scripts/build-webkit: Ditto.
+        * Scripts/update-vswhere.py: Removed.
+        * Scripts/webkitdirs.pm:
+        (requireModulesForVSWhere): Deleted.
+        (pickCurrentVisualStudioInstallation): Deleted.
+        (visualStudioInstallDirVSWhere): Return the latest installed VS
+        installation path by using the bundled vswhere.exe.
+        (setupCygwinEnv): Removed a unused variable $visualStudioPath.
+        (visualStudioInstallDirFallback): Removed.
+
 2019-04-10  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/build-jsc

@@ -126 +126 @@
 if (isWinCairo() || (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

@@ -260 +260 @@
 }
 
-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

@@ -166 +166 @@
 my $windowsSourceDir;
 my $winVersion;
-my $vsWhereFoundInstallation;
 
 # Defined in VCSUtils.
@@ -647 +646 @@
 }
 
-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 visualStudioInstallDirVSWhere
+{
+    my $vswhere = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio", "Installer", "vswhere.exe");
+    return unless -e $vswhere;
+    open(my $handle, "-|", $vswhere, qw(-nologo -latest -requires Microsoft.Component.MSBuild -property installationPath)) || return;
+    my $vsWhereOut = <$handle>;
+    $vsWhereOut =~ s/\r?\n//;
+    return $vsWhereOut;
 }
 
@@ -699 +665 @@
     } else {
         $vsInstallDir = visualStudioInstallDirVSWhere();
-        if (not -e $vsInstallDir) {
-            $vsInstallDir = visualStudioInstallDirFallback();
-        }
+        return unless defined $vsInstallDir;
     }
     chomp($vsInstallDir = `cygpath "$vsInstallDir"`) if isCygwin();
@@ -707 +671 @@
     print "Using Visual Studio: $vsInstallDir\n";
     return $vsInstallDir;
-}
-
-sub visualStudioInstallDirVSWhere
-{
-    pickCurrentVisualStudioInstallation();
-    if (defined($vsWhereFoundInstallation)) {
-        return $vsWhereFoundInstallation->{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 undef;
 }
 
@@ -1895 +1832 @@
 
     my $programFilesPath = programFilesPath();
-    my $visualStudioPath = File::Spec->catfile(visualStudioInstallDir(), qw(Common7 IDE devenv.com));
 
     print "Building results into: ", baseProductDir(), "\n";