Title: [161215] trunk/Tools
- Revision
- 161215
- Author
- [email protected]
- Date
- 2014-01-02 12:03:36 -0800 (Thu, 02 Jan 2014)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (161214 => 161215)
--- trunk/Tools/ChangeLog 2014-01-02 19:45:58 UTC (rev 161214)
+++ trunk/Tools/ChangeLog 2014-01-02 20:03:36 UTC (rev 161215)
@@ -1,3 +1,15 @@
+2014-01-02 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[GTK] [CMake] run-gtk-tests should run with the cmake build
Modified: trunk/Tools/Scripts/webkitdirs.pm (161214 => 161215)
--- trunk/Tools/Scripts/webkitdirs.pm 2014-01-02 19:45:58 UTC (rev 161214)
+++ trunk/Tools/Scripts/webkitdirs.pm 2014-01-02 20:03:36 UTC (rev 161215)
@@ -432,8 +432,12 @@
{
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();
return $vsInstallDir;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
