Attachment #258186 for bug #147636

View Details Raw Unified Return to Bug 147636



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.



            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();

Return to Bug 147636

Lines 273-285 for my $dir (@projects) { Tools/Scripts/build-webkit_sec1
- Tools/Scripts/build-webkit -7 lines
273	my $webkitSolutionPath = "Source/WebKit/WebKit.vcxproj/WebKit.sln";	273	my $webkitSolutionPath = "Source/WebKit/WebKit.vcxproj/WebKit.sln";
274	$result = buildVisualStudioProject($webkitSolutionPath, $clean);	274	$result = buildVisualStudioProject($webkitSolutionPath, $clean);
275	}	275	}
276	if (usingVisualStudioExpress()) {
277	# Visual Studio Express is so lame it can't stdout build failures.
278	# So we find its logs and dump them to the console ourselves.
279	my $vsConfiguration = configuration();
280	open(my $OUTPUT_HANDLE, '<', "$baseProductDir/$vsConfiguration/BuildOutput.htm") or die "Could not open build log file at $baseProductDir/$vsConfiguration/BuildOutput.htm";
281	print while (<$OUTPUT_HANDLE>);
282	}
283	}	276	}
284	# Various build* calls above may change the CWD.	277	# Various build* calls above may change the CWD.
285	chdirWebKit();	278	chdirWebKit();

Lines 1-3 Tools/ChangeLog_sec1
- Tools/ChangeLog +13 lines
		1	2015-08-04 Brent Fulgham <bfulgham@apple.com>
		2
		3	[Win] build-webkit and MSBuild fight over BuildOutput.htm, causing build failures.
		4	https://bugs.webkit.org/show_bug.cgi?id=147636
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	We no longer need build-webkit to manually troll the log data and pipe it to stdout; MSBuild is already doing this properly.
		9	Stop the build-webkit script from interacting with BuildOutput.htm, thereby preventing a potential build failure (especially
		10	on EWS machines)
		11
		12	* Scripts/build-webkit:
		13
1	2015-08-04 Mark Lam <mark.lam@apple.com>	14	2015-08-04 Mark Lam <mark.lam@apple.com>
2		15
3	Unreviewed. Make Saam Barati a WebKit reviewer.	16	Unreviewed. Make Saam Barati a WebKit reviewer.