Title: [151059] trunk/Tools
- Revision
- 151059
- Author
- [email protected]
- Date
- 2013-05-31 18:07:15 -0700 (Fri, 31 May 2013)
Log Message
Unreviewed. Windows build fix.
* Scripts/build-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (151058 => 151059)
--- trunk/Tools/ChangeLog 2013-06-01 00:45:41 UTC (rev 151058)
+++ trunk/Tools/ChangeLog 2013-06-01 01:07:15 UTC (rev 151059)
@@ -1,5 +1,11 @@
2013-05-31 Roger Fong <[email protected]>
+ Unreviewed. Windows build fix.
+
+ * Scripts/build-webkit:
+
+2013-05-31 Roger Fong <[email protected]>
+
Make build-webkit output VCExpress 2010 build logs properly.
https://bugs.webkit.org/show_bug.cgi?id=117096
Modified: trunk/Tools/Scripts/build-webkit (151058 => 151059)
--- trunk/Tools/Scripts/build-webkit 2013-06-01 00:45:41 UTC (rev 151058)
+++ trunk/Tools/Scripts/build-webkit 2013-06-01 01:07:15 UTC (rev 151059)
@@ -348,18 +348,12 @@
chdirWebKit();
my $baseProductDir = baseProductDir();
+ my $vsConfiguration = configurationForVisualStudio();
if (usingVisualStudioExpress()) {
# Visual Studio Express is so lame it can't stdout build failures.
# So we find its logs and dump them to the console ourselves.
-
- open(my $OUTPUT_HANDLE, '<', "$baseProductDir/BuildOutput.htm");
- if ($OUTPUT_HANDLE) {
- print while (<$OUTPUT_HANDLE>);
- close($OUTPUT_HANDLE);
- }
- else {
- print "Error: BuildOutput.htm created by AssembleBuildLogs project is missing!";
- }
+ open(my $OUTPUT_HANDLE, '<', "$baseProductDir/$vsConfiguration/BuildOutput.htm") or die "Could not open build log file at $baseProductDir/$vsConfiguration/BuildOutput.htm";
+ print while (<$OUTPUT_HANDLE>);
}
if (exitStatus($result)) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
