lxr-commits — Don't use, CVS commits

[Lxr-commits] CVS: lxr/tests/test-src/5.5.4 aFile.txt, NONE, 1.1 anOtherFile.txt, NONE, 1.1

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/tests/test-src/5.5.4
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10711/tests/test-src/5.5.4

Added Files:
	aFile.txt anOtherFile.txt 
Log Message:
Part II of Bug 2750080 (Running the Tests Outputs Warnings) - added test src files and updated PlainTest::test_getfile() to use them so that this test now works properly

--- NEW FILE: aFile.txt ---
Jaques:
All the world's a stage,
And all the men and women merely players;
They have their exits and their entrances,
And one man in his time plays many parts,
His acts being seven ages.

As You Like It Act 2, scene 7, 139–143 
--- NEW FILE: anOtherFile.txt ---
Hamlet:
I'll have grounds
More relative than this—the play's the thing
Wherein I'll catch the conscience of the King.

Hamlet Act 2, scene 2, 603–605 

[Lxr-commits] CVS: lxr/tests/test-src/5.5.4 - New directory

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/tests/test-src/5.5.4
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10674/tests/test-src/5.5.4

Log Message:
Directory /cvsroot/lxr/lxr/tests/test-src/5.5.4 added to the repository

[Lxr-commits] CVS: lxr/tests/test-src/5.5.4/aDir - New directory

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/tests/test-src/5.5.4/aDir
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10674/tests/test-src/5.5.4/aDir

Log Message:
Directory /cvsroot/lxr/lxr/tests/test-src/5.5.4/aDir added to the repository

[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.59,1.60

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv7815/lib/LXR

Modified Files:
	Common.pm 
Log Message:
Part I of the fix for Bug 2750080 (Running the Tests Outputs Warnings)

Index: Common.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- Common.pm	23 Mar 2009 16:43:08 -0000	1.59
+++ Common.pm	10 Apr 2009 20:13:31 -0000	1.60
@@ -397,7 +397,7 @@
 
 	my $time = $files->getfiletime($pathname, $release);
 	my $time2 = (stat($config->confpath))[9];
-	$time = $time2 if $time2 > $time;
+	$time = $time2 if !defined $time or $time2 > $time;
 
 	# Remove this to see if we get a speed increase by not stating all
 	# the modules.  Since for most sites the modules change rarely,
@@ -479,7 +479,8 @@
 
 	# We don't clean all the parameters here, as some scripts need extended characters
 	# e.g. regexp searching
-	$HTTP->{'param'} = { map { http_wash($_) } $ENV{'QUERY_STRING'} =~ /([^;&=]+)(?:=([^;&]+)|)/g };
+	$HTTP->{'param'} = { map { http_wash($_) } $ENV{'QUERY_STRING'} =~ /([^;&=]+)(?:=([^;&]+)|)/g }
+	  if defined $ENV{'QUERY_STRING'};
 
 	# But do clean up these
 	$HTTP->{'param'}->{'v'} ||= $HTTP->{'param'}->{'version'};

[Lxr-commits] CVS: lxr/tests TestRunner.pl,1.2,1.3

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv32078/tests

Modified Files:
	TestRunner.pl 
Log Message:
Reverting the change to TestRunner.pl so it uses the -w switch instead of the -T switch as before

Index: TestRunner.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/TestRunner.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TestRunner.pl	8 Apr 2009 20:49:21 -0000	1.2
+++ TestRunner.pl	10 Apr 2009 09:16:45 -0000	1.3
@@ -1,4 +1,4 @@
-#!perl -T
+#!perl -w
 
 use strict;
 

[Lxr-commits] CVS: lxr/lib/LXR Config.pm,1.33,1.34

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5798/lib/LXR

Modified Files:
	Config.pm 
Log Message:
Fix for bug 2745362 (LXR::Config Is Too Strict) - LXR::Config now creates the tmpdir, glimpsedir and swishdirs as necessary when it is initialised.

Index: Config.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Config.pm,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- Config.pm	10 Sep 2005 00:09:20 -0000	1.33
+++ Config.pm	8 Apr 2009 21:17:06 -0000	1.34
@@ -21,6 +21,7 @@
 $CVSID = '$Id$ ';
 
 use strict;
+use File::Path;
 
 use LXR::Common;
 
@@ -116,6 +117,23 @@
 			 	"the --url parameter should be a URL (e.g. http://example.com/lxr) and must match a baseurl line in lxr.conf\n";
 		}
 	}
