From e85cfd8041a0d5f019aa7b09d8deb9c17dfa5010 Mon Sep 17 00:00:00 2001 From: Henrik Nilsson Date: Tue, 12 Jan 2010 20:34:55 +0100 Subject: [PATCH 1/5] Fixed some markup errors in generated html from the cppcheck-htmlreport script. --- htmlreport/cppcheck-htmlreport | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport index 4c50ee53a..126386bbd 100755 --- a/htmlreport/cppcheck-htmlreport +++ b/htmlreport/cppcheck-htmlreport @@ -116,6 +116,9 @@ HTML_HEAD = """ CppCheck - Html report +
@@ -242,9 +245,9 @@ if __name__ == '__main__': content = stream.read() stream.close() - htmlFormatter = HtmlFormatter(linenos=True, style='colorful', full=True, hl_lines=lines, lineanchors="line") + htmlFormatter = HtmlFormatter(linenos=True, style='colorful', hl_lines=lines, lineanchors="line") stream = file(os.path.join(options.report_dir, htmlfile), "w") - stream.write(HTML_HEAD) + stream.write(HTML_HEAD % htmlFormatter.get_style_defs(".highlight")) stream.write(highlight(content, guess_lexer_for_filename(source_file, ""), htmlFormatter)) stream.write(HTML_FOOTER) stream.close() @@ -255,7 +258,7 @@ if __name__ == '__main__': # all the errors created. print("Creating index.html") stream = file(os.path.join(options.report_dir, "index.html"), "w") - stream.write(HTML_HEAD) + stream.write(HTML_HEAD % "") stream.write("") stream.write("") for filename, data in files.iteritems(): From 5240e1a8bfae52d9af2ddcb7cf4a52930cd8ad80 Mon Sep 17 00:00:00 2001 From: Henrik Nilsson Date: Tue, 12 Jan 2010 21:35:54 +0100 Subject: [PATCH 2/5] cppcheck-htmlreport now annotates the highlighted source code with the cppcheck error message. --- htmlreport/cppcheck-htmlreport | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport index 126386bbd..4701c69a4 100755 --- a/htmlreport/cppcheck-htmlreport +++ b/htmlreport/cppcheck-htmlreport @@ -156,6 +156,22 @@ HTML_FOOTER = """ """ +HTML_ERROR = "<--- %s\n" + +class AnnotateCodeFormatter(HtmlFormatter): + errors = [] + + def wrap(self, source, outfile): + line_no = 1 + for i, t in HtmlFormatter.wrap(self, source, outfile): + # If this is a source code line we want to add a span tag at the end. + if i == 1: + for error in self.errors: + if error["line"] == line_no: + t = t.replace("\n", HTML_ERROR % error["msg"]) + line_no = line_no + 1 + yield i, t + class CppCheckHandler(XmlContentHandler): """Parses the cppcheck xml file and produces a list of all its errors.""" errors = [] @@ -245,7 +261,8 @@ if __name__ == '__main__': content = stream.read() stream.close() - htmlFormatter = HtmlFormatter(linenos=True, style='colorful', hl_lines=lines, lineanchors="line") + htmlFormatter = AnnotateCodeFormatter(linenos=True, style='colorful', hl_lines=lines, lineanchors="line") + htmlFormatter.errors = errors stream = file(os.path.join(options.report_dir, htmlfile), "w") stream.write(HTML_HEAD % htmlFormatter.get_style_defs(".highlight")) stream.write(highlight(content, guess_lexer_for_filename(source_file, ""), htmlFormatter)) From c4775b7ee4bdb6a1d06e1bff4bd335507bc806e6 Mon Sep 17 00:00:00 2001 From: Henrik Nilsson Date: Wed, 13 Jan 2010 14:01:45 +0100 Subject: [PATCH 3/5] Added !DOCTYPE declaration for html generated by the cppcheck-htmlreport tool. --- htmlreport/cppcheck-htmlreport | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport index 4701c69a4..40d5a4a83 100755 --- a/htmlreport/cppcheck-htmlreport +++ b/htmlreport/cppcheck-htmlreport @@ -112,10 +112,11 @@ body.body { """ HTML_HEAD = """ + CppCheck - Html report - + From f6c24f90709d23831d55c23e74bae51b5667b700 Mon Sep 17 00:00:00 2001 From: Henrik Nilsson Date: Wed, 13 Jan 2010 14:11:54 +0100 Subject: [PATCH 4/5] cppcheck-htmlreport now takes a --title parameter that will be displayed on top of every page. --- htmlreport/cppcheck-htmlreport | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/htmlreport/cppcheck-htmlreport b/htmlreport/cppcheck-htmlreport index 40d5a4a83..a8ce04904 100755 --- a/htmlreport/cppcheck-htmlreport +++ b/htmlreport/cppcheck-htmlreport @@ -115,7 +115,7 @@ HTML_HEAD = """ - CppCheck - Html report + CppCheck - Html report - %s
LineIdSeverityMessage