Title: [220335] trunk/Tools
- Revision
- 220335
- Author
- pvol...@apple.com
- Date
- 2017-08-07 09:22:23 -0700 (Mon, 07 Aug 2017)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (220334 => 220335)
--- trunk/Tools/ChangeLog 2017-08-07 15:44:14 UTC (rev 220334)
+++ trunk/Tools/ChangeLog 2017-08-07 16:22:23 UTC (rev 220335)
@@ -1,3 +1,16 @@
+2017-08-07 Per Arne Vollan <pvol...@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 <cgar...@igalia.com>
[GTK][WPE] Add API to provide browser information required by automation
Modified: trunk/Tools/Scripts/webkitdirs.pm (220334 => 220335)
--- trunk/Tools/Scripts/webkitdirs.pm 2017-08-07 15:44:14 UTC (rev 220334)
+++ trunk/Tools/Scripts/webkitdirs.pm 2017-08-07 16:22:23 UTC (rev 220335)
@@ -572,7 +572,10 @@
$vsInstallDir = $ENV{'VSINSTALLDIR'};
$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();
@@ -584,8 +587,10 @@
{
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();
print "Using MSBuild: $msBuildInstallDir\n";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
