From de33f51b49dc6d01a285aa73990f03e7d982beb2 Mon Sep 17 00:00:00 2001 From: Peter Oberparleiter Date: Mon, 5 Oct 2015 17:37:40 +0200 Subject: [PATCH] lcov: Finalize release 1.12 - Use full git describe output as tool version - Update version numbers and last-changed-dates in man pages, spec and README file - Replace static CHANGES file with git log - Switch Makefile logic to use mktemp for generating a temporary directory Signed-off-by: Peter Oberparleiter --- CHANGES | 551 ------------------------------------------- Makefile | 31 +-- README | 2 +- bin/gendesc | 2 +- bin/genhtml | 2 +- bin/geninfo | 2 +- bin/genpng | 2 +- bin/get_changes.sh | 13 + bin/get_version.sh | 13 +- bin/lcov | 2 +- bin/updateversion.pl | 6 +- man/gendesc.1 | 2 +- man/genhtml.1 | 2 +- man/geninfo.1 | 2 +- man/genpng.1 | 2 +- man/lcov.1 | 2 +- man/lcovrc.5 | 2 +- rpm/lcov.spec | 2 +- 18 files changed, 54 insertions(+), 586 deletions(-) delete mode 100644 CHANGES create mode 100755 bin/get_changes.sh diff --git a/CHANGES b/CHANGES deleted file mode 100644 index 2b1ae8ce..00000000 --- a/CHANGES +++ /dev/null @@ -1,551 +0,0 @@ -Version 1.11 -============ - -genhtml: -- Added current time to date information in HTML output. Based on patch by - sylvestre@debian.org -- Improved --demanglecpp performance. Based on suggestion by olly@survex.com -- Improved memory usage when combining files. Based on patch by olly@survex.com -- Changed initial function table sorting order to execution counts. Based on - suggestion by paul.bignier@hotmail.fr -- Fixed incorrect function execution counts when using --demanglecpp on - functions that demange to the same name -- Fixed handling of prefix with trailing /. Reported by ahmed_osman@mentor.com -- Fixed "use of uninitialized value" warning when processing incorrect - test description files. Reported by lbalbalba@gmail.com -- Fixed reordering of unnamed branch blocks during coverage data merging. - Contributed by jhutz@cmu.edu - -geninfo: -- Added exclusion markers for branch coverage. Contributed by s_stigler@gmx.de -- Added toleration support for .gcno files with trailing garbage. Reported by - christophe.guillon@st.com -- Fixed parsing of gcc 4.7 gcov format. Reported by fa.soft@gmx.net -- Fixed geninfo aborting on empty data directories. Based on suggestion by - rich_drake@yahoo.com -- Fixed "no data found" warning when using lcov with gcc 4.7 -- Fixed --no-external not working with --initial. Reported by - malcolm.parsons@gmail.com -- Fixed handling of non-english locales. Reported by s_stigler@gmx.de -- Fixed gcov tool version detection for gcov versions containing additional - versions in parenthesis. - -lcov: -- Added compatibility support with LLVM's gcov (NOT llvm-cov). Contributed by - jonah@petri.us -- Improved memory usage when combining files. Contributed by olly@survex.com -- Fixed lcov aborting when using --diff on a patch file that changes the list - of functions. Reported by Nasir.Amanullah@us.fujitsu.com -- Fixed whitespace handling in --rc options -- Fixed --config-file not being passed to geninfo. Reported by - liuyhlinux@gmail.com -- Fixed missing description for command line parameter value in man page. - Reported by sylvestre@mozilla.com -- Fixed reordering of unnamed branch blocks during coverage data merging. - Contributed by jhutz@cmu.edu - -lcov.spec: -- Fixed Perl dependency statement - -lcovrc: -- Added config file setting 'genhtml_desc_html' to allow using HTML markup in - test case description text - -CONTRIBUTING: -- Added contribution guidelines - -README: -- Improved note on lcov usage - - -Version 1.10 -============ - -All: -- Disabled branch coverage processing per default to improve processing - performance (can be re-enabled using a config file setting) -- Added option --rc to override config file settings from the command line -- Added option --config-file to override the config file location -- Fixed handling of '<' in filenames - -genhtml: -- Added option --ignore-errors to continue after errors -- Added man page note to further explain branch coverage output -- Fixed man page description of default coverage rates -- Fixed HTML page title for directory pages -- Fixed handling of special characters in file and directory names -- Fixed directory prefix calculation -- Fixed warning when source files are found in root directory - -geninfo: -- Added options --external and --no-external to include/exclude external - source files such as standard libary headers -- Added option --compat to specify compatibility modes -- Added missing man page sections for --derive-func-data and --no-markers -- Added support for MinGW output on MSYS. From martin.hopfeld@sse-erfurt.de -- Added support for gcc 4.7 .gcno file format. Based on patch by - berrange@redhat.com -- Added auto-detection of gcc-4.7 function record format. Includes - suggestions by garnold@google.com -- Fixed exclusion markers for --derive-func-data. Reported by bettse@gmail.com -- Fixed processing of pre-3.3 gcov files. Reported by georgysebastian@gmail.com -- Fixed handling of '.gcov' files -- Fixed warning about unhandled .gcov files -- Improved --debug output -- Removed help text for obsolete parameter --function-coverage - -genpng: -- Fixed handling of empty source files. Reported by: sylvestre@debian.org - -lcov: -- Added options --external and --no-external to include/exclude external source - files such as standard libary headers -- Added option --summary to show summary coverage information -- Added option --compat to specify compatibility modes -- Fixed missing Perl version dependency in RPM spec file. Reported by - Martin Hopfeld -- Fixed geninfo not recognizing Objective-C functions. Based on patch - by abrahamh@web.de -- Fixed option --no-recursion not being passed to geninfo -- Fixed capitalization of the term 'Perl' -- Improved coverage rate calculation to only show 0%/100% when no/full coverage - is achieved. Based on suggestions by Paul.Zimmermann@loria.fr and - vincent@vinc17.net - -lcovrc: -- Added description for geninfo_compat setting -- Added config file setting 'genhtml_charset' to specify HTML charset -- Added config file setting 'geninfo_external' to include/exclude external - source files such as standard libary headers -- Added config file setting 'geninfo_gcov_all_blocks' to modify lcov's use - of gcov's -a option -- Added config file setting 'geninfo_compat' to specify compatibility modes -- Added config file setting 'geninfo_adjust_src_path' to enabled source path - adjustments. Inspired by patch by ammon.riley@gmail.com -- Added config file setting 'geninfo_auto_base' to automatically determine - the base directory when collecting coverage data -- Added config file setting 'lcov_function_coverage' to enable/disable - function coverage processing -- Added config file setting 'lcov_branch_coverage' to enable/disable - branch coverage processing - - -Version 1.9 -=========== - -genhtml: -- Improved wording for branch representation tooltip text -- Fixed vertical alignment of HTML branch representation - -geninfo: -- Improved warning message about --initial not generating branch coverage data -- Debugging messages are now printed to STDERR instead of STDOUT -- Fixed problem with some .gcno files. Reported by gui@futarque.com. - (file.gcno: reached unexpected end of file) -- Fixed problem with relative build paths. Reported by zhanbiao2000@gmail.com. - (cannot find an entry for ^#src#test.c.gcov in .gcno file, skipping file!) -- Fixed problem where coverage data is missing for some files. Reported by - weston_schmidt@open-roadster.com -- Fixed problem where exclusion markers are ignored when gathering - initial coverage data. Reported by ahmed_osman@mentor.com. -- Fixed large execution counts showing as negative numbers in HTML output. - Reported by kkyriako@yahoo.com. -- Fixed problem that incorrectly associated branches outside of a block with - branches inside the first block - -lcov: -- Fixed problem that made lcov ignore --kernel-directory parameters when - specifying --initial. Reported by hjia@redhat.com. -- Added --list-full-path option to prevent lcov from truncating paths in list - output -- Added lcov_list_width and lcov_list_truncate_max directives to the - lcov configuration file to allow for list output customization -- Improved list output - -COPYING: -- Added license text to better comply with GPL recommendations - - -Version 1.8 -=========== - -gendesc: -- Fixed problem with single word descriptions - -genhtml: -- Added support for branch coverage measurements -- Added --demangle-cpp option to convert C++ function names to human readable - format. Based on a patch by slava.semushin@gmail.com. -- Improved color legend: legend display takes up less space in HTML output -- Improved coverage rate limits: all coverage types use the same limits - unless specified otherwise -- Fixed CRLF line breaks in source code when generating html output. Based - on patch by michael.knigge@set-software.de. -- Fixed warning when $HOME is not set -- Fixed problem with --baseline-file option. Reported by sixarm@gmail.com. - (Undefined subroutine &main::add_fnccounts called at genhtml line 4560.) -- Fixed problem with --baseline-file option and files without function - coverage data (Can't use an undefined value as a HASH reference at genhtml - line 4441.) -- Fixed short-name option ambiguities -- Fixed --highlight option not showing line data from converted test data -- Fixed warnings about undefined value used. Reported by nikita@zhuk.fi. -- Fixed error when processing tracefiles without function data. Reported - by richard.corden@gmail.com (Can't use an undefined value as a HASH - reference at genhtml line 1506.) - -geninfo: -- Added support for branch coverage measurements -- Added support for exclusion markers: Users can exclude lines of code from - coverage reports by adding keywords to the source code. -- Added --derive-func-data option -- Added --debug option to better debug problems with graph files -- Fixed CRLF line breaks in source code when generating tracefiles. Based on - patch by michael.knigge@set-software.de. -- Fixed problems with unnamed source files -- Fixed warning when $HOME is not set. Reported by acalando@free.fr. -- Fixed errors when processing unnamed source files -- Fixed help text typo -- Fixed errors when processing incomplete function names in .bb files -- Fixed filename prefix detection -- Fixed problem with matching filename -- Fixed problem when LANG is set to non-English locale. Reported by - benoit_belbezet@yahoo.fr. -- Fixed short-name option ambiguities - -genpng: -- Fixed runtime-warning - -lcov: -- Added support for branch coverage measurements -- Added support for the linux-2.6.31 upstream gcov kernel support -- Added --from-package and --to-package options -- Added --derive-func-data option -- Added overall coverage result output for more operations -- Improved output of lcov --list -- Improved gcov-kernel handling -- Fixed minor problem with --diff -- Fixed double-counting of function data -- Fixed warning when $HOME is not set. Reported by acalando@free.fr. -- Fixed error when combining tracefiles without function data. Reported by - richard.corden@gmail.com. (Can't use an undefined value as a HASH reference - at lcov line 1341.) -- Fixed help text typo -- Fixed filename prefix detection -- Fixed lcov ignoring information about converted test data - -README: -- Added note to mention required -lgcov switch during linking - - -Version 1.7: -============ - -gendesc: -- Updated error and warning messages -- Updated man page - -genhtml: -- Added function coverage data display patch by tomzo@nefkom.net (default is on) -- Added --function-coverage to enable function coverage display -- Added --no-function-coverage to disable function coverage display -- Added sorting option in HTLM output (default is on) -- Added --sort to enable sorting -- Added --no-sort to disable sorting -- Added --html-gzip to create gzip-compressed HTML output (patch by - dnozay@vmware.com) -- Fixed problem when using --baseline-file on coverage data files that - contain data for files not found in the baseline file -- Updated error and warning messages -- Updated man page - -geninfo: -- Added function coverage data collection patch by tomzo@nefkom.net -- Added more verbose output when a "ERROR: reading string" error occurs - (patch by scott.heavner@philips.com) -- Fixed geninfo not working with directory names containing spaces (reported - by jeffconnelly@users.sourceforge.net) -- Fixed "ERROR: reading string" problem with gcc 4.1 -- Fixed problem with function names that contain non-alphanumerical characters -- Fixed problem with gcc versions before 3.3 -- Updated error and warning messages -- Updated man page - -genpng: -- Updated error and warning messages -- Updated man page - -lcov: -- Added support for function coverage data for adding/diffing tracefiles -- Added --no-recursion option to disable recursion into sub-directories - while scanning for gcov data files -- Fixed lcov -z not working with directory names containing spaces (reported - by Jeff Connelly) -- Updated error and warning messages -- Updated man page - -lcov.spec: -- Updated of description and title information - -lcovrc: -- Added genhtml_function_hi_limit -- Added genhtml_function_med_limit -- Added genhtml_function_coverage -- Added genhtml_sort -- Updated man page - -Makefile: -- Updated info text - - -Version 1.6: -============ - -geninfo: -- Added libtool compatibility patch by thomas@apestaart.org (default is on) -- Added --compat-libtool option to enable libtool compatibility mode -- Added --no-compat-libtool option to disable libtool compatibility mode -- Changed default for line checksumming to off -- Added --checksum option to enable line checksumming -- Added --gcov-tool option -- Added --ignore-errors option -- Added --initial option to generate zero coverage from graph files -- Removed automatic test name modification on s390 -- Added --checksum option -- Updated man page - -lcov: -- Added libtool compatibility patch by thomas@apestaart.org -- Added --compat-libtool option to enable libtool compatibility mode -- Added --no-compat-libtool option to disable libtool compatibility mode -- Added --checksum option to enable line checksumming -- Added --gcov-tool option -- Added --ignore-errors option -- Added --initial option to generate zero coverage from graph files -- Updated help text -- Updated man page -- Fixed lcov not working when -k is specified more than once -- Fixed lcov not deleting .gcda files when specifying -z and -d - -lcovrc: -- Added geninfo_compat_libtool option -- Added geninfo_checksum option -- Removed geninfo_no_checksum option from example lcovrc -- Updated man page - -README: -- Added description of lcovrc file - - -Version 1.5: -============ - -genhtml: -- Added check for invalid characters in test names -- Added --legend option -- Added --html-prolog option -- Added --html-epilog option -- Added --html-extension option -- Added warning when specifying --no-prefix and --prefix -- Reworked help text to make it more readable - -geninfo: -- Renamed 'sles9' compatibility mode to 'hammer' compatibility mode -- Added support for mandrake gcc 3.3.2 -- Fixed bbg file reading in hammer compatibility mode -- Added check for invalid characters in test names -- Added --base-directory option - -lcov: -- Added check for invalid characters in test names -- Added --base-directory option - - -Version 1.4: -============ - -All: -- Added configuration file support - -genhtml: -- Fixed help text message -- Fixed handling of special characters in file- and directory names -- Added description of --css-file option to man page - -geninfo: -- Added support for GCOV file format as used by GCC 3.3.3 on SUSE SLES9 -- Fixed error text message -- Added check to abort processing if no source code file is available -- Added workaround for a problem where geninfo could not find source code - files for a C++ project -- Fixed 'branch'-statement parsing for GCC>=3.3 .gcov files -- Fixed exec count-statement parsing for GCC>=3.3 .gcov files -- Fixed .gcno-file parser (some lines were not counted as being instrumented) - -lcov: -- Modified path for temporary files from '.' to '/tmp' -- Fixed comments -- Removed unused function 'escape_shell' - -lcovrc: -- Introduced sample configuration file - -Makefile: -- Added rule to install configuration file -- Fixed installation path for man pages - - -Version 1.3: -============ - -All: -- Added compatibility for gcc-3.4 - -lcov: -- Modified --diff function to better cope with ambiguous entries in patch files -- Modified --capture option to use modprobe before insmod (needed for 2.6) -- Added --path option required for --diff function - - -Version 1.2: -============ - -All: -- Added compatibility for gcc-3.3 -- Adjusted LCOV-URL (http://ltp.sourceforge.net/coverage/lcov.php) -- Minor changes to whitespaces/line breaks/spelling -- Modified call mechanism so that parameters for external commands are not - parsed by the shell mechanism anymore (no more problems with special - characters in paths/filenames) -- Added checksumming mechanism: each tracefile now contains a checksum for - each instrumented line to detect incompatible data - -Makefile: -- Added rule to build source RPM -- Changed install path for executables (/usr/local/bin -> /usr/bin) - -lcov.spec: -- Modified to support building source rpms - -updateversion.pl: -- Modified to include update of release number in spec file - -genhtml: -- Fixed bug which would not correctly associate data sets with an empty - test name (only necessary when using --show-details in genhtml) -- Implemented new command line option '--nochecksum' to suppress generation - of checksums -- Implemented new command line option '--highlight' which highlights lines of - code which were only covered in converted tracefiles (see '--diff' option of - lcov) - -geninfo: -- Added workaround for a bug in gcov shipped with gcc-3.2 which aborts when - encountering empty .da files -- Fixed geninfo so that it does not abort after encountering empty .bb files -- Added function to collect branch coverage data -- Added check for gcov tool -- Added check for the '--preserve-paths' option of gcov; if available, this - will prevent losing .gcov files in some special cases (include files with - same name in different subdirectories) -- Implemented new command line option '--follow' to control whether or not - links should be followed while searching for .da files. -- Implemented new command line option '--nochecksum' to suppress generation - of checksums - -lcov: -- Fixed bug which would not correctly associate data sets with an empty - test name (only necessary when using --show-details in genhtml) -- Cleaned up internal command line option check -- Files are now processed in alphabetical order -- Added message when reading tracefiles -- Implemented new command line option '--nochecksum' to suppress generation - of checksums -- Implemented new command line option '--diff' which allows converting - coverage data from an older source code version by using a diff file - to map line numbers -- Implemented new command line option '--follow' to control whether or not - links should be followed while searching for .da files. - -genpng: -- Added support for the highlighting option of genhtml -- Corrected tab to spaces conversion -- Modified genpng to take number of spaces to use in place of tab as input - instead of replacement string - - -Version 1.1: -============ - -- Added CHANGES file -- Added Makefile implementing the following targets: - * install : install LCOV scripts and man pages - * uninstall : revert previous installation - * dist : create lcov.tar.gz file and lcov.rpm file - * clean : clean up example directory, remove .tar and .rpm files -- Added man pages for all scripts -- Added example program to demonstrate the use of LCOV with a userspace - application -- Implemented RPM build process -- New directory structure: - * bin : contains all executables - * example : contains a userspace example for LCOV - * man : contains man pages - * rpm : contains files required for the RPM build process -- LCOV-scripts are now in bin/ -- Removed .pl-extension from LCOV-script files -- Renamed readme.txt to README - -README: -- Adjusted mailing list address to ltp-coverage@lists.sourceforge.net -- Fixed incorrect parameter '--output-filename' in example LCOV call -- Removed tool descriptions and turned them into man pages -- Installation instructions now refer to RPM and tarball - -descriptions.tests: -- Fixed some spelling errors - -genhtml: -- Fixed bug which resulted in an error when trying to combine .info files - containing data without a test name -- Fixed bug which would not correctly handle data files in directories - with names containing some special characters ('+', etc.) -- Added check for empty tracefiles to prevent division-by-zeros -- Implemented new command line option --num-spaces / the number of spaces - which replace a tab in source code view is now user defined -- Fixed tab expansion so that in source code view, a tab doesn't produce a - fixed number of spaces, but as many spaces as are needed to advance to the - next tab position -- Output directory is now created if it doesn't exist -- Renamed "overview page" to "directory view page" -- HTML output pages are now titled "LCOV" instead of "GCOV" -- Information messages are now printed to STDERR instead of STDOUT - -geninfo: -- Fixed bug which would not allow .info files to be generated in directories - with names containing some special characters -- Information messages are now printed to STDERR instead of STDOUT - -lcov: -- Fixed bug which would cause lcov to fail when the tool is installed in - a path with a name containing some special characters -- Implemented new command line option '--add-tracefile' which allows the - combination of data from several tracefiles -- Implemented new command line option '--list' which lists the contents - of a tracefile -- Implemented new command line option '--extract' which allows extracting - data for a particular set of files from a tracefile -- Implemented new command line option '--remove' which allows removing - data for a particular set of files from a tracefile -- Renamed '--reset' to '--zerocounters' to avoid a naming ambiguity with - '--remove' -- Changed name of gcov kernel directory from /proc/gcov to a global constant - so that it may be changed easily when required in future versions -- Information messages are now printed to STDERR instead of STDOUT - - -Version 1.0 (2002-09-05): -========================= - -- Initial version - diff --git a/Makefile b/Makefile index f0b9adf0..19af0ca4 100644 --- a/Makefile +++ b/Makefile @@ -13,12 +13,13 @@ VERSION := $(shell bin/get_version.sh --version) RELEASE := $(shell bin/get_version.sh --release) +FULL := $(shell bin/get_version.sh --full) CFG_DIR := $(PREFIX)/etc BIN_DIR := $(PREFIX)/usr/bin MAN_DIR := $(PREFIX)/usr/share/man -TMP_DIR := /tmp/lcov-tmp.$(shell echo $$$$) -FILES := $(wildcard bin/*) $(wildcard man/*) README CHANGES Makefile \ +TMP_DIR := $(shell mktemp -d) +FILES := $(wildcard bin/*) $(wildcard man/*) README Makefile \ $(wildcard rpm/*) lcovrc .PHONY: all info clean install uninstall rpms @@ -49,17 +50,17 @@ install: bin/install.sh man/gendesc.1 $(MAN_DIR)/man1/gendesc.1 -m 644 bin/install.sh man/lcovrc.5 $(MAN_DIR)/man5/lcovrc.5 -m 644 bin/install.sh lcovrc $(CFG_DIR)/lcovrc -m 644 - bin/updateversion.pl $(BIN_DIR)/lcov $(VERSION) $(RELEASE) - bin/updateversion.pl $(BIN_DIR)/genhtml $(VERSION) $(RELEASE) - bin/updateversion.pl $(BIN_DIR)/geninfo $(VERSION) $(RELEASE) - bin/updateversion.pl $(BIN_DIR)/genpng $(VERSION) $(RELEASE) - bin/updateversion.pl $(BIN_DIR)/gendesc $(VERSION) $(RELEASE) - bin/updateversion.pl $(MAN_DIR)/man1/lcov.1 $(VERSION) $(RELEASE) - bin/updateversion.pl $(MAN_DIR)/man1/genhtml.1 $(VERSION) $(RELEASE) - bin/updateversion.pl $(MAN_DIR)/man1/geninfo.1 $(VERSION) $(RELEASE) - bin/updateversion.pl $(MAN_DIR)/man1/genpng.1 $(VERSION) $(RELEASE) - bin/updateversion.pl $(MAN_DIR)/man1/gendesc.1 $(VERSION) $(RELEASE) - bin/updateversion.pl $(MAN_DIR)/man5/lcovrc.5 $(VERSION) $(RELEASE) + bin/updateversion.pl $(BIN_DIR)/lcov $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(BIN_DIR)/genhtml $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(BIN_DIR)/geninfo $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(BIN_DIR)/genpng $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(BIN_DIR)/gendesc $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(MAN_DIR)/man1/lcov.1 $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(MAN_DIR)/man1/genhtml.1 $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(MAN_DIR)/man1/geninfo.1 $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(MAN_DIR)/man1/genpng.1 $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(MAN_DIR)/man1/gendesc.1 $(VERSION) $(RELEASE) $(FULL) + bin/updateversion.pl $(MAN_DIR)/man5/lcovrc.5 $(VERSION) $(RELEASE) $(FULL) uninstall: bin/install.sh --uninstall bin/lcov $(BIN_DIR)/lcov @@ -79,12 +80,12 @@ dist: lcov-$(VERSION).tar.gz lcov-$(VERSION)-$(RELEASE).noarch.rpm \ lcov-$(VERSION)-$(RELEASE).src.rpm lcov-$(VERSION).tar.gz: $(FILES) - mkdir $(TMP_DIR) mkdir $(TMP_DIR)/lcov-$(VERSION) cp -r * $(TMP_DIR)/lcov-$(VERSION) bin/copy_dates.sh . $(TMP_DIR)/lcov-$(VERSION) make -C $(TMP_DIR)/lcov-$(VERSION) clean - bin/updateversion.pl $(TMP_DIR)/lcov-$(VERSION) $(VERSION) $(RELEASE) + bin/updateversion.pl $(TMP_DIR)/lcov-$(VERSION) $(VERSION) $(RELEASE) $(FULL) + bin/get_changes.sh > $(TMP_DIR)/lcov-$(VERSION)/CHANGES cd $(TMP_DIR) ; \ tar cfz $(TMP_DIR)/lcov-$(VERSION).tar.gz lcov-$(VERSION) mv $(TMP_DIR)/lcov-$(VERSION).tar.gz . diff --git a/README b/README index 7f9d8ed0..cbc1e596 100644 --- a/README +++ b/README @@ -1,6 +1,6 @@ ------------------------------------------------- - README file for the LTP GCOV extension (LCOV) - -- Last changes: 2014-05-23 - +- Last changes: 2014-06-18 - ------------------------------------------------- Description diff --git a/bin/gendesc b/bin/gendesc index 7ba14ff5..a7651242 100755 --- a/bin/gendesc +++ b/bin/gendesc @@ -43,7 +43,7 @@ use Cwd qw/abs_path/; # Constants our $tool_dir = abs_path(dirname($0)); -our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --version`; +our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --full`; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); diff --git a/bin/genhtml b/bin/genhtml index a4dd86bb..b89b0ef5 100755 --- a/bin/genhtml +++ b/bin/genhtml @@ -75,7 +75,7 @@ use Cwd qw/abs_path/; # Global constants our $title = "LCOV - code coverage report"; our $tool_dir = abs_path(dirname($0)); -our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --version`; +our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --full`; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); diff --git a/bin/geninfo b/bin/geninfo index 96e72fbc..c6d68e18 100755 --- a/bin/geninfo +++ b/bin/geninfo @@ -63,7 +63,7 @@ if( $^O eq "msys" ) # Constants our $tool_dir = abs_path(dirname($0)); -our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --version`; +our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --full`; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $gcov_tool = "gcov"; our $tool_name = basename($0); diff --git a/bin/genpng b/bin/genpng index 9f8542c5..0ea4a062 100755 --- a/bin/genpng +++ b/bin/genpng @@ -37,7 +37,7 @@ use Cwd qw/abs_path/; # Constants our $tool_dir = abs_path(dirname($0)); -our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --version`; +our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --full`; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); diff --git a/bin/get_changes.sh b/bin/get_changes.sh new file mode 100755 index 00000000..cfa97d6b --- /dev/null +++ b/bin/get_changes.sh @@ -0,0 +1,13 @@ +#!/bin/bash +# +# Usage: get_changes.sh +# +# Print lcov change log information as provided by Git + +TOOLDIR=$(cd $(dirname $0) ; pwd) + +cd $TOOLDIR + +if ! git --no-pager log --no-merges --decorate=short --color=never 2>/dev/null ; then + cat "$TOOLDIR/../CHANGES" 2>/dev/null +fi diff --git a/bin/get_version.sh b/bin/get_version.sh index 0f2778a2..c9d70ed4 100755 --- a/bin/get_version.sh +++ b/bin/get_version.sh @@ -1,6 +1,6 @@ #!/bin/bash # -# Usage: get_version.sh --version|--release +# Usage: get_version.sh --version|--release|--full # # Print lcov version or release information as provided by Git, .version # or a fallback. @@ -15,6 +15,7 @@ if [ -z "$GITVER" ] ; then fi else # Get version information from git + FULL=${GITVER:1} VERSION=${GITVER%%-*} VERSION=${VERSION:1} if [ "${GITVER#*-}" != "$GITVER" ] ; then @@ -24,8 +25,10 @@ else fi # Fallback -[ -z "$VERSION" ] && VERSION=1.0 -[ -z "$RELEASE" ] && RELEASE=1 +[ -z "$VERSION" ] && VERSION="1.0" +[ -z "$RELEASE" ] && RELEASE="1" +[ -z "$FULL" ] && FULL="$VERSION" -[ "$1" == "--version" ] && echo -n $VERSION -[ "$1" == "--release" ] && echo -n $RELEASE +[ "$1" == "--version" ] && echo -n "$VERSION" +[ "$1" == "--release" ] && echo -n "$RELEASE" +[ "$1" == "--full" ] && echo -n "$FULL" diff --git a/bin/lcov b/bin/lcov index 5225c9fc..abcf3d87 100755 --- a/bin/lcov +++ b/bin/lcov @@ -72,7 +72,7 @@ use Cwd qw /abs_path getcwd/; # Global constants our $tool_dir = abs_path(dirname($0)); -our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --version`; +our $lcov_version = 'LCOV version '.`$tool_dir/get_version.sh --full`; our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php"; our $tool_name = basename($0); diff --git a/bin/updateversion.pl b/bin/updateversion.pl index 4b884d3a..6c83181a 100755 --- a/bin/updateversion.pl +++ b/bin/updateversion.pl @@ -14,6 +14,7 @@ our $directory = $ARGV[0]; our $version = $ARGV[1]; our $release = $ARGV[2]; +our $full = $ARGV[3]; our @man_pages = ("man/gendesc.1", "man/genhtml.1", "man/geninfo.1", "man/genpng.1", "man/lcov.1", "man/lcovrc.5"); @@ -23,7 +24,7 @@ our @spec_files = ("rpm/lcov.spec"); if (!defined($directory) || !defined($version) || !defined($release)) { - die("Usage: $0 DIRECTORY|FILE VERSION RELEASE\n"); + die("Usage: $0 DIRECTORY|FILE VERSION RELEASE FULL_VERSION\n"); } # Determine mode of operation @@ -127,7 +128,7 @@ ($) open(OUT, ">$filename.new") || die("Error: cannot create $filename.new\n"); while () { - s/^(our\s+\$lcov_version\s*=).*$/$1 "LCOV version $version";/g; + s/^(our\s+\$lcov_version\s*=).*$/$1 "LCOV version $full";/g; print(OUT $_); } close(OUT); @@ -187,5 +188,6 @@ ($) open($fd, ">", $filename) or die("Error: cannot write $filename: $!\n"); print($fd "VERSION=$version\n"); print($fd "RELEASE=$release\n"); + print($fd "FULL=$full\n"); close($fd); } diff --git a/man/gendesc.1 b/man/gendesc.1 index 9be5132c..1722adc4 100644 --- a/man/gendesc.1 +++ b/man/gendesc.1 @@ -1,4 +1,4 @@ -.TH gendesc 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" +.TH gendesc 1 "LCOV 1.12" 2014\-06\-10 "User Manuals" .SH NAME gendesc \- Generate a test case description file .SH SYNOPSIS diff --git a/man/genhtml.1 b/man/genhtml.1 index 3267b352..07d3286b 100644 --- a/man/genhtml.1 +++ b/man/genhtml.1 @@ -1,4 +1,4 @@ -.TH genhtml 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" +.TH genhtml 1 "LCOV 1.12" 2014\-09\-26 "User Manuals" .SH NAME genhtml \- Generate HTML view from LCOV coverage data files .SH SYNOPSIS diff --git a/man/geninfo.1 b/man/geninfo.1 index 2d9024f9..cef924c2 100644 --- a/man/geninfo.1 +++ b/man/geninfo.1 @@ -1,4 +1,4 @@ -.TH geninfo 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" +.TH geninfo 1 "LCOV 1.12" 2015\-04\-22 "User Manuals" .SH NAME geninfo \- Generate tracefiles from .da files .SH SYNOPSIS diff --git a/man/genpng.1 b/man/genpng.1 index e5c412af..c1a4e331 100644 --- a/man/genpng.1 +++ b/man/genpng.1 @@ -1,4 +1,4 @@ -.TH genpng 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" +.TH genpng 1 "LCOV 1.12" 2014\-06\-10 "User Manuals" .SH NAME genpng \- Generate an overview image from a source file .SH SYNOPSIS diff --git a/man/lcov.1 b/man/lcov.1 index 16d01de5..9e7ebe7f 100644 --- a/man/lcov.1 +++ b/man/lcov.1 @@ -1,4 +1,4 @@ -.TH lcov 1 "LCOV 1.11" 2014\-05\-23 "User Manuals" +.TH lcov 1 "LCOV 1.12" 2014\-06\-10 "User Manuals" .SH NAME lcov \- a graphical GCOV front\-end .SH SYNOPSIS diff --git a/man/lcovrc.5 b/man/lcovrc.5 index fc8679d8..84a3a864 100644 --- a/man/lcovrc.5 +++ b/man/lcovrc.5 @@ -1,4 +1,4 @@ -.TH lcovrc 5 "LCOV 1.11" 2014\-05\-23 "User Manuals" +.TH lcovrc 5 "LCOV 1.12" 2015\-04\-22 "User Manuals" .SH NAME lcovrc \- lcov configuration file diff --git a/rpm/lcov.spec b/rpm/lcov.spec index 31775205..16578603 100644 --- a/rpm/lcov.spec +++ b/rpm/lcov.spec @@ -1,6 +1,6 @@ Summary: A graphical GCOV front-end Name: lcov -Version: 1.11 +Version: 1.12 Release: 1 License: GPL Group: Development/Tools