+	
+	# Set-up various directories as necessary
+  _ensuredirexists($self->{tmpdir});
+
+  if (exists $self->{glimpsebin} and exists $self->{swishbin}) {
+    die "Both Glimpse and Swish have been specified in $confpath.\n".
+        "Please choose one or other of them by commenting out either glimpsebin or swishbin.\n";
+  } elsif (exists $self->{glimpsebin}) {    
+    die "Please specifiy glimpsedir in $confpath\n" if !exists $self->{glimpsedir};    
+    _ensuredirexists($self->{glimpsedir});
+  } elsif (exists $self->{swishbin}) {    
+    die "Please specifiy glimpsedir in $confpath\n" if !exists $self->{swishdir};    
+    _ensuredirexists($self->{swishdir});
+  } else {
+    die "Neither Glimpse nor Swish have been specified in $confpath.\n".
+        "Please choose one or other of them by specifing a value for either glimpsebin or swishbin.\n";
+  }
 }
 
 sub allvariables {
@@ -218,4 +236,12 @@
 	return $path;
 }
 
+sub _ensuredirexists {
+  my $dir = shift;
+  if(!-d $dir) {
+    mkpath($dir) or die "Couldn't make the directory $dir: ?!";
+  }  
+}
+
+
 1;

[Lxr-commits] CVS: lxr/tests TestRunner.pl,1.1,1.2

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2398/tests

Modified Files:
	TestRunner.pl 
Log Message:
Fix for bug 2745292 (LXR CGI Scripts Fail on Windows) - changed all occurrences of "#!/usr/bin/perl –T" to be "#!perl –T" and rely on the path to find the perl executable.

Index: TestRunner.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/TestRunner.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TestRunner.pl	4 Dec 2004 23:21:59 -0000	1.1
+++ TestRunner.pl	8 Apr 2009 20:49:21 -0000	1.2
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!perl -T
 
 use strict;
 

[Lxr-commits] CVS: lxr search, 1.30, 1.31 find, 1.24, 1.25 genxref, 1.38, 1.39 ident, 1.21, 1.22 source, 1.45, 1.46 diff, 1.16, 1.17 .cvsignore, 1.4, 1.5

[AdrianIssott <adr...@us...>]

Update of /cvsroot/lxr/lxr
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2398

Modified Files:
	search find genxref ident source diff .cvsignore 
Log Message:
Fix for bug 2745292 (LXR CGI Scripts Fail on Windows) - changed all occurrences of "#!/usr/bin/perl –T" to be "#!perl –T" and rely on the path to find the perl executable.

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- search	8 Apr 2006 13:37:57 -0000	1.30
+++ search	8 Apr 2009 20:49:18 -0000	1.31
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!perl -T
 # $Id$
 
 # search --	Freetext search

Index: find
===================================================================
RCS file: /cvsroot/lxr/lxr/find,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- find	2 Sep 2004 15:26:42 -0000	1.24
+++ find	8 Apr 2009 20:49:19 -0000	1.25
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!perl -T
 # $Id$
 
 # find   --	Find files

Index: genxref
===================================================================
RCS file: /cvsroot/lxr/lxr/genxref,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- genxref	23 Mar 2009 16:51:19 -0000	1.38
+++ genxref	8 Apr 2009 20:49:19 -0000	1.39
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!perl
 # -*- tab-width: 4 -*-"
 
 # This program is free software; you can redistribute it and/or modify

Index: ident
===================================================================
RCS file: /cvsroot/lxr/lxr/ident,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ident	2 Sep 2004 15:26:42 -0000	1.21
+++ ident	8 Apr 2009 20:49:19 -0000	1.22
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!perl -T
 # $Id$
 
 # ident --	Look up identifiers

Index: source
===================================================================
RCS file: /cvsroot/lxr/lxr/source,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- source	2 Nov 2005 23:39:55 -0000	1.45
+++ source	8 Apr 2009 20:49:19 -0000	1.46
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!perl -T
 # $Id$
 
 # source --	Present sourcecode as html, complete with references

Index: diff
===================================================================
RCS file: /cvsroot/lxr/lxr/diff,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- diff	2 Nov 2005 23:39:55 -0000	1.16
+++ diff	8 Apr 2009 20:49:19 -0000	1.17
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -T
+#!perl -T
 # $Id$
 
 # diff --	Display diff output with markup.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/lxr/lxr/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- .cvsignore	2 Nov 2005 23:39:55 -0000	1.4
+++ .cvsignore	8 Apr 2009 20:49:19 -0000	1.5
@@ -10,3 +10,5 @@
 lxr.css
 .includepath
 .project
+valid-html401.png
+.htaccess

[Lxr-commits] CVS: lxr/templates valid-html401.png, NONE, 1.1 html-head.html, 1.8, 1.9 html-ident.html, 1.5, 1.6 html-search-glimpse.html, 1.3, 1.4 html-search-swish.html, 1.3, 1.4 html-tail.html, 1.5, 1.6

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/templates
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28110

Modified Files:
	html-head.html html-ident.html html-search-glimpse.html 
	html-search-swish.html html-tail.html 
Added Files:
	valid-html401.png 
Log Message:
Implemented focus in fields on load.
Added local copy of the valid-html logo to speed page loads.


