[webkit-changes] [222206] trunk/Tools

Tue, 19 Sep 2017 08:01:00 -0700

Title: [222206] trunk/Tools
Revision
222206
Author
[email protected]
Date
2017-09-19 08:00:16 -0700 (Tue, 19 Sep 2017)

Log Message

[Win] WebKit fails to build with 64-bit Perl.
https://bugs.webkit.org/show_bug.cgi?id=177106

Reviewed by Brent Fulgham.

Visual Studio is installed in the 32-bit program files folder.

* Scripts/webkitdirs.pm:
(programFilesPathX86):
(visualStudioInstallDir):
(msBuildInstallDir):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (222205 => 222206)


--- trunk/Tools/ChangeLog	2017-09-19 09:00:15 UTC (rev 222205)
+++ trunk/Tools/ChangeLog	2017-09-19 15:00:16 UTC (rev 222206)
@@ -1,3 +1,17 @@
+2017-09-19  Per Arne Vollan  <[email protected]>
+
+        [Win] WebKit fails to build with 64-bit Perl.
+        https://bugs.webkit.org/show_bug.cgi?id=177106
+
+        Reviewed by Brent Fulgham.
+
+        Visual Studio is installed in the 32-bit program files folder.
+ 
+        * Scripts/webkitdirs.pm:
+        (programFilesPathX86):
+        (visualStudioInstallDir):
+        (msBuildInstallDir):
+
 2017-09-18  Filip Pizlo  <[email protected]>
 
         [WSL] Cannot put templated structs inside structs

Modified: trunk/Tools/Scripts/webkitdirs.pm (222205 => 222206)


--- trunk/Tools/Scripts/webkitdirs.pm	2017-09-19 09:00:15 UTC (rev 222205)
+++ trunk/Tools/Scripts/webkitdirs.pm	2017-09-19 15:00:16 UTC (rev 222206)
@@ -569,6 +569,13 @@
     return $programFilesPath;
 }
 
+sub programFilesPathX86
+{
+    my $programFilesPathX86 = $ENV{'PROGRAMFILES(X86)'} || "C:\\Program Files (x86)";
+
+    return $programFilesPathX86;
+}
+
 sub visualStudioInstallDir
 {
     return $vsInstallDir if defined $vsInstallDir;
@@ -577,9 +584,9 @@
         $vsInstallDir = $ENV{'VSINSTALLDIR'};
         $vsInstallDir =~ s|[\\/]$||;
     } else {
-        $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio", "2017", "Community");
+        $vsInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio", "2017", "Community");
         if (not -e $vsInstallDir) {
-            $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 14.0");
+            $vsInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio 14.0");
         }
     }
     chomp($vsInstallDir = `cygpath "$vsInstallDir"`) if isCygwin();
@@ -592,9 +599,9 @@
 {
     return $msBuildInstallDir if defined $msBuildInstallDir;
 
-    $msBuildInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio", "2017", "Community", "MSBuild", "15.0", "Bin");
+    $msBuildInstallDir = File::Spec->catdir(programFilesPathX86(), "Microsoft Visual Studio", "2017", "Community", "MSBuild", "15.0", "Bin");
     if (not -e $msBuildInstallDir) {
-        $msBuildInstallDir = File::Spec->catdir(programFilesPath(), "MSBuild", "14.0", "Bin");
+        $msBuildInstallDir = File::Spec->catdir(programFilesPathX86(), "MSBuild", "14.0", "Bin");
     }
     chomp($msBuildInstallDir = `cygpath "$msBuildInstallDir"`) if isCygwin();
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to