Attachment 258186 Details for Bug 147636 – Patch

[patch] Patch

bug-147636-20150804112025.patch (text/plain), 1.81 KB, created by Brent Fulgham on 2015-08-04 11:20:32 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Brent Fulgham

Created: 2015-08-04 11:20:32 PDT

Size: 1.81 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 187867)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,16 @@
>+2015-08-04  Brent Fulgham  <bfulgham@apple.com>
>+
>+        [Win] build-webkit and MSBuild fight over BuildOutput.htm, causing build failures.
>+        https://bugs.webkit.org/show_bug.cgi?id=147636
>+
>+        Reviewed by NOBODY (OOPS!).
>+        
>+        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  Mark Lam  <mark.lam@apple.com>
> 
>         Unreviewed. Make Saam Barati a WebKit reviewer.
>Index: Tools/Scripts/build-webkit
>===================================================================
>--- Tools/Scripts/build-webkit	(revision 187744)
>+++ Tools/Scripts/build-webkit	(working copy)
>@@ -273,13 +273,6 @@ for my $dir (@projects) {
>             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();

Actions: View | Formatted Diff | Diff

Attachments on bug 147636: 258186