[Win] Provide tiered logging from MSBuild -- Errors on top, Warnings after
authorbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Mar 2015 01:39:28 +0000 (01:39 +0000)
committerbfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Mar 2015 01:39:28 +0000 (01:39 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142370

Reviewed by Dean Jackson.

* Scripts/webkitdirs.pm:
(buildVisualStudioProject): Tell MSBuild to output log files to two separate
logs, one for warnings, the other for errors.
* win/AssembleBuildLogs/AssembleLogs.cmd: Combine the error and warning logs
into the standard BuildOutput.htm document.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitdirs.pm
Tools/win/AssembleBuildLogs/AssembleLogs.cmd

index ffd1e97..9c186ad 100644 (file)
@@ -1,3 +1,16 @@
+2015-03-05  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Provide tiered logging from MSBuild -- Errors on top, Warnings after
+        https://bugs.webkit.org/show_bug.cgi?id=142370
+
+        Reviewed by Dean Jackson.
+
+        * Scripts/webkitdirs.pm:
+        (buildVisualStudioProject): Tell MSBuild to output log files to two separate
+        logs, one for warnings, the other for errors.
+        * win/AssembleBuildLogs/AssembleLogs.cmd: Combine the error and warning logs
+        into the standard BuildOutput.htm document.
+
 2015-03-05  David Kilzer  <ddkilzer@apple.com>
 
         Dashboard has trouble parsing iOS test output
index 0577d94..0681169 100755 (executable)
@@ -1687,11 +1687,15 @@ sub buildVisualStudioProject
     my $logPath = File::Spec->catdir($baseProductDir, $configuration);
     File::Path->make_path($logPath) unless -d $logPath;
 
-    my $logFile = File::Spec->catfile($logPath, "BuildOutput.htm");
-    chomp($logFile = `cygpath -w "$logFile"`) if isCygwin();
-    my $logging = "/flp:LogFile=" . $logFile . ";ErrorsOnly";
+    my $errorLogFile = File::Spec->catfile($logPath, "webkit_errors.log");
+    chomp($errorLogFile = `cygpath -w "$errorLogFile"`) if isCygwin();
+    my $errorLogging = "/flp:LogFile=" . $errorLogFile . ";ErrorsOnly";
 
-    my @command = ($vcBuildPath, "/verbosity:minimal", $project, $action, $config, $platform, "/fl", $logging);
+    my $warningLogFile = File::Spec->catfile($logPath, "webkit_warnings.log");
+    chomp($warningLogFile = `cygpath -w "$warningLogFile"`) if isCygwin();
+    my $warningLogging = "/flp1:LogFile=" . $warningLogFile . ";WarningsOnly";
+
+    my @command = ($vcBuildPath, "/verbosity:minimal", $project, $action, $config, $platform, "/fl", $errorLogging, "/fl1", $warningLogging);
 
     print join(" ", @command), "\n";
     return system @command;
index 6b6e2af..c6153b9 100755 (executable)
@@ -206,4 +206,19 @@ echo _________________________________________________________ >> "%CONFIGURATIO
 type "%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\TestWebKitAPI\BuildLog.htm" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
 
 :SkipIndividualBuilds
-echo "No individual build logs to address"
\ No newline at end of file
+
+if not exist "%CONFIGURATIONBUILDDIR%\webkit_warnings.log" GOTO SkipMSBuildFiles
+
+echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+echo Build ERRORS...                                           >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\webkit_errors.log" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+
+echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+echo Build WARNINGS...                                         >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+echo _________________________________________________________ >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+type "%CONFIGURATIONBUILDDIR%\webkit_warnings.log" >> "%CONFIGURATIONBUILDDIR%\BuildOutput.htm"
+
+:SkipIndividualBuilds
+
+echo "Completed."
\ No newline at end of file