Merge remote-tracking branch 'upstream/master'

Author: PycKamil

envcov.sh

@@ -5,7 +5,7 @@
 scripts="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source "${scripts}/env.sh"
 
-LCOV_PATH="${scripts}/lcov-1.11/bin"
+LCOV_PATH="${scripts}/lcov-1.12/bin"
 OBJ_DIR="${OBJECT_FILE_DIR_normal}/${CURRENT_ARCH}"
 
 # Fix for the new LLVM-COV that requires gcov to have a -v parameter

lcov-1.11/COPYING renamed to lcov-1.12/COPYING

@@ -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 --full`;
 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,