diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-20 18:51:07 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-03-20 18:51:07 +0000 |
commit | 2cf00550927658eb08c16bd772134e844d82ba1a (patch) | |
tree | 2733642dc81a76bf756a525228b9c390c2bb0f74 /pkgs/development/tools/analysis | |
parent | cb01d8b23b74752a871da887a3d041a888fb03f4 (diff) |
* lcov 1.6.
svn path=/nixpkgs/trunk/; revision=11245
Diffstat (limited to 'pkgs/development/tools/analysis')
-rw-r--r-- | pkgs/development/tools/analysis/lcov/builder.sh | 12 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/lcov/default.nix | 35 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/lcov/lcov.patch | 169 | ||||
-rw-r--r-- | pkgs/development/tools/analysis/lcov/string.patch | 10 |
4 files changed, 39 insertions, 187 deletions
diff --git a/pkgs/development/tools/analysis/lcov/builder.sh b/pkgs/development/tools/analysis/lcov/builder.sh index 5315cc2835a61..b0092e0025561 100644 --- a/pkgs/development/tools/analysis/lcov/builder.sh +++ b/pkgs/development/tools/analysis/lcov/builder.sh @@ -1,19 +1,7 @@ source $stdenv/setup -installFlags="PREFIX=$out" -preInstall=preInstall preInstall() { - substituteInPlace bin/install.sh --replace /bin/bash $shell - - for i in bin/*; do - echo "fixing $i..." - sed -e "s^@PREFIX@^$out^" \ - -e "s^@PERL@^$perl/bin/perl^" \ - < $i > $i.tmp - mv $i.tmp $i - chmod +x $i - done } genericBuild diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 4df104d53cb12..9834b8a5a2b53 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -1,12 +1,35 @@ {stdenv, fetchurl, perl}: stdenv.mkDerivation { - name = "lcov-1.4pre-cvs-20041021"; - builder = ./builder.sh; + name = "lcov-1.6"; + src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/lcov-1.4pre-cvs-20041021.tar.gz; - md5 = "5150da759b4047b19d026c6ab1216841"; + url = mirror://sourceforge/ltp/lcov-1.6.tar.gz; + sha256 = "0d6lb0vlj3lvqmm678jic9h25q4dnlkbv37wg5yj311hdr9ls1kx"; }; - patches = [./lcov.patch]; - inherit perl; + + patches = [ + # http://ltp.cvs.sourceforge.net/ltp/utils/analysis/lcov/bin/geninfo?revision=1.33&view=markup&pathrev=HEAD + ./string.patch + ]; + + preBuild = '' + makeFlagsArray=(PREFIX=$out BIN_DIR=$out/bin MAN_DIR=$out/share/man) + ''; + + preInstall = '' + substituteInPlace bin/install.sh --replace /bin/bash $shell + ''; + + postInstall = '' + for i in $out/bin/*; do + substituteInPlace $i --replace /usr/bin/perl ${perl}/bin/perl + done + ''; # */ + + meta = { + description = "A code coverage tool for Linux"; + homepage = http://ltp.sourceforge.net/coverage/lcov.php; + }; + } diff --git a/pkgs/development/tools/analysis/lcov/lcov.patch b/pkgs/development/tools/analysis/lcov/lcov.patch deleted file mode 100644 index 5dbe5ddc0fd65..0000000000000 --- a/pkgs/development/tools/analysis/lcov/lcov.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff -rc lcov-orig/bin/gendesc lcov-1.1/bin/gendesc -*** lcov-orig/bin/gendesc 2004-10-22 16:10:55.000000000 +0200 ---- lcov-1.1/bin/gendesc 2004-10-22 16:27:52.000000000 +0200 -*************** -*** 1,4 **** -! #!/usr/bin/perl -w - # - # Copyright (c) International Business Machines Corp., 2002 - # ---- 1,4 ---- -! #! @PERL@ -w - # - # Copyright (c) International Business Machines Corp., 2002 - # -diff -rc lcov-orig/bin/genhtml lcov-1.1/bin/genhtml -*** lcov-orig/bin/genhtml 2004-10-22 16:10:55.000000000 +0200 ---- lcov-1.1/bin/genhtml 2004-10-22 16:29:40.000000000 +0200 -*************** -*** 1,4 **** -! #!/usr/bin/perl -w - # - # Copyright (c) International Business Machines Corp., 2002 - # ---- 1,4 ---- -! #! @PERL@ -w - # - # Copyright (c) International Business Machines Corp., 2002 - # -*************** -*** 200,208 **** - { - $config = read_config($ENV{"HOME"}."/.lcovrc"); - } -! elsif (-r "/etc/lcovrc") - { -! $config = read_config("/etc/lcovrc"); - } - - if ($config) ---- 200,208 ---- - { - $config = read_config($ENV{"HOME"}."/.lcovrc"); - } -! elsif (-r "@PREFIX@/etc/lcovrc") - { -! $config = read_config("@PREFIX@/etc/lcovrc"); - } - - if ($config) -diff -rc lcov-orig/bin/geninfo lcov-1.1/bin/geninfo -*** lcov-orig/bin/geninfo 2004-10-22 16:10:56.000000000 +0200 ---- lcov-1.1/bin/geninfo 2004-10-22 16:29:40.000000000 +0200 -*************** -*** 1,4 **** -! #!/usr/bin/perl -w - # - # Copyright (c) International Business Machines Corp., 2002 - # ---- 1,4 ---- -! #! @PERL@ -w - # - # Copyright (c) International Business Machines Corp., 2002 - # -*************** -*** 124,132 **** - { - $config = read_config($ENV{"HOME"}."/.lcovrc"); - } -! elsif (-r "/etc/lcovrc") - { -! $config = read_config("/etc/lcovrc"); - } - - if ($config) ---- 124,132 ---- - { - $config = read_config($ENV{"HOME"}."/.lcovrc"); - } -! elsif (-r "@PREFIX@/etc/lcovrc") - { -! $config = read_config("@PREFIX@/etc/lcovrc"); - } - - if ($config) -diff -rc lcov-orig/bin/genpng lcov-1.1/bin/genpng -*** lcov-orig/bin/genpng 2004-10-22 16:10:56.000000000 +0200 ---- lcov-1.1/bin/genpng 2004-10-22 16:28:14.000000000 +0200 -*************** -*** 1,4 **** -! #!/usr/bin/perl -w - # - # Copyright (c) International Business Machines Corp., 2002 - # ---- 1,4 ---- -! #! @PERL@ -w - # - # Copyright (c) International Business Machines Corp., 2002 - # -diff -rc lcov-orig/bin/lcov lcov-1.1/bin/lcov -*** lcov-orig/bin/lcov 2004-10-22 16:10:56.000000000 +0200 ---- lcov-1.1/bin/lcov 2004-10-22 16:29:39.000000000 +0200 -*************** -*** 1,4 **** -! #!/usr/bin/perl -w - # - # Copyright (c) International Business Machines Corp., 2002 - # ---- 1,4 ---- -! #! @PERL@ -w - # - # Copyright (c) International Business Machines Corp., 2002 - # -*************** -*** 166,174 **** - { - $config = read_config($ENV{"HOME"}."/.lcovrc"); - } -! elsif (-r "/etc/lcovrc") - { -! $config = read_config("/etc/lcovrc"); - } - - if ($config) ---- 166,174 ---- - { - $config = read_config($ENV{"HOME"}."/.lcovrc"); - } -! elsif (-r "@PREFIX@/etc/lcovrc") - { -! $config = read_config("@PREFIX@/etc/lcovrc"); - } - - if ($config) -diff -rc lcov-orig/bin/updateversion.pl lcov-1.1/bin/updateversion.pl -*** lcov-orig/bin/updateversion.pl 2004-10-22 16:10:55.000000000 +0200 ---- lcov-1.1/bin/updateversion.pl 2004-10-22 16:28:39.000000000 +0200 -*************** -*** 1,4 **** -! #!/usr/bin/perl -w - # - # Update version and date strings in LCOV files - # ---- 1,4 ---- -! #! @PERL@ -w - # - # Update version and date strings in LCOV files - # -diff -rc lcov-orig/Makefile lcov-1.1/Makefile -*** lcov-orig/Makefile 2004-10-22 16:10:55.000000000 +0200 ---- lcov-1.1/Makefile 2004-10-22 16:26:18.000000000 +0200 -*************** -*** 16,23 **** - DATE := $(shell date +%Y-%m-%d) - - 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 \ - $(wildcard rpm/*) ---- 16,23 ---- - DATE := $(shell date +%Y-%m-%d) - - CFG_DIR := $(PREFIX)/etc -! BIN_DIR := $(PREFIX)/bin -! MAN_DIR := $(PREFIX)/share/man - TMP_DIR := /tmp/lcov-tmp.$(shell echo $$$$) - FILES := $(wildcard bin/*) $(wildcard man/*) README CHANGES Makefile \ - $(wildcard rpm/*) diff --git a/pkgs/development/tools/analysis/lcov/string.patch b/pkgs/development/tools/analysis/lcov/string.patch new file mode 100644 index 0000000000000..db753c5dab26f --- /dev/null +++ b/pkgs/development/tools/analysis/lcov/string.patch @@ -0,0 +1,10 @@ +--- a/bin/geninfo 2007/10/04 08:18:07 1.32 ++++ b/bin/geninfo 2007/11/01 16:29:39 1.33 +@@ -1478,6 +1478,7 @@ + } + next; + } ++ last if ($length == 0); + ($blocks, $string) = + read_gcno_string(*INPUT, $endianness); + if (defined($string)) |