lcov: Remove CVS artifacts

Replace CVS specifics in the build environment and tools source with
Git mechanisms:
 * CONTRIBUTING and README file now refer to github for the primary
   source location
 * When run from a Git repository, the tools dynamically determine the
   Git version using 'git describe'
 * When installed into the file system, the version information is
   fixed with the current Git version
 * When preparing distribution files, the version at the time of
   preparing the files is written to file ".version"

Also add a .gitignore file to filter out the most frequent temporary
file types.

Signed-off-by: Peter Oberparleiter <[email protected]>

Author: oberpar

.gitignore

@@ -0,0 +1,6 @@
+.version
+*.gcda
+*.gcno
+*.info
+*.tar.gz
+*.rpm

CONTRIBUTING

@@ -69,13 +69,9 @@ following command line options:
   diff -Naurp
 
 Please base your changes on the most current version of LCOV. You can use the
-following command line to obtain this version from the "utils" module of the
-LTP CVS repository (when asked for a password, simply press return):
+following command line to obtain this version from the lcov Git repository:
 
-  cvs -d:pserver:[email protected]:/cvsroot/ltp login
-  cvs -z3 -d:pserver:[email protected]:/cvsroot/ltp co -P utils
-
-You can find LCOV in sub-directory "utils/analysis/lcov".
+ git clone https://github.com/linux-test-project/lcov.git
 
 Add a meaningful description of the contribution to the top of the patch. The
 description should follow this format:

Makefile

@@ -11,8 +11,8 @@
 #   - clean:     remove all generated files
 #
 
-VERSION := 1.11
-RELEASE := 1
+VERSION := $(shell bin/get_version.sh --version)
+RELEASE := $(shell bin/get_version.sh --release)
 
 CFG_DIR := $(PREFIX)/etc
 BIN_DIR := $(PREFIX)/usr/bin
@@ -49,6 +49,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)
 
 uninstall:
 	bin/install.sh --uninstall bin/lcov $(BIN_DIR)/lcov
@@ -71,7 +82,7 @@ lcov-$(VERSION).tar.gz: $(FILES)
 	mkdir $(TMP_DIR)
 	mkdir $(TMP_DIR)/lcov-$(VERSION)
 	cp -r * $(TMP_DIR)/lcov-$(VERSION)
-	find $(TMP_DIR)/lcov-$(VERSION) -name CVS -type d | xargs rm -rf
+	bin/copy_dates.sh . $(TMP_DIR)/lcov-$(VERSION)
 	make -C $(TMP_DIR)/lcov-$(VERSION) clean
 	bin/updateversion.pl $(TMP_DIR)/lcov-$(VERSION) $(VERSION) $(RELEASE)
 	cd $(TMP_DIR) ; \

README

@@ -60,15 +60,11 @@ To install the tarball, unpack it to a directory and run:
 
   make install
 
-Use anonymous CVS for the most recent (but possibly unstable) version:
+Use Git for the most recent (but possibly unstable) version:
 
-  cvs -d:pserver:[email protected]:/cvsroot/ltp login
+  git clone https://github.com/linux-test-project/lcov.git
 
-(simply press the ENTER key when asked for a password)
-
-  cvs -z3 -d:pserver:[email protected]:/cvsroot/ltp export -D now utils
-
-Change to the utils/analysis/lcov directory and type:
+Change to the ulting cov directory and type:
 
   make install
 

bin/copy_dates.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+#
+# Usage: copy_dates.sh SOURCE TARGET
+#
+# For each file found in SOURCE, set the modification time of the copy of that
+# file in TARGET to either the time of the latest Git commit (if SOURCE contains
+# a Git repository and the file was not modified after the last commit), or the
+# modification time of the original file.
+
+SOURCE="$1"
+TARGET="$2"
+
+if [ -z "$SOURCE" -o -z "$TARGET" ] ; then
+	echo "Usage: $0 SOURCE TARGET" >&2
+	exit 1
+fi
+
+[ -d "$SOURCE/.git" ] ; NOGIT=$?
+
+echo "Copying modification/commit times from $SOURCE to $TARGET"
+
+cd "$SOURCE" || exit 1
+find * -type f | while read FILENAME ; do
+	[ ! -e "$TARGET/$FILENAME" ] && continue
+
+	# Copy modification time
+	touch -m "$TARGET/$FILENAME" -r "$FILENAME"
+
+	[ $NOGIT -eq 1 ] && continue				# No Git
+	git diff --quiet -- "$FILENAME" || continue		# Modified
+	git diff --quiet --cached -- "$FILENAME" || continue	# Modified
+
+	# Apply modification time from Git commit time
+	TIME=$(git log --pretty=format:%cd -n 1 --date=iso -- "$FILENAME")
+	[ -n "$TIME" ] && touch -m "$TARGET/$FILENAME" --date "$TIME"
+done

bin/gendesc

@@ -38,10 +38,12 @@
 use strict;
 use File::Basename; 
 use Getopt::Long;
+use Cwd qw/abs_path/;
 
 
 # Constants
