From: Reuben Thomas Date: Wed, 29 Sep 2010 20:56:27 +0000 (+0100) Subject: More pmccabe fixes. X-Git-Tag: v0.1~3642 X-Git-Url: http://erislabs.net/gitweb/?p=gnulib.git;a=commitdiff_plain;h=6359858989e4e543aba52b4c59cb4162d7912883 More pmccabe fixes. Signed-off-by: Simon Josefsson --- diff --git a/ChangeLog b/ChangeLog index 9db01e131..33a43048d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -869,6 +869,17 @@ * lib/sys_socket.in.h: Update an URL. * lib/sys_stat.in.h: Break long line. +2010-10-03 Reuben Thomas + + Improve pmccabe2html. + * build-aux/pmccabe2html: Add CYCLO_SRCS variable, and make + cyclo-$(PACKAGE).html depend on it, so the HTML file is remade + when the sources change. Remove the line in the HTML about "Used + ranges" (which implied that there might be other unused ranges), + rename "Resume" to "Summary" (easier to understand for more users). + * build-aux/pmccabe.css: Removing the dashed dividers, some unused + styles, and some unnecessary blank lines. + 2010-10-03 Bruno Haible Joachim Schmitz (tiny change) diff --git a/build-aux/pmccabe.css b/build-aux/pmccabe.css index 2d94c91c7..b78bc1008 100644 --- a/build-aux/pmccabe.css +++ b/build-aux/pmccabe.css @@ -1,56 +1,41 @@ body { - font-family: Helvetica, sans-serif; - } .page_title { - font: 18pt Georgia, serif; -/* font-size: 1.5em; - font-weight: bold; */ color: darkred; - border-bottom: 2px solid darkred; } .section_title { - font: 14pt Georgia, serif; color: darkred; - border-bottom: 2px dashed darkred; } .report_timestamp { - color: darkred; font-weight: bold; - } .function_src { - text-align: left; background: white; } .resume_table { - } .resume_header_entry { - color: black; } .resume_number_entry { - color: darkred; font-weight: bold; text-align: right; } .ranges_table { - border-spacing: 0px; border-bottom: solid 2px black; border-top: solid 2px black; @@ -59,7 +44,6 @@ body { } .ranges_header_entry { - padding: 5px; border-bottom: solid 1px black; font-size: 1em; @@ -69,36 +53,26 @@ body { } .ranges_entry { - } .ranges_entry_simple { - background: #87ff75; - } .ranges_entry_moderate { - background: #fffc60; - } .ranges_entry_high { - background: #ff5a5d; - } .ranges_entry_untestable { - background: #993300 - } .function_table { - border-spacing: 0px; border-bottom: solid 2px black; border-top: solid 2px black; @@ -107,7 +81,6 @@ body { } .function_table_caption { - font-size: 1.1em; font-weight: bold; color: black; @@ -115,12 +88,10 @@ body { } .function_table_header { - } .function_table_header_entry { - padding: 5px; border-bottom: solid 1px black; font-size: 1em; @@ -130,38 +101,27 @@ body { } .function_entry { - - } .function_entry_simple { - background: #87ff75; - } .function_entry_moderate { - background: #fffc60; - } .function_entry_high { - background: #ff5a5d; - } .function_entry_untestable { - background: #993300 - } .function_entry_name { - font-size: 1em; text-align: left; font-weight: bold; @@ -172,7 +132,6 @@ body { } .function_entry_cyclo { - font-size: 1em; text-align: right; text-valign: top; @@ -182,7 +141,6 @@ body { } .function_entry_number { - font-size: 1em; text-align: right; text-valign: top; @@ -192,7 +150,6 @@ body { } .function_entry_filename { - font-size: 1em; text-align: left; text-valign: top; @@ -200,28 +157,3 @@ body { border-top: solid 1px black; padding: 3px; } - -.sidemenu { - - border: 1px black solid; - padding: 5px; - -} - -.sidemenuheader { - - color: darkred; - font-size: 1.1em; - font-weight: bold; - border-bottom: 1px dashed darkred; -} - -.sidemenuentry { - - -} - -.menu { - -} - diff --git a/build-aux/pmccabe2html b/build-aux/pmccabe2html index 28117af24..330b64754 100644 --- a/build-aux/pmccabe2html +++ b/build-aux/pmccabe2html @@ -21,8 +21,10 @@ # Typical Invocation is from a Makefile.am: # -# cyclo-$(PACKAGE).html: -# $(PMCCABE) ${top_srcdir}/src/*.[ch] \ +# CYCLO_SOURCES = ${top_srcdir}/src/*.[ch] +# +# cyclo-$(PACKAGE).html: $(CYCLO_SOURCES) +# $(PMCCABE) $(CYCLO_SOURCES) \ # | sort -nr \ # | $(AWK) -f ${top_srcdir}/build-aux/pmccabe2html \ # -v lang=html -v name="$(PACKAGE_NAME)" \ @@ -112,12 +114,12 @@ function build_stats() function html_fnc_table_complete (caption) { - html_fnc_table(caption, 1, 0, 1, 1, 1, 0, 1) + html_fnc_table(caption, 1, 1, 0, 1, 1, 0, 1) } function html_fnc_table_abbrev (caption) { - html_fnc_table(caption, 1, 0, 1, 0, 1, 0, 0) + html_fnc_table(caption, 1, 1, 0, 0, 1, 0, 0) } @@ -435,52 +437,51 @@ function html_fnc (nfun, function html_global_stats () { - print "
Resume
" + print "
Summary
" - print "
" - print "" + print "
" # Total number of functions print "" - print "" - print "" print "" # Number of simple functions print "" - print "" - print "" print "" # Number of moderate functions print "" - print "" - print "" print "" # Number of high functions print "" - print "" - print "" print "" # Number of untestable functions print "" - print "" - print "" print "" @@ -491,7 +492,6 @@ function html_global_stats () function html_function_cyclo () { print "
Details for all functions
" - print "

