summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-18 17:59:47 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-18 18:10:35 (GMT)
commit2f6c2299c28c9bb03ee1437058a4c7071ff2ac3f (patch)
tree5fb82cd3ea77b82ce0c5fec973e1fee4de1def4b /3rdParty/LCov/genpng
parent6d115ace1a038acd1a4354391c552bef84d67e79 (diff)
downloadswift-2f6c2299c28c9bb03ee1437058a4c7071ff2ac3f.zip
swift-2f6c2299c28c9bb03ee1437058a4c7071ff2ac3f.tar.bz2
Updated coverage tools.
Updated LCov to 1.9. Removed obsolete overview script.
Diffstat (limited to '3rdParty/LCov/genpng')
-rwxr-xr-x3rdParty/LCov/genpng17
1 files changed, 10 insertions, 7 deletions
diff --git a/3rdParty/LCov/genpng b/3rdParty/LCov/genpng
index b4d90c2..7fe9dfe 100755
--- a/3rdParty/LCov/genpng
+++ b/3rdParty/LCov/genpng
@@ -35,7 +35,7 @@ use Getopt::Long;
# Constants
-our $lcov_version = "LCOV version 1.7";
+our $lcov_version = 'LCOV version 1.9';
our $lcov_url = "http://ltp.sourceforge.net/coverage/lcov.php";
our $tool_name = basename($0);
@@ -45,14 +45,17 @@ sub gen_png($$$@);
sub check_and_load_module($);
sub genpng_print_usage(*);
sub genpng_process_file($$$$);
-sub warn_handler($);
-sub die_handler($);
+sub genpng_warn_handler($);
+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"))
{
@@ -75,8 +78,8 @@ if (!caller)
my $help;
my $version;
- $SIG{__WARN__} = \&warn_handler;
- $SIG{__DIE__} = \&die_handler;
+ $SIG{__WARN__} = \&genpng_warn_handler;
+ $SIG{__DIE__} = \&genpng_die_handler;
# Parse command line options
if (!GetOptions("tab-size=i" => \$tab_size,
@@ -366,14 +369,14 @@ sub gen_png($$$@)
close(PNG_HANDLE);
}
-sub warn_handler($)
+sub genpng_warn_handler($)
{
my ($msg) = @_;
warn("$tool_name: $msg");
}
-sub die_handler($)
+sub genpng_die_handler($)
{
my ($msg) = @_;