Changeset 160846 in webkit

Timestamp:

Dec 19, 2013 11:10:01 AM (10 years ago)

Author:

roger_fong@apple.com

Message:

Don't check VSINSTALLDIR when looking for Visual Studio install directory.
​https://bugs.webkit.org/show_bug.cgi?id=125998.

Reviewed by Alexey Proskuryakov.

• Scripts/webkitdirs.pm:

(visualStudioInstallDir):
Get rid of the VSINSTALLDIR check. We can't build on anything besides VS2013 now anyways.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2013-12-19  Roger Fong  <roger_fong@apple.com>
+
+        Don't check VSINSTALLDIR when looking for Visual Studio install directory.
+        https://bugs.webkit.org/show_bug.cgi?id=125998.
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitdirs.pm:
+        (visualStudioInstallDir):
+        Get rid of the VSINSTALLDIR check. We can't build on anything besides VS2013 now anyways.
+
 2013-12-19  Mario Sanchez Prada  <mario.prada@samsung.com>
 

trunk/Tools/Scripts/webkitdirs.pm

@@ -433 +433 @@
     return $vsInstallDir if defined $vsInstallDir;
 
-    if ($ENV{'VSINSTALLDIR'}) {
-        $vsInstallDir = $ENV{'VSINSTALLDIR'};
-        $vsInstallDir =~ s|[\\/]$||;
-    } else {
-        $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 12.0");
-    }
+    $vsInstallDir = File::Spec->catdir(programFilesPath(), "Microsoft Visual Studio 12.0");
+
     chomp($vsInstallDir = `cygpath "$vsInstallDir"`) if isCygwin();