Used ranges:

" print "
" + print "" print "Total number of functions" print "" + print "" print num_of_functions print "
" + print "" print "Number of low risk functions" print "" + print "" print num_of_simple_functions print "
" + print "" print "Number of moderate risk functions" print "" + print "" print num_of_moderate_functions print "
" + print "" print "Number of high risk functions" print "" + print "" print num_of_high_functions print "
" + print "" print "Number of untestable functions" print "" + print "" print num_of_untestable_functions print "
" print "" @@ -560,27 +560,27 @@ function html_function_cyclo () function wiki_global_stats () { - print "{| class=\"cyclo_resume_table\"" + print "{| class=\"cyclo_summary_table\"" # Total number of functions print "|-" - print "| class=\"cyclo_resume_header_entry\" | Total number of functions" - print "| class=\"cyclo_resume_number_entry\" |" num_of_functions + print "| class=\"cyclo_summary_header_entry\" | Total number of functions" + print "| class=\"cyclo_summary_number_entry\" |" num_of_functions # Number of simple functions print "|-" - print "| class=\"cyclo_resume_header_entry\" | Number of low risk functions" - print "| class=\"cyclo_resume_number_entry\" |" num_of_simple_functions + print "| class=\"cyclo_summary_header_entry\" | Number of low risk functions" + print "| class=\"cyclo_summary_number_entry\" |" num_of_simple_functions # Number of moderate functions print "|-" - print "| class=\"cyclo_resume_header_entry\" | Number of moderate risk functions" - print "| class=\"cyclo_resume_number_entry\" |" num_of_moderate_functions + print "| class=\"cyclo_summary_header_entry\" | Number of moderate risk functions" + print "| class=\"cyclo_summary_number_entry\" |" num_of_moderate_functions # Number of high functions print "|-" - print "| class=\"cyclo_resume_header_entry\" | Number of high risk functions" - print "| class=\"cyclo_resume_number_entry\" |" num_of_high_functions + print "| class=\"cyclo_summary_header_entry\" | Number of high risk functions" + print "| class=\"cyclo_summary_number_entry\" |" num_of_high_functions # Number of untestable functions print "|-" - print "| class=\"cyclo_resume_header_entry\" | Number of untestable functions" - print "| class=\"cyclo_resume_number_entry\" |" num_of_untestable_functions + print "| class=\"cyclo_summary_header_entry\" | Number of untestable functions" + print "| class=\"cyclo_summary_number_entry\" |" num_of_untestable_functions print "|}" } @@ -624,7 +624,7 @@ function wiki_function_cyclo () function wiki_fnc_table_complete (caption) { - wiki_fnc_table(caption, 1, 0, 1, 1, 1, 0, 1) + wiki_fnc_table(caption, 1, 1, 0, 1, 1, 0, 1) } function wiki_fnc_table_abbrev (caption)