Changeset 161215 in webkit

Timestamp:

Jan 2, 2014 12:03:36 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r160846.
​http://trac.webkit.org/changeset/160846
​https://bugs.webkit.org/show_bug.cgi?id=126395

Breaks build scripts for Windows when Visual Studio is not
installed in Program Files (Requested by rfong on #webkit).

• Scripts/webkitdirs.pm:

(visualStudioInstallDir):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2014-01-02  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r160846.
+        http://trac.webkit.org/changeset/160846
+        https://bugs.webkit.org/show_bug.cgi?id=126395
+
+        Breaks build scripts for Windows when Visual Studio is not
+        installed in Program Files (Requested by rfong on #webkit).
+
+        * Scripts/webkitdirs.pm:
+        (visualStudioInstallDir):
+
 2014-01-02  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/Scripts/webkitdirs.pm

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