Title: [187874] trunk/Tools
Revision
187874
Author
[email protected]
Date
2015-08-04 12:10:38 -0700 (Tue, 04 Aug 2015)

Log Message

[Win] build-webkit and MSBuild fight over BuildOutput.htm, causing build failures.
https://bugs.webkit.org/show_bug.cgi?id=147636

Reviewed by Alex Christensen.

We no longer need build-webkit to manually troll the log data and pipe it to stdout; MSBuild is already doing this properly.
Stop the build-webkit script from interacting with BuildOutput.htm, thereby preventing a potential build failure (especially
on EWS machines)

* Scripts/build-webkit:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (187873 => 187874)


--- trunk/Tools/ChangeLog	2015-08-04 19:10:14 UTC (rev 187873)
+++ trunk/Tools/ChangeLog	2015-08-04 19:10:38 UTC (rev 187874)
@@ -1,3 +1,16 @@
+2015-08-04  Brent Fulgham  <[email protected]>
+
+        [Win] build-webkit and MSBuild fight over BuildOutput.htm, causing build failures.
+        https://bugs.webkit.org/show_bug.cgi?id=147636
+
+        Reviewed by Alex Christensen.
+        
+        We no longer need build-webkit to manually troll the log data and pipe it to stdout; MSBuild is already doing this properly.
+        Stop the build-webkit script from interacting with BuildOutput.htm, thereby preventing a potential build failure (especially
+        on EWS machines)
+
+        * Scripts/build-webkit:
+
 2015-08-04  Jason Marcell  <[email protected]>
 
         Refactor to convert openSourceRevision and internalRevision properties on BuildbotIteration into a more generic collection of revisions.

Modified: trunk/Tools/Scripts/build-webkit (187873 => 187874)


--- trunk/Tools/Scripts/build-webkit	2015-08-04 19:10:14 UTC (rev 187873)
+++ trunk/Tools/Scripts/build-webkit	2015-08-04 19:10:38 UTC (rev 187874)
@@ -273,13 +273,6 @@
             my $webkitSolutionPath = "Source/WebKit/WebKit.vcxproj/WebKit.sln";
             $result = buildVisualStudioProject($webkitSolutionPath, $clean);
         }
-        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.
-            my $vsConfiguration = configuration();
-            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();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to