-our $lcov_version	= 'LCOV version 1.11';
+our $tool_dir		= abs_path(dirname($0));
+our $lcov_version	= 'LCOV version '.`$tool_dir/get_version.sh --version`;
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $tool_name		= basename($0);
 
@@ -67,9 +69,6 @@ our $input_filename;
 $SIG{__WARN__} = \&warn_handler;
 $SIG{__DIE__} = \&die_handler;
 
-# Prettify version string
-$lcov_version =~ s/\$\s*Revision\s*:?\s*(\S+)\s*\$/$1/;
-
 # Parse command line options
 if (!GetOptions("output-filename=s" => \$output_filename,
 		"version" =>\$version,

bin/genhtml

@@ -69,11 +69,13 @@ use File::Basename;
 use File::Temp qw(tempfile);
 use Getopt::Long;
 use Digest::MD5 qw(md5_base64);
+use Cwd qw/abs_path/;
 
 
 # Global constants
 our $title		= "LCOV - code coverage report";
-our $lcov_version	= 'LCOV version 1.11';
+our $tool_dir		= abs_path(dirname($0));
+our $lcov_version	= 'LCOV version '.`$tool_dir/get_version.sh --version`;
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $tool_name		= basename($0);
 
@@ -305,7 +307,6 @@ our $rc_desc_html = 0;	# lcovrc: genhtml_desc_html
 
 our $cwd = `pwd`;	# Current working directory
 chomp($cwd);
-our $tool_dir = dirname($0);	# Directory where genhtml tool is installed
 
 
 #
@@ -315,15 +316,6 @@ our $tool_dir = dirname($0);	# Directory where genhtml tool is installed
 $SIG{__WARN__} = \&warn_handler;
 $SIG{__DIE__} = \&die_handler;
 
-# Prettify version string
-$lcov_version =~ s/\$\s*Revision\s*:?\s*(\S+)\s*\$/$1/;
-
-# Add current working directory if $tool_dir is not already an absolute path
-if (! ($tool_dir =~ /^\/(.*)$/))
-{
-	$tool_dir = "$cwd/$tool_dir";
-}
-
 # Check command line for a configuration file name
 Getopt::Long::Configure("pass_through", "no_auto_abbrev");
 GetOptions("config-file=s" => \$opt_config_file,

bin/geninfo

@@ -55,13 +55,15 @@ use File::Spec::Functions qw /abs2rel catdir file_name_is_absolute splitdir
 			      splitpath catpath/;
 use Getopt::Long;
 use Digest::MD5 qw(md5_base64);
+use Cwd qw/abs_path/;
 if( $^O eq "msys" )
 {
 	require File::Spec::Win32;
 }
 
 # Constants
-our $lcov_version	= 'LCOV version 1.11';
+our $tool_dir		= abs_path(dirname($0));
+our $lcov_version	= 'LCOV version '.`$tool_dir/get_version.sh --version`;
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $gcov_tool		= "gcov";
 our $tool_name		= basename($0);
@@ -269,9 +271,6 @@ $SIG{"INT"} = \&int_handler;
 $SIG{__WARN__} = \&warn_handler;
 $SIG{__DIE__} = \&die_handler;
 
-# Prettify version string
-$lcov_version =~ s/\$\s*Revision\s*:?\s*(\S+)\s*\$/$1/;
-
 # Set LC_ALL so that gcov output will be in a unified format
 $ENV{"LC_ALL"} = "C";
 

bin/genpng

@@ -32,10 +32,12 @@
 use strict;
 use File::Basename; 
 use Getopt::Long;
+use Cwd qw/abs_path/;
 
 
 # Constants
-our $lcov_version	= 'LCOV version 1.11';
+our $tool_dir		= abs_path(dirname($0));
+our $lcov_version	= 'LCOV version '.`$tool_dir/get_version.sh --version`;
 our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
 our $tool_name		= basename($0);
 
@@ -53,9 +55,6 @@ sub genpng_die_handler($);
 # Code entry point
 #
 
-# Prettify version string
-$lcov_version =~ s/\$\s*Revision\s*:?\s*(\S+)\s*\$/$1/;
-
 # Check whether required module GD.pm is installed
 if (check_and_load_module("GD"))
 {

bin/get_version.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Usage: get_version.sh --version|--release
+#
+# Print lcov version or release information as provided by Git, .version
+# or a fallback.
+
+TOOLDIR=$(cd $(dirname $0) ; pwd)
+GITVER=$(cd $TOOLDIR ; git describe --tags 2>/dev/null)
+
+if [ -z "$GITVER" ] ; then
+	# Get version information from file
+	if [ -e "$TOOLDIR/../.version" ] ; then
+		source "$TOOLDIR/../.version"
+	fi
+else
+	# Get version information from git
+	VERSION=${GITVER%%-*}
+	VERSION=${VERSION:1}
+	if [ "${GITVER#*-}" != "$GITVER" ] ; then
+		RELEASE=${GITVER#*-}
+	fi
+fi
+
+# Fallback
+[ -z "$VERSION" ] && VERSION=1.0
+[ -z "$RELEASE" ] && RELEASE=1
+
+[ "$1" == "--version" ] && echo -n $VERSION
+[ "$1" == "--release" ] && echo -n $RELEASE