Title: [151063] trunk/Tools
- Revision
- 151063
- Author
- [email protected]
- Date
- 2013-05-31 20:04:24 -0700 (Fri, 31 May 2013)
Log Message
Unreviewed. Windows build fix.
* Scripts/build-webkit:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (151062 => 151063)
--- trunk/Tools/ChangeLog 2013-06-01 02:59:08 UTC (rev 151062)
+++ trunk/Tools/ChangeLog 2013-06-01 03:04:24 UTC (rev 151063)
@@ -6,6 +6,12 @@
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 (151062 => 151063)
--- trunk/Tools/Scripts/build-webkit 2013-06-01 02:59:08 UTC (rev 151062)
+++ trunk/Tools/Scripts/build-webkit 2013-06-01 03:04:24 UTC (rev 151063)
@@ -326,6 +326,7 @@
}
my $project = basename($dir);
+ my $baseProductDir = baseProductDir();
if (isGtk()) {
$result = buildGtkProject($project, $clean, $prefixPath, $makeArgs, $noWebKit1, $noWebKit2, @features);
} elsif (isAppleMacWebKit()) {
@@ -342,20 +343,18 @@
$webkitSolutionPath = "win/WebKit.vcproj/WebKit.sln";
}
$result = buildVisualStudioProject($webkitSolutionPath, $clean);
+ 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/$vsConfiguration/BuildOutput.htm") or die "Could not open build log file at $baseProductDir/$vsConfiguration/BuildOutput.htm";
+ print while (<$OUTPUT_HANDLE>);
+ }
}
}
# Various build* calls above may change the CWD.
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/$vsConfiguration/BuildOutput.htm") or die "Could not open build log file at $baseProductDir/$vsConfiguration/BuildOutput.htm";
- print while (<$OUTPUT_HANDLE>);
- }
-
if (exitStatus($result)) {
my $scriptDir = relativeScriptsDir();
if (isAppleWinWebKit()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
