Update of /cvsroot/lxr/lxr
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15203
Modified Files:
.cvsignore INSTALL diff genxref source
Removed Files:
fixhashbang genjavaclasses
Log Message:
Merge of the BK support from bk-dev-branch.
This merge closes the bk-dev-branch.
Adds support for BK repositories (somewhat incomplete). As BK is no longer
free, this is untestable by the maintainer and will therefore not be maintained.
It is released here to allow others to take it forward if they want.
Also updates and add new testcases.
Index: .cvsignore
===================================================================
RCS file: /cvsroot/lxr/lxr/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore 14 Jul 2004 14:50:14 -0000 1.3
+++ .cvsignore 2 Nov 2005 23:39:55 -0000 1.4
@@ -7,4 +7,6 @@
html-search-swish.html
html-tail.html
lxr.conf
-lxr.css
\ No newline at end of file
+lxr.css
+.includepath
+.project
Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- INSTALL 5 Jan 2005 17:13:20 -0000 1.20
+++ INSTALL 2 Nov 2005 23:39:55 -0000 1.21
@@ -26,6 +26,10 @@
7) If using the CVS support, you will need rcs installed as well.
+8) If you are using the BitKeeper support, you will need:
+ BitKeeper (bk) installed
+ Digest::SHA module (available from CPAN)
+
Installing the database
-----------------------
You will need to create a database for lxr, and possibly create a user
Index: diff
===================================================================
RCS file: /cvsroot/lxr/lxr/diff,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- diff 26 Oct 2004 17:08:07 -0000 1.15
+++ diff 2 Nov 2005 23:39:55 -0000 1.16
@@ -31,6 +31,7 @@
use LXR::Common qw(:html);
use Local;
+use FileHandle;
sub htmlsub {
my ($s, $l) = @_;
Index: genxref
===================================================================
RCS file: /cvsroot/lxr/lxr/genxref,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- genxref 21 Jul 2004 20:44:30 -0000 1.36
+++ genxref 2 Nov 2005 23:39:55 -0000 1.37
@@ -51,6 +51,7 @@
--version=VERSION Generate tokens for the given version of the code.
--allversions Generate tokens for all versions of the code (default).
--reindexall Purges existing index data
+
Report bugs at http://sourceforge.net/projects/lxr/.
END_HELP
exit 0;
@@ -67,7 +68,7 @@
die("No matching configuration") unless $config->sourceroot;
-$files = new LXR::Files($config->sourceroot);
+$files = new LXR::Files($config->sourceroot, $config->sourceparams);
die "Can't create file access object " . $config->sourceroot
if !defined($files);
$index = new LXR::Index($config->dbname, O_RDWR | O_CREAT);
Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- source 2 Sep 2004 15:26:42 -0000 1.44
+++ source 2 Nov 2005 23:39:55 -0000 1.45
@@ -27,8 +27,8 @@
$CVSID = '$Id$ ';
use strict;
-use lib '.'; # for Local.pm
-use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
+use lib '.'; # for Local.pm
+use lib do { $0 =~ m{(.*)/} ? "$1/lib" : "lib" }; # if LXR modules are in ./lib
use LXR::Common qw(:html);
use Local;
@@ -43,8 +43,9 @@
$img = "/icons/folder.gif";
}
- return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"folder\">", "",
- $dir . $node);
+ return fileref(
+ "<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"folder\">",
+ "", $dir . $node);
}
sub dirname {
@@ -76,7 +77,8 @@
} else {
$img = "/icons/generic.gif";
}
- return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"\">", "", $dir . $node);
+ return fileref("<img align=\"bottom\" border=\"0\" src=\"$img\" alt=\"\">",
+ "", $dir . $node);
}
sub filename {
@@ -121,8 +123,11 @@
my @t = gmtime($file_time);
my ($sec, $min, $hour, $mday, $mon, $year) = @t;
- return
- sprintf("%04d-%02d-%02d %02d:%02d:%02d", $year + 1900, $mon + 1, $mday, $hour, $min, $sec);
+ return sprintf(
+ "%04d-%02d-%02d %02d:%02d:%02d",
+ $year + 1900,
+ $mon + 1, $mday, $hour, $min, $sec
+ );
}
sub bgcolor {
@@ -145,8 +150,7 @@
@nodes = $files->getdir($dir, $release);
unless (@nodes) {
- print( "<p align=\"center\">\n<i>The directory "
- . $files->toreal($dir, $release)
+ print( "<p align=\"center\">\n<i>The directory " . $dir
. " does not exist.</i>\n");
print(
"\<p align=\"center\">\n<i>This directory might exist in other versions, try 'Show attic files' or select a different Version.</i>\n"
@@ -154,12 +158,6 @@
if $files->isa("LXR::Files::CVS")
and !$HTTP->{'param'}->{'showattic'};
- #FIXME what does this do?
- if ($files->toreal($dir, $release) =~ m#(.+[^/])[/]*$#) {
- if (-e $1) {
- warning("Unable to open " . $files->toreal($dir, $release));
- }
- }
return;
}
@@ -175,9 +173,10 @@
'namelink' => sub { dirname(@_, $node, $dir) },
'filesize' => sub { '-' },
'modtime' => sub { modtime(@_, $node, $dir) },
- 'bgcolor' => sub { bgcolor(@_, $line++) },
- 'css' => sub { rowclass(@_, $line++) },
- 'description' => sub { descexpand(@_, $node, $dir, $release) }
+ 'bgcolor' => sub { bgcolor(@_, $line++) },
+ 'css' => sub { rowclass(@_, $line++) },
+ 'description' =>
+ sub { descexpand(@_, $node, $dir, $release) }
)
);
} else {
@@ -193,7 +192,9 @@
'css' => sub { rowclass(@_, $line++) },
'description' => sub {
(
- $files->toreal($dir . $node, $release) =~ m|/Attic/|
+ $files->isa('LXR::Files::CVS')
+ && $files->toreal($dir . $node, $release) =~
+ m|/Attic/|
? "<i>In Attic</i> "
: ""
)
@@ -269,7 +270,9 @@
}
$b = $a;
- $a .= ' ' x (6 - length($a)) . $files->getauthor($pathname, $a);
+ $a .=
+ ' ' x (6 - length($a))
+ . $files->getauthor($pathname, $a);
$a .= ' ' x (16 - length($a));
}
}
@@ -286,15 +289,14 @@
}
} else {
- print("\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n");
+ print(
+ "\<p align=\"center\">\n<i>The file $pathname does not exist.</i>\n"
+ );
print(
"\<p align=\"center\">\n<i>This file might exist in other versions, try 'Show attic files' or select a different Version.</i>\n"
)
if $files->isa("LXR::Files::CVS")
and !$HTTP->{'param'}->{'showattic'};
- if (-f $files->toreal($pathname, $release)) {
- warning("Unable to open " . $files->toreal($pathname, $release));
- }
}
}
}
--- fixhashbang DELETED ---
--- genjavaclasses DELETED ---
|