--- NEW FILE: valid-html401.png ---
‰PNG



$,#1'5*###(((432;;;B4G8M=NK?WE"[H$cO'lV+oX,uG9r[-~d1NNNROKVRMUUU\\\j]Jeeekkkrkappp{{{
8óÜ¢èÁ=Šè‹Ç—Лä³p®¾¬àÌn
l*<
@DܵJ
jjK`Fz\ä9 O3ëCc¶âŒëƒ
KÁà›ýؘ7o=tmw{½b×k
JgS›Whõ5ùØÅúa8,ºÃ¾֞x*‡£©¢Ì
,JMØ>A'
¥ÈÏ-n.g^xX£‹–ª©â‰dò‹4÷ÔÓW)îéŸÒãA“ûŽÿ©©ö¿bîX}yr½¾‘WŸ@N®«WJMðošqŽb›½j¨
Index: html-head.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-head.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- html-head.html	30 Jun 2004 19:49:50 -0000	1.8
+++ html-head.html	27 Mar 2009 11:46:58 -0000	1.9
@@ -4,9 +4,20 @@
 <title>$title</title>
 <base href="$baseurl">
 <link href="$stylesheet" rel="STYLESHEET" type="text/css">
+<script type="text/javascript">
+function ensureFocus()
+{
+  if (document.getElementById("focus"))
+	  {
+	  document.getElementById("focus").focus();
+	  }
+}
+</script>
 </head>
 
-<body>
+
+<body onload="ensureFocus()">
+
 <table width='100%' border='0' cellpadding='0' cellspacing='0'>
   <tr>
     <td valign='top'>

Index: html-ident.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-ident.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- html-ident.html	15 Jul 2004 14:41:04 -0000	1.5
+++ html-ident.html	27 Mar 2009 11:46:59 -0000	1.6
@@ -8,7 +8,7 @@
 $variables
     
 <b>Identifier: </b>
-<input type="text" name="i" value="$identifier_escaped" size="15">
+<input id="focus" type="text" name="i" value="$identifier_escaped" size="15">
 <input type="submit" value="Find">
 
 </form>     

Index: html-search-glimpse.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-search-glimpse.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- html-search-glimpse.html	26 Jul 2004 20:47:44 -0000	1.3
+++ html-search-glimpse.html	27 Mar 2009 11:46:59 -0000	1.4
@@ -31,7 +31,7 @@
 				<b>Containing:</b>
 			</td>
 			<td>
-				<input type="text" name="string" value="$searchtext_escaped" size="50">
+				<input id="focus" type="text" name="string" value="$searchtext_escaped" size="50">
 			</td>
 		</tr>
 		<tr>

Index: html-search-swish.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-search-swish.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- html-search-swish.html	26 Jul 2004 20:47:44 -0000	1.3
+++ html-search-swish.html	27 Mar 2009 11:46:59 -0000	1.4
@@ -31,7 +31,7 @@
 				<b>Containing:</b>
 			</td>
 			<td>
-				<input type="text" name="string" value="$searchtext_escaped" size="50">
+				<input id="focus" type="text" name="string" value="$searchtext_escaped" size="50">
 			</td>
 		</tr>
 		<tr>

Index: html-tail.html
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/html-tail.html,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- html-tail.html	28 Jun 2004 13:54:21 -0000	1.5
+++ html-tail.html	27 Mar 2009 11:46:59 -0000	1.6
@@ -18,7 +18,7 @@
     </td>
     <td align="right">
       <a href="http://validator.w3.org/check/referer"><img border="0"
-        src="http://www.w3.org/Icons/valid-html401"
+        src="templates/valid-html401.png"
         alt="Valid HTML 4.01!" height="31" width="88"></a>
     </td>
   </tr>

[Lxr-commits] CVS: lxr/lib/LXR Files.pm,1.10,1.11

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29733/lib/LXR

Modified Files:
	Files.pm 
Log Message:


Index: Files.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files.pm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Files.pm	8 Apr 2006 13:37:58 -0000	1.10
+++ Files.pm	26 Mar 2009 17:15:28 -0000	1.11
@@ -105,6 +105,12 @@
 	warn  "::isfile not implemented. Parameters: @_";
 }
 
+sub tmpfile {
+	my $self = shift;
+	# FIXME: This function really sucks and should be removed :)
+	warn  "::tmpfile not implemented. Parameters: @_";
+}
+
 sub toreal {
 	# FIXME: this function should probably not exist, since it doesn't make sense for 
 	# all file access methods

[Lxr-commits] CVS: lxr apache2-require.pl,1.1,1.2

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29615

Modified Files:
	apache2-require.pl 
Log Message:
Change paths to match install instructions


Index: apache2-require.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/apache2-require.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- apache2-require.pl	26 Mar 2009 17:11:58 -0000	1.1
+++ apache2-require.pl	26 Mar 2009 17:13:43 -0000	1.2
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl -w
-@INC=(@INC,"/home/malcolm/dev/lxr-dev/lxr",
-	 "/home/malcolm/dev/lxr-dev/lxr/lib",
-	 "/home/malcolm/dev/lxr-dev/lxr/lib/Files");
+@INC=(@INC,"/usr/local/lxr",
+	 "/usr/local/lxr/lib",
+	 "/usr/local/lxr/lib/Files");
 
 1;

[Lxr-commits] CVS: lxr apache2-require.pl, NONE, 1.1 INSTALL, 1.25, 1.26

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29451

Modified Files:
	INSTALL 
Added Files:
	apache2-require.pl 
Log Message:
Fix problem in INSTALL instructions where Apache2 include path wasn't
set up properly.  Create new script to set these up.


--- NEW FILE: apache2-require.pl ---
#!/usr/bin/env perl -w
@INC=(@INC,"/home/malcolm/dev/lxr-dev/lxr",
	 "/home/malcolm/dev/lxr-dev/lxr/lib",
	 "/home/malcolm/dev/lxr-dev/lxr/lib/Files");

1;

Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/INSTALL,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- INSTALL	23 Mar 2009 15:49:12 -0000	1.25
+++ INSTALL	26 Mar 2009 17:11:57 -0000	1.26
@@ -73,21 +73,6 @@
  cd /usr/local/
  tar -zxf /path/to/lxr/lxr-x.x.tgz (as root or with appropriate permissions)
 
-Now you have to put the perl modules that LXR uses into a directory on
-your system that will be searched by mod_perl when the LXR scripts are
-executed. Being an Apache 1.x user, execute:
-
- cp /usr/local/lxr/Local.pm /usr/lib/perl5/site_perl/
- cp -r /usr/local/lxr/lib/LXR /usr/lib/perl5/site_perl
-
-For Apache2, there's a clever variant to not clobber your system's
-Perl installation with foreign modules documented below in the Apache2
-section.
-
-Now you should copy the template files for LXR to your installation
-
- mv /usr/local/lxr/templates/* /usr/local/lxr/
-
 Edit the lxr config file
 ------------------------
 Go through the config file and fill in the relevant values.
@@ -106,12 +91,12 @@
 'html-search-glimpse.html' depending on which indexer
 you are using.
 
-Now remember you copied the perl modules to a directory
-in your perl module search path ? The example path I used was 
-/usr/lib/perl5/site_perl which is also needed in lxr.conf
+Now you need to edit the paths for generic.conf and ectags.conf -
+change the paths in lxr.conf to match where you've installed LXR (in
+our example, /usr/local/lxr):
 
- 'genericconf' => '/usr/lib/perl5/site_perl/LXR/Lang/generic.conf'
- 'ectagsconf' => '/usr/lib/perl5/site_perl/LXR/Lang/ectags.conf',
+ 'Genericconf' => '/usr/local/lxr/lib/LXR/Lang/generic.conf'
+ 'ectagsconf' => '/usr/local/lxr/LXR/Lang/ectags.conf',
 
 Next set your base URL and virtual root for LXR by setting
 
@@ -197,10 +182,15 @@
 
 Set up webserver
 ----------------
-The browsing scripts supplied can run with Apache mod_perl or as cgi
-scripts.
 
-You may need to edit httpd.conf to point to the lxr files, for example
+The web front end for LXR can run as CGI scripts or using Apache's
+mod_perl.  Since there are differences between mod_perl for Apache 1.x
+and 2.x, the setup is slightly different - details below.
+
+Configuring for mod_perl
+------------------------
+
+You need to edit httpd.conf to point to the lxr files, for example
 if you have installed the lxr files in /usr/local/lxr and you want to
 have your URL be http://mysite/lxr then you would add:
 
@@ -209,24 +199,65 @@
    AllowOverride All
 </Directory>
 
-The distribution contains a .htaccess file for both Apache 1.x and
-Apache 2.x (.htaccess-apache1 and .htaccess-apache2 respectively).
-Rename the appropriate one to .htaccess:
+   Apache 1.x specific
+   -------------------
+   Copy .htaccess-apache1 to .htaccess
+      
+   Now you have to put the perl modules that LXR uses into a directory
+   on your system that will be searched by mod_perl when the LXR
+   scripts are executed (typically site_perl):
 
-	mv .htaccess-apache2  .htaccess
+    cp /usr/local/lxr/Local.pm /usr/lib/perl5/site_perl/
+	cp -r /usr/local/lxr/lib/LXR /usr/lib/perl5/site_perl
 
-The supplied files should enable LXR to work out-of-the-box. Edit it
-if you have special local policies.
+   Apache 2.x specific
+   -------------------
+
+   Copy .htaccess-apache2 to .htaccess
+
+   Add the following to your Apache2 config:
+
+      PerlRequire /usr/local/lxr/apache2-require.pl
+  
+   (replacing /usr/local/lxr with wherever you've installed LXR)
+
+   Then edit the paths in the apache2-require.pl script to point to
+   the directories where LXR is installed.
+
+Configuring for CGI
+-------------------
+
+You need to edit httpd.conf to point to the lxr files, for example
+if you have installed the lxr files in /usr/local/lxr and you want to
+have your URL be http://mysite/lxr then you would add:
+
+ScriptAlias /lxr /usr/local/lxr
+<Directory /usr/local/lxr>
+   AllowOverride All
+</Directory>
+
+Copy .htaccess_cgi to .htaccess
 
-If you are using Apache without mod_perl (running scripts as CGI),
-instead of 'Alias' in httpd.conf use 'ScriptAlias'.  Also, delete
-.htaccess and rename .htaccess_cgi to .htaccess.
 
 That's it - lxr should now work. Fire up your webbrowser and go to
 http://yoursite/lxr/source and you should see the listing for the top
 of your source tree.
 
-If you are using a webserver other than Apache, you need to provide:
+If you don't see the LXR page, check your Apache logs, especially the
+error and access logs to see what's happening.  Problems are often
+caused by the webserver not being able to access the LXR files - make
+sure all the paths and file permissions are correct.
+
+Other webservers
+----------------
+
+Most webservers should be capable of supporting the CGI script
+versions of LXR - consult the server documentation for information on
+how to configure this.
+
+If you are using a webserver other than Apache, you need to provide
+the following icons:
+
 /icons/back.gif
 /icons/folder.gif
 /icons/c.gif

[Lxr-commits] CVS: lxr-tools/test-data/source/1/testdir/testdir - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data/source/1/testdir/testdir
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22396/testdir

Log Message:
Directory /cvsroot/lxr/lxr-tools/test-data/source/1/testdir/testdir added to the repository

[Lxr-commits] CVS: lxr-tools/test-data/source/1/include - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data/source/1/include
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22282/include

Log Message:
Directory /cvsroot/lxr/lxr-tools/test-data/source/1/include added to the repository

[Lxr-commits] CVS: lxr-tools/test-data/source/1/r0drv - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data/source/1/r0drv
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22282/r0drv

Log Message:
Directory /cvsroot/lxr/lxr-tools/test-data/source/1/r0drv added to the repository

[Lxr-commits] CVS: lxr-tools/test-data/source/1/testdir - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data/source/1/testdir
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22282/testdir

Log Message:
Directory /cvsroot/lxr/lxr-tools/test-data/source/1/testdir added to the repository

[Lxr-commits] CVS: lxr-tools/test-data/source/2 - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data/source/2
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22174/2

Log Message:
Directory /cvsroot/lxr/lxr-tools/test-data/source/2 added to the repository

[Lxr-commits] CVS: lxr-tools/test-data/source/1 - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data/source/1
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22154/1

Log Message:
Directory /cvsroot/lxr/lxr-tools/test-data/source/1 added to the repository

[Lxr-commits] CVS: lxr-tools/test-data/source - New directory

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data/source
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21845/source

Log Message:
Directory /cvsroot/lxr/lxr-tools/test-data/source added to the repository

[Lxr-commits] CVS: lxr-tools makerelease.pl,1.1,1.2

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19835

Modified Files:
	makerelease.pl 
Log Message:
First version - does complete test - export - tar - upload cycle


Index: makerelease.pl
===================================================================
RCS file: /cvsroot/lxr/lxr-tools/makerelease.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- makerelease.pl	25 Mar 2009 16:13:52 -0000	1.1
+++ makerelease.pl	25 Mar 2009 16:49:49 -0000	1.2
@@ -1,13 +1,16 @@
 #!/usr/bin/perl -w
 
-# Make a release of the LXR tool. Steps are:
+# Does most of the automatic steps for making a release of the LXR tool.
+# Steps are:
 # - Run all the tests & ensure they pass
 # - Tag the release in CVS with a tag of the form release-x-y-z (e.g. release-0-9-4)
 # - Export the tagged files to a new directory lxr-x-y-z
 # - Create the Changelog: can use cvs2cl.pl script
 # - tar up the files
 # - upload to SF servers
-# - upload new changelog
+#
+# Manual steps afterwards:
+# - upload new changelog as release notes
 # - send release notification
 # - Update the tracker version numbers (bugs etc) so defects can be reported
 
@@ -25,7 +28,7 @@
 my $TARBIN = 'tar';
 
 
-GetOptions(\%option, "help!", "tag=s", "noex");
+GetOptions(\%option, "help!", "tag=s", "noex", "notest");
 
 if ($option{'help'}) {
 	print <<END_HELP;
@@ -35,7 +38,8 @@
 Interactively releases the LXR project to SourceForge.
 
 Script will tag the repository, create the release tarballs, then
-upload tarball and changelog to SourceForge.
+upload tarball to SourceForge.  Creating the actual release on SF is a manual
+process - go to https://sourceforge.net/project/admin/editpackages.php?group_id=27350 to complete the release.
 
 Must be run from the top-level directory of the lxr module (i.e. where
 the "source" and "INSTALL" files are found).
@@ -60,17 +64,22 @@
 my $tag;
 
 check_environment();
-run_tests();
+if (!$option{'notest'}) {
+	run_tests();
+} else {
+	print "WARNING: Skipping tests\n";
+}
+
 $tag = tag_release();
 my $version = $tag;
 $version =~ s/release-(\d+)-(\d+)-(\d+)/$1\.$2\.$3/;
 create_changelog($tag, $version);
 create_release_tarball($tag, $version);
-upload_release($version);
-upload_changelog($version);
-send_release_notification($version);
+upload_release($tag, $version);
 
-exit 1;
+print "\nRelease $version done - complete manual process on SF website\n\n";
+
+exit 0;
 
 
 sub get_tags() {
@@ -98,7 +107,8 @@
 
 sub tag_to_val {
 	my $tag = shift;
-	my ($major, $minor, $point) = 0;
+	my ($major, $minor, $point);
+	$major = $minor = $point = 0;
 	
 	if ($tag =~ m/release-(\d+)-(\d+)-(\d+)/) {
 		$major = $1;
@@ -170,6 +180,20 @@
 # Run the tests and make sure they pass
 sub run_tests {
 	print "Running tests...";
+	chdir("tests");
+
+	my ($fileh, $rtn);
+	
+	$rtn = open($fileh, "-|", "./TestRunner.pl AllTests.pm 2>&1");
+	die "Failed to start tests" unless $rtn;
+	while (<$fileh>) {
+		if (/^Test was not successful\.$/) {
+			die "Tests did not pass, aborting.\nUse the --notest option if you want to release anyway";
+		}
+	}
+	close $fileh;
+	
+	chdir($cwd);
 	print "Done\n";
 }
 
@@ -246,8 +270,8 @@
 	do {system($cmd) == 0 or die "Command failed $?";} unless $NO;
 
 	# Copy the Changelog across
-	system ("mv $cwd/ChangeLog lxr-$version") == 0
-	  or die "Couldn't copy ChangeLog";
+	do {system ("mv $cwd/ChangeLog lxr-$version") == 0
+		  or die "Couldn't copy ChangeLog"; } unless $NO;
 	
 	$cmd = "$TARBIN -czvf lxr-$version.tgz lxr-$version > /dev/null 2>&1";
 
@@ -268,13 +292,31 @@
 	my ($tag, $version) = @_;
 
 	print "Creating changelog...";
-	my $cmd = "cvs2cl -T --gmt";
+	my $cmd = "cvs2cl -T --gmt > /dev/null 2>&1";
 	system($cmd) == 0 or die "Couldn't execute cvs2cl";
 
 	print "Done\n";
 }
 	
+## Upload the release to the SF servers
+# Uses the rsync over SSH protocol
+
+sub upload_release {
+	my ($tag, $version) = @_;
+
+	print "Uploading to SF...";
+	chdir("..");
+	
+	my $cmd = "rsync -a -e ssh lxr-$version.tgz ".'mb...@fr...:uploads/';
 
+	print "[Not executing]" if $NO;
+	print "   $cmd\n";
+
+	do {system($cmd) == 0 or die "Couldn't upload";} unless $NO;
+
+	chdir($cwd);
+	print "Done\n";
+}
 
 	
 

[Lxr-commits] CVS: lxr-tools makerelease.pl,NONE,1.1

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16436

Added Files:
	makerelease.pl 
Log Message:


--- NEW FILE: makerelease.pl ---
#!/usr/bin/perl -w

# Make a release of the LXR tool. Steps are:
# - Run all the tests & ensure they pass
# - Tag the release in CVS with a tag of the form release-x-y-z (e.g. release-0-9-4)
# - Export the tagged files to a new directory lxr-x-y-z
# - Create the Changelog: can use cvs2cl.pl script
# - tar up the files
# - upload to SF servers
# - upload new changelog
# - send release notification
# - Update the tracker version numbers (bugs etc) so defects can be reported

# First establish environment - cwd is head of lxr tree etc, release tag etc

use strict;
use Getopt::Long;

my %option;
my $NO;
my $cwd = `pwd`;
chomp $cwd;
my $CVSBIN = 'cvs';
my $CVS_EXPORT = 'cvs -d:ext:mb...@lx...:/cvsroot/lxr';
my $TARBIN = 'tar';


GetOptions(\%option, "help!", "tag=s", "noex");

if ($option{'help'}) {
	print <<END_HELP;

Usage: makerelease [--tag=<tagname>] [--options]

Interactively releases the LXR project to SourceForge.

Script will tag the repository, create the release tarballs, then
upload tarball and changelog to SourceForge.

Must be run from the top-level directory of the lxr module (i.e. where
the "source" and "INSTALL" files are found).

Note this relies on administrator rights to the LXR project, and no
password SSH login to the SF cvs servers.

Options:
  --noex          Do not do any action that alters SF state (useful for
                  seeing what will happen)
  --tag           Use the supplied string as the release tag name

END_HELP

	  exit 0;
}

if ($option{'noex'}) {
	$NO = 1;
}

my $tag;

check_environment();
run_tests();
$tag = tag_release();
my $version = $tag;
$version =~ s/release-(\d+)-(\d+)-(\d+)/$1\.$2\.$3/;
create_changelog($tag, $version);
create_release_tarball($tag, $version);
upload_release($version);
upload_changelog($version);
send_release_notification($version);

exit 1;


sub get_tags() {
	# Get all tags known for the lxr module
	my $fileh;
	
	my $rtn = open($fileh, "-|", "$CVSBIN rlog lxr 2>&1");
	die ("Couldn't start CVS rlog") unless $rtn;
	my %tags;
	my $matching = 0;
	
	while (<$fileh>) {
		if (m/^symbolic names:$/) {
			$matching = 1;
		}
		if (m/^keyword sub/) {
			$matching = 0;
		}
		if ($matching && m/^\s([\w\-]+):\s[0-9]\./) {
			$tags{$1} = 1;
		}
	}
	return keys(%tags);
}

sub tag_to_val {
	my $tag = shift;
	my ($major, $minor, $point) = 0;
	
	if ($tag =~ m/release-(\d+)-(\d+)-(\d+)/) {
		$major = $1;
		$minor = $2;
		$point = $3;
	}

	return ($major, $minor, $point);
}

sub make_release_tag {
	my ($major, $minor, $point) = @_;
	$tag = "release-".$major."-".$minor."-".$point;

	return $tag;
}
	
sub get_last_release_tag() {
	# Find last release tag
	# Release tags of form release-X-Y-Z

	my @tags = get_tags();
	my $lasttag;
	my $lastmajor = 0;
	my $lastminor = 0;
	my $lastpoint = 0;
	my ($maj, $min, $p);
	$maj = $min = $p = 0;
	
	foreach (@tags) {
		($maj, $min, $p) = tag_to_val($_);
		
		if ($maj > $lastmajor) {
			$lasttag = $_;
			$lastmajor = $maj;
			$lastminor = $min;
			$lastpoint = $p;
		} elsif ($maj == $lastmajor && $min > $lastminor) {
			$lasttag = $_;
			$lastmajor = $maj;
			$lastminor = $min;
			$lastpoint = $p;
		} elsif ($maj == $lastmajor && $lastminor == $min && $p > $lastpoint) {
			$lasttag = $_;
			$lastmajor = $maj;
			$lastminor = $min;
			$lastpoint = $p;
		}
	}
	
	return $lasttag;
}

# Check environment for sanity

sub check_environment {
	print "Checking environment...";
	
	if(! -e $cwd."/lib/LXR" || ! -e $cwd."/Local.pm") {
		print "$cwd does not appear to be a top-level LXR directory\n";
		print "Continue in this directory [y/N]:";
		my $in = <STDIN>;
		chomp $in;
		die "Exiting" unless $in =~ /^[Yy]/;
	}
	print "Done\n";
}

# Run the tests and make sure they pass
sub run_tests {
	print "Running tests...";
	print "Done\n";
}

# Tag the release in the repository
sub tag_release {
	my $lasttag;
	my $nexttag;

	print "Tagging repository...\n";
	
	# Check for release tag argument, or work out sensible tag
	if (!$option{'tag'}) {
		$lasttag = get_last_release_tag();
		my ($mj, $min, $p) = tag_to_val($lasttag);
		$nexttag = make_release_tag($mj, $min, $p+1);
		
		print "Tag as \"$nexttag\" (last was \"$lasttag\").\n Enter to accept, or type new tag:";
		
		my $in = <STDIN>;
		chomp $in;
		$nexttag = $in if $in;
	}
	else {
		$nexttag = $option{'tag'};
	}

	# Now tag
	my $cmd = "$CVSBIN tag -cR $nexttag 2>&1";
	print "[Not executing]" if $NO;
	print "   $cmd\n";
	my ($fileh, $rtn);
	if (! $NO) {
		$rtn = open($fileh, "-|", $cmd);
		die "Couldn't execute $cmd" unless $rtn;
		
		while (<$fileh>) {
			if (m/\[tag aborted\]/) {
				die "Local files don't match repository, aborting!\n";
			}
		}

		close $fileh;
	}

	print "Done\n";
	
	return $nexttag;
}

## Create the release tarball - export the tagged version and tar up

sub create_release_tarball {
	my $tag = shift;
	my $version = shift;

	print "Creating release tarball...\n";

	# Check for pre-existing directories
	if (-e "../lxr-$version") {
		die "Directory ../lxr-$version already exists, won't overwrite";
	}

	if (-e "../lxr-$version.tgz") {
		die "Tarfile ../lxr-$version.tgz already exists, won't overwrite";
	}
	
	# Export from CVS
	chdir('..');
	
	my $cmd = "$CVS_EXPORT export -R -r $tag -d lxr-$version lxr > /dev/null 2>&1";
	print "[Not executing]" if $NO;
	print "   $cmd\n";

	do {system($cmd) == 0 or die "Command failed $?";} unless $NO;

	# Copy the Changelog across
	system ("mv $cwd/ChangeLog lxr-$version") == 0
	  or die "Couldn't copy ChangeLog";
	
	$cmd = "$TARBIN -czvf lxr-$version.tgz lxr-$version > /dev/null 2>&1";

	print "[Not executing]" if $NO;
	print "   $cmd\n";

	do {system($cmd) == 0 or die "Command failed $!"; } unless $NO;

	chdir($cwd);
	
	print "Done\n";
}


## Create changelog for publishing

sub create_changelog {
	my ($tag, $version) = @_;

	print "Creating changelog...";
	my $cmd = "cvs2cl -T --gmt";
	system($cmd) == 0 or die "Couldn't execute cvs2cl";

	print "Done\n";
}
	


	

[Lxr-commits] CVS: lxr/lib/LXR/Files CVS.pm,1.34,1.35

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Files
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11218/lib/LXR/Files

Modified Files:
	CVS.pm 
Log Message:
Fix bug [ 1111786 ] Failure to open file not detected

Fix as per defect report - check return status from open() rather than filehandle


Index: CVS.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Files/CVS.pm,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- CVS.pm	4 Apr 2006 22:23:47 -0000	1.34
+++ CVS.pm	24 Mar 2009 20:04:23 -0000	1.35
@@ -173,9 +173,11 @@
 	$clean_filename = $1;    # technically untaint here (cleanstring did the real untainting)
 
 	$ENV{'PATH'} = $self->{'path'};
-	open($fileh, "-|", "co -q -p$rev $clean_filename");
+	my $rtn;
+	$rtn = open($fileh, "-|", "co -q -p$rev $clean_filename");
+
+	die("Error executing \"co\"; rcs not installed?") unless $rtn;
 
-	die("Error executing \"co\"; rcs not installed?") unless $fileh;
 	return $fileh;
 }
 

[Lxr-commits] CVS: lxr/tests BKTest.pm,1.2,1.3 README,1.2,1.3

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr/tests
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv10945

Modified Files:
	BKTest.pm README 
Log Message:
Update to account for move of test repository to lxr-tools


Index: BKTest.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/BKTest.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- BKTest.pm	2 Nov 2005 23:39:55 -0000	1.2
+++ BKTest.pm	24 Mar 2009 20:02:12 -0000	1.3
@@ -16,9 +16,9 @@
 
 use vars qw($bkpath $bkrefdir $bkcache	);
 
-$bkpath   = getcwd() . "/bk-test-repository";
-$bkrefdir = getcwd() . "/bk-reference-files/";
-$bkcache  = getcwd() . "/bk-cache-dir";
+$bkpath   = getcwd() . "../../lxr-tools/test-data/bk-test-repository";
+$bkrefdir = getcwd() . "../../lxr-tools/test-data/bk-reference-files/";
+$bkcache  = getcwd() . "../../lxr-tools/test-data/bk-cache-dir";
 
 sub new {
 	my $self = shift()->SUPER::new(@_);

Index: README
===================================================================
RCS file: /cvsroot/lxr/lxr/tests/README,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- README	9 Apr 2006 23:07:50 -0000	1.2
+++ README	24 Mar 2009 20:02:12 -0000	1.3
@@ -4,7 +4,9 @@
 - Execute TestRunner.pl AllTests
 
 Note: If you wish to run the Bitkeeper tests you will need to:
-- untar the bk-test-repository.tgz file
+- Grab the lxr-tools module from CVS to the same top-level as the lxr tree
+(so you have /mydir/lxr and /mydir/lxr-tools)
+- untar the bk-test-repository.tgz file in lxr-tools/test-data
 - uncomment the BKTest line in AllTests.pm
 
 

[Lxr-commits] CVS: lxr-tools/test-data bk-test-repository.tgz, 1.2, 1.3

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11490

Added Files:
	bk-test-repository.tgz 
Log Message:
Adding as binary

[Lxr-commits] CVS: lxr-tools/test-data bk-test-repository.tgz, 1.1.1.1, NONE

[Malcolm B. <mb...@us...>]

Update of /cvsroot/lxr/lxr-tools/test-data
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv11406

Removed Files:
	bk-test-repository.tgz 
Log Message:

Not added as binary


--- bk-test-repository.tgz DELETED ---