lxr-commits — Don't use, CVS commits

[Lxr-commits] CVS: html/prototype/LxrConf lxrconfglobparms.shtml, 1.4, 1.5

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/prototype/LxrConf
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13023/prototype/LxrConf

Modified Files:
	lxrconfglobparms.shtml 
Log Message:
*/LxrConf/lxrconfglobparms.shtml: add 'parenticon' parameter

Index: lxrconfglobparms.shtml
===================================================================
RCS file: /cvsroot/lxr/html/prototype/LxrConf/lxrconfglobparms.shtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lxrconfglobparms.shtml	3 Nov 2012 21:07:08 -0000	1.4
+++ lxrconfglobparms.shtml	18 Mar 2013 08:46:34 -0000	1.5
@@ -53,6 +53,7 @@
 
 , 'iconfolder'   => <em>directory_for_custom_file_icons</em>       # 0.10+
 , 'diricon'      => <em>icon_for_directories</em>                  # 0.10+
+, 'parenticon'   => <em>icon_for-parent_directory</em>             # 1.2+
 , 'defaulticon'  => <em>default_icon_for_files</em>                # 0.10+
 , 'icons'        => <em>association_between_file_extension_and_icon</em> # 0.10+
 , 'graphicfile'  => <em>extensions_of_graphic_files</em>

[Lxr-commits] CVS: html/en/LxrConf lxrconfglobparms.shtml,1.4,1.5

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/en/LxrConf
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13023/en/LxrConf

Modified Files:
	lxrconfglobparms.shtml 
Log Message:
*/LxrConf/lxrconfglobparms.shtml: add 'parenticon' parameter

Index: lxrconfglobparms.shtml
===================================================================
RCS file: /cvsroot/lxr/html/en/LxrConf/lxrconfglobparms.shtml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- lxrconfglobparms.shtml	3 Nov 2012 21:07:08 -0000	1.4
+++ lxrconfglobparms.shtml	18 Mar 2013 08:46:34 -0000	1.5
@@ -53,6 +53,7 @@
 
 , 'iconfolder'   => <em>directory_for_custom_file_icons</em>       # 0.10+
 , 'diricon'      => <em>icon_for_directories</em>                  # 0.10+
+, 'parenticon'   => <em>icon_for-parent_directory</em>             # 1.2+
 , 'defaulticon'  => <em>default_icon_for_files</em>                # 0.10+
 , 'icons'        => <em>association_between_file_extension_and_icon</em> # 0.10+
 , 'graphicfile'  => <em>extensions_of_graphic_files</em>

[Lxr-commits] CVS: html/backstore footer.shtml,1.2,1.3

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/backstore
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8123/backstore

Modified Files:
	footer.shtml 
Log Message:
backstore/footer.shtml: Upgrade for Piwik 1.11.x

Index: footer.shtml
===================================================================
RCS file: /cvsroot/lxr/html/backstore/footer.shtml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- footer.shtml	19 May 2012 10:53:37 -0000	1.2
+++ footer.shtml	15 Mar 2013 11:19:38 -0000	1.3
@@ -39,21 +39,24 @@
 
 <!-- Piwik -->
 <script type="text/javascript">
-var pkBaseURL = (("https:" == document.location.protocol) ? "https://sourceforge.net/apps/piwik/lxr/" : "http://sourceforge.net/apps/piwik/lxr/");
-document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-		var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", 1);
-		piwikTracker.trackPageView();
-		piwikTracker.enableLinkTracking();
-	} catch( err ) {}
+  var _paq = _paq || [];
+  _paq.push(["trackPageView"]);
+  _paq.push(["enableLinkTracking"]);
+
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://lxr.sourceforge.net/lxrpax/";
+    _paq.push(["setTrackerUrl", u+"piwik.php"]);
+    _paq.push(["setSiteId", "1"]);
+    var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";
+    g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);
+  })();
 </script>
+<!-- End Piwik Code -->
 <noscript>
-	<p><img src="http://sourceforge.net/apps/piwik/lxr/piwik.php?idsite=1" style="border:0" alt="">
-	</p>
+<!-- Piwik Image Tracker -->
+	<img src="http://lxr.sourceforge.net/lxrpax/piwik.php?idsite=1&amp;rec=1" style="border:0" alt="" />
+<!-- End Piwik -->
 </noscript>
-<!-- End Piwik Tag -->
 
 </body>
 </html>
\ No newline at end of file

[Lxr-commits] CVS: html/fr/1-0-InstallSteps 1-0-install3config.shtml, 1.7, 1.8

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/fr/1-0-InstallSteps
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv26205/fr/1-0-InstallSteps

Modified Files:
	1-0-install3config.shtml 
Log Message:
General revision for 1.1 and 1.2 features and procedures

Index: 1-0-install3config.shtml
===================================================================
RCS file: /cvsroot/lxr/html/fr/1-0-InstallSteps/1-0-install3config.shtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- 1-0-install3config.shtml	3 Jan 2013 11:07:03 -0000	1.7
+++ 1-0-install3config.shtml	14 Mar 2013 18:21:54 -0000	1.8
@@ -73,6 +73,106 @@
 Vous n'avez pas besoin d'écrire le choix sélectionné en entier,
 tapez juste assez de caractères pour rendre la réponse non ambiguë.
 					</p>
+					<ul class="version">
+						<li>Version 1.1 et supérieures
+							<p class="comment">
+Configurer le serveur web demandant un soin particulier,
+les questions suivantes visent à faciliter cette tâche.
+							</p>
+<pre class="shell">
+<samp>Configure for single/multiple trees? [S/m] ></samp>
+</pre>
+							<p class="normal caution">
+Important! 
+C'est le seul choix que vous ne pourrez pas changer ultérieurement
+car il configure le serveur web d'une façon non triviale.
+							</p>
+							<p class="normal">
+Répondez <code>S</code> si vous ne proposerez jamais qu'un seul arbre
+(si vous changez d'idée à ce sujet,
+vous serez contraint de recommencer de zéro
+avec l'effacement de la base de données en cours de création).
+C'est néanmoins un choix idéal pour un premier essai.
+					</p>
+					<p class="normal">
+Répondez <code>M</code> si vous avez l'intention d'ajouter un autre arbre
+dans un avenir indéfini.
+							</p>
+<pre class="shell">
+<samp>Do you intend to add other trees later? [yes/NO] ></samp>
+</pre>
+							<p class="comment">
+Cette question offre la possibilité de corriger une erreur de choix.
+Supposons que le choix par défaut <code>S</code> était le bon.
+							</p>
+							<p class="normal">
+Traiter l'arbre source correct demande un codage spécifique de l'URL.
+LXR a été conçu pour désigner le service LXR après le nom d'hôte,
+puis l'arbre voulu.
+							</p>
+							<p class="normal">
+Si les pages du serveur viennent uniquement de LXR,
+le nom de service (habituellement <code>/lxr</code>) peut être omis.
+							</p>
+							<p class="comment">
+Ceci correspond au cas d'un site entièrement dédié à LXR
+(cas 1 et 3 ci-dessous).
+							</p>
+							<p class="normal">
+En contexte d'arbre unique,
+il n'est pas besoin de désigner l'arbre.
+							</p>
+							<p class="comment">
+Ceci supprime la question ultérieure sur la racine virtuelle.
+							</p>
+<pre class="shell">
+<samp>*** LXR web server configuration ***
+
+LXR can be configured as the default server (the only service in your computer),
+a section of this default server or an independent server (with its own
+host name).
+Refer to the User's Manual for a description of the differences.
+Web server type? [1.DEFAULT
+/2.section in default
+/3.indepedent
+/4.section in indepedent
+] > </samp><kbd>2</kbd>
+</pre>
+							<p class="normal">
+Choisissez <code>1</code> (réponse par défaut) pour le cas le plus simple
+ou <code>2</code> pour ne pas écraser un server local existant.
+							</p>
+<pre class="shell">
+<samp>The computer hosting the server is described by an URL.
+The form is scheme://host_name:port
+where:
+  - scheme is either http or https (http: can be omitted),
+  - host_name can be given as an IP address such as 123.45.67.89
+              or a domain name like localhost or lxr.url.example,
+  - port may be omitted if standard for the scheme.
+The following question asks for a primary URL. Later, you'll have
+the opportunity to give aliases to this primary URL.
+--- Host name or IP? [//localhost] ></samp>
+</pre>
+							<p class="normal">
+Le serveur local par défaut s'appelle généralement <code>//localhost</code>,
+tapez alors "retour chariot".
+							</p>
+<pre class="shell">
+<samp>URL section name for LXR in your server? [/lxr] ></samp>
+</pre>
+							<p class="normal">
+C'est le nom sous lequel le service LXR sera requis par l'URL.
+							</p>
+							<p class="comment">
+<span class="attention">ATTENTION!</span><br>
+Si vous répondez <code>/</code>,
+vous revenez aux cas 1 ou 3 sans aucun avertissement.
+Ceci peut entraîner de sérieux dysfonctionnements dans votre server
+web existant.
+							</p>
+						</li>
+					</ul>
 <pre class="shell">
 <samp>The choice of the database engine can make a difference in indexing performance,
 but resource consumption is also an important factor.
@@ -88,41 +188,44 @@
     cross-referencing) where it is fastest at the cost of bigger
     databases.
   * Take also in consideration the number of connected users.</samp>
-<samp>Database engine? [MYSQL/oracle/postgres/sqlite] </samp> 
+<samp>Database engine? [MYSQL/oracle/postgres/sqlite] ></samp> 
 </pre>
 					<p class="normal">
 Sélectionnez la base de données en fonction de la politique de votre site
 ou de ses disponibilités.
 					</p>
+					<ul class="version">
+						<li>Version 1.0
 <pre class="shell">
-<samp>Configure for single/multiple trees? [S/m]  </samp>
+<samp>Configure for single/multiple trees? [S/m] ></samp>
 </pre>
-					<p class="normal caution">
+							<p class="normal caution">
 Important! 
 C'est le seul choix que vous ne pourrez pas changer ultérieurement
 car il configure le serveur web d'une façon non triviale.
-					</p>
-					<p class="normal">
-
+							</p>
+							<p class="normal">
 Répondez <code>S</code> si vous ne proposerez jamais qu'un seul arbre
 (si vous changez d'idée à ce sujet,
 vous serez contraint de recommencer de zéro
 avec l'effacement de la base de données en cours de création).
 C'est néanmoins un choix idéal pour un premier essai.
-					</p>
-					<p class="normal">
+							</p>
+							<p class="normal">
 Répondez <code>M</code> si vous avez l'intention d'ajouter un autre arbre
 dans un avenir indéfini.
-					</p>
+							</p>
 <pre class="shell">
-<samp>Do you intend to add other trees later? [yes/NO] </samp>
+<samp>Do you intend to add other trees later? [yes/NO] ></samp>
 </pre>
-					<p class="comment">
+							<p class="comment">
 Cette question offre la possibilité de corriger une erreur de choix.
 Supposons que le choix par défaut <code>S</code> était le bon.
-					</p>
+							</p>
+						</li>
+					</ul>
 <pre class="shell">
-<samp>--- Directory for glimpse databases? </samp><kbd>/home/myself/glimpse_DB</kbd>
+<samp>--- Directory for glimpse databases? ></samp><kbd>/home/myself/glimpse_DB</kbd>
 </pre>
 					<p class="normal">
 Le script de configuration a détecté le moteur de recherche en plein texte
@@ -135,8 +238,25 @@
 assurez-vous qu'il peut être lu par <em>"tout le monde"</em>.
 					</p>
 <pre class="shell">
-<samp>templates directory templates/ now protected read-only
-file .htaccess written into LXR root directory
+<samp>templates directory templates/ now protected read-only</samp>
+</pre>
+					<ul class="version">
+						<li>Version 1.1 et supérieures
+<pre class="shell">
+<samp>Is your Apache version 2.4 or higher? [YES/no] ></samp>
+</pre>
+							<p class="normal">
+Comme les contrôles d'accès ont changé entre Apache 2.2 et 2.4,
+il est nécessaire de connaître quelle version est utilisée sur votre ordinateur
+pour configurer correctement les fichiers d'accès d'Apache.
+							</p>
+							<p class="comment">
+N'importe quelle réponse est valable si vous n'utilisez pas Apache.
+							</p>
+						</li>
+					</ul>
+<pre class="shell">
+<samp>file .htaccess written into LXR root directory
 file apache2-require.pl written into configuration directory
 file apache-lxrserver.conf written into configuration directory
 file lighttpd-lxrserver.conf written into configuration directory</samp>
@@ -151,17 +271,57 @@
 
 *** Configuring auxiliary tool paths
 *** Configuring host name or IP (as http://...)</samp>
-<samp>--- Host name? </samp><kbd>//localhost</kbd>
-<samp>--- Alias name ? (hit return to stop) </samp><kbd>//mycomputer.example.com</kbd>
-<samp>--- Alias name ? (hit return to stop)</samp>
+<samp>--- Host name? ></samp><kbd>//localhost</kbd>
+</pre>
+					<ul class="version">
+						<li>Version 1.1 et supérieures
+<pre class="shell">
+<samp>*** Host name previously defined as //localhost</samp>
+</pre>
+					<p class="comment">
+Cette ligne rappelle le nom d'hôte
+que vous avez défini plus haut pendant la configuration du serveur web.
+					</p>
+						</li>
+						<li>Version 1.0
+<pre class="shell">
+<samp>--- Host name? ></samp><kbd>//localhost</kbd>
+</pre>
+							<p class="normal">
+Donnez le nom d'hôte principal.
+							</p>
+						</li>
+					</ul>
+<pre class="shell">
+<samp>--- Alias name ? (hit return to stop) ></samp><kbd>//mycomputer.example.com</kbd>
+<samp>--- Alias name ? (hit return to stop) ></samp>
 </pre>
 					<p class="normal">
-Donnez le nom d'hôte principal et autant d'alias (éventuellement aucun)
-que de besoin.
+Donnez autant d'alias (éventuellement aucun) que de besoin.
 					</p>
 <pre class="shell">
 <samp>*** Configuring HTML parameters
-*** Configuring file subsection
+</pre>
+					<ul class="version">
+						<li>Version 1.1 et supérieures
+<pre class="shell">
+<samp>'Buttons-and-menus' interface is recommended for the kernel
+*** to avoid screen cluttering.
+--- Use 'buttons-and-menus' instead of 'link' interface? [YES/no] ></samp>
+</pre>
+							<p class="normal">
+L'interface <em>boutons-et-menus</em> présente une mise en page plus dense
+que l'interface <em>lien</em> traditionnel.
+Il est vivement recommandé dans les situations
+où l'arbre source a beaucoup de versions ou,
+comme dans le cas du noyau Linux,
+lorsqu'une forme de contrôle de configuration est réalisée
+à l'aide de nombreuses variables auxiliaires LXR.
+							</p>
+						</li>
+					</ul>
+<pre class="shell">
+<samp>*** Configuring file subsection
 *** Configuring "common factors"
 *** Marking tree section</samp>
 </pre>
@@ -175,23 +335,38 @@
 
 *** Configuring LXR server parameters
 *** The virtual root is the fixed URL part after the hostname.</samp>
-<samp>--- Virtual root? (i.e. URL part after host) [/lxr]</samp>
 </pre>
-					<p class="normal">
+					<ul class="version">
+						<li>Version 1.1 et supérieures
+<pre class="shell">
+<samp>*** You previously defined the virtual root as /lxr</samp>
+</pre>
+					<p class="comment">
+Cette ligne rappelle la racine virtuelle
+implicite ou définie plus haut pendant la configuration du serveur web.
+					</p>
+						</li>
+						<li>Version 1.0
+<pre class="shell">
+<samp>--- Virtual root? (i.e. URL part after host) [/lxr] ></samp>
+</pre>
+							<p class="normal">
 La réponse par défaut construit un URL <code>http://localhost/lxr</code>.
 Si vous rangez votre serveur LXR à la racine de votre site,
 pour être accédé comme <code>http://localhost</code>, la réponse doit être
 <code>/</code> et non pas vide
 (ce qui sélectionnerait par défaut <code>/lxr</code>).
-					</p>
+							</p>
+						</li>
+					</ul>
 <pre class="shell">
-<samp>--- Caption in page header? (e.g. Project XYZZY displayed by LXR) </samp><kbd>LXR first trial</kbd>
+<samp>--- Caption in page header? (e.g. Project XYZZY displayed by LXR) ></samp><kbd>LXR first trial</kbd>
 </pre>
 					<p class="normal">
 Ceci définit le titre dans la zone d'en-tête de chaque page.
 					</p>
 <pre class="shell">
-Do you need a specific encoding for this tree ? [yes/NO] 
+<samp>Do you need a specific encoding for this tree ? [yes/NO] ></samp>
 </pre>
 					<p class="normal">
 Le codage par défaut est <code>UTF-8</code>.
@@ -202,7 +377,7 @@
 <samp>*** Describing tree location
 How is your tree stored? [FILES/cvs/git/subversion/bitkeeper]
 *** A source directory contains one sub-directory for every version.</samp>
-<samp>--- Source directory? (e.g. /home/myself/project-tree) </samp><kbd>/home/myself/my-project</kbd>
+<samp>--- Source directory? (e.g. /home/myself/project-tree) ></samp><kbd>/home/myself/my-project</kbd>
 </pre>
 					<p class="normal">
 Faites votre premier essai sur un arbre résidant dans des vrais fichiers et répertoires
@@ -219,7 +394,7 @@
 même si vous n'avez qu'une seule version.
 					</p>
 <pre class="shell">
-<samp>Name to display for the path root? (e.g. Project or $v for version) [$v]</samp>
+<samp>Name to display for the path root? (e.g. Project or $v for version) [$v] ></samp>
 </pre>
 					<p class="normal">
 Ceci est un raccourci du chemin du répertoire soure dans un nom complet de fichier
@@ -232,11 +407,11 @@
 *** Versions can be explicitly enumerated, be read from a file or computed
 *** by a function. The latter case is recommended for VCS-stored trees.
 Version enumeration method? [LIST/file/function]</samp>
-<samp>--- Version name? (hit return to stop) </samp><kbd>v1</kbd>
-<samp>--- Version name? (hit return to stop)</samp>
+<samp>--- Version name? (hit return to stop) ></samp><kbd>v1</kbd>
+<samp>--- Version name? (hit return to stop) ></samp>
 <samp>*** By default, first version in list is displayed. You may also indicate
 *** a prefered version.</samp>
-<samp>--- Default displayed version is first in 'range'? [YES/no]</samp>
+<samp>--- Default displayed version is first in 'range'? [YES/no] ></samp>
 </pre>
 					<p class="normal">
 Indiquez à LXR les versions figurant dans le répertoire source.
@@ -256,7 +431,7 @@
 --- Directory to ignore, e.g. CVSROOT or .git? (hit return to stop) 
 *** If your source code uses "include" statements (#include, require, ...)
 *** LXR needs hints to resolve the destination file.
---- Include directory, e.g. /include? (hit return to stop)</samp>
+--- Include directory, e.g. /include? (hit return to stop) ></samp>
 </pre>
 					<p class="normal">
 Laissez de côté ces questions pour un arbre simple.
@@ -265,16 +440,15 @@
 					</p>
 <pre class="shell">
 <samp>*** Configuring data storage</samp>
-<samp>--- Database name? </samp><kbd>lxr_myproject</kbd>
-<samp>--- DB user name? [lxr] 
---- DB password? [lxrpw] 
---- DB table prefix? [lxr_]</samp>
+<samp>--- Database name? ></samp><kbd>lxr_myproject</kbd>
+<samp>--- DB user name? [lxr] >
+--- DB password? [lxrpw] >
+--- DB table prefix? [lxr_] ></samp>
 
 <samp>configuration saved in custom.d/t
 DB initialisation sript is custom.d/initdb.sh</samp>
 </pre>
 					<p class="normal">
-
 Donnez un nom à la base de données selon les règles de votre site.
 De toute façon, il est toujours sage qu'il soit unique,
 à moins que vous définissiez la base en tant que jeu de tables particulier
@@ -314,6 +488,20 @@
 avant de les créer,
 de façon qu'il puisse être relancé n'importe quand dans un état cohérent.
 					</p>
+					<p class="comment caution">
+ATTENTION!<br>
+Il vaut néanmoins mieux détruire ce script dès qu'il a été utiliséc
+car le script <em>configure-lxr.pl</em> ajoute toujours son
+résultat au bout de <em>initdb.sh</em> sans l'effacer
+(ce comportement permet de fractionner une configuration en arbres multiples
+en plusieurs sessions
+et de ne lancer qu'une seule fois l'initialisation de la base données
+à la fin du processus).
+Ne pas le détruire conserve toutes les créations antérieures de base de données.
+Quand le script est relancé,
+les nouvelles bases de données sont créées
+et les anciennes recréées, entraînant la perte de leur contenu.
+					</p>
 				</li>
 				<li>Copiez <code>lxr.conf</code> à son emplacement final
 					<p class="normal">

[Lxr-commits] CVS: lxr/lib/LXR/Lang Generic.pm, 1.39, 1.40 Java.pm, 1.9, 1.10 Perl.pm, 1.11, 1.12 Python.pm, 1.7, 1.8 Ruby.pm, 1.2, 1.3

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR/Lang
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv19685/lib/LXR/Lang

Modified Files:
	Generic.pm Java.pm Perl.pm Python.pm Ruby.pm 
Log Message:
Generic.pm, Java.pm, Perl.pm, Python.pm, Ruby.pm: fix include file processing

Fix for bug #231 (Java parser enters infinite loop when scanning "import static ..."): add optional static keyword in regexp for splitting include fragment.
While fixing this bug, a patch was needed on the "multi-directory path" handling because the trigger test was incorrect (testing for definedness on $link instead of an existing <a> HTML tag).
This fix is intended for 1.1.0->1.1.1 release, but the include feature will be rearchitectured for 1.2.0 because readability is poor.

Index: Generic.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Generic.pm,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- Generic.pm	21 Sep 2012 17:07:17 -0000	1.39
+++ Generic.pm	11 Mar 2013 16:11:42 -0000	1.40
@@ -372,6 +372,7 @@
 	my $m;			# matching pattern
 	my $s;			# substitution string
 	my $link;		# link to include file
+	my $tail;		# lower-lever links after current $link
 	my $identdef = $self->langinfo('identdef');
 
 	my $incspec = $self->langinfo('include');
@@ -461,18 +462,31 @@
 		$path    = $file;
 		$rsep    = $6 . $9;
 	}
-	$link = &LXR::Common::incref($file, "include" ,$path ,$dir);
-	if (defined($link)) {
-		while ($file =~ m!/!) {
-			$link =~ s!^([^>]+>)([^/]*/)+?([^/<]+<)!$1$3!;
-			$file =~ s!/[^/]*$!!;
+	$link = &LXR::Common::incref($file, "include", $path, $dir);
+	if (!defined($link)) {
+		$tail = $file if $path !~ m!/!;
+	}
+	# incref above did not return a link to the file.
+	# Explore however the path to see if directories are
+	# known along the way.
+	while	(	$path =~ m!/!
+			&&	substr($link, 0, 1) ne '<'
+			) {
+		$file =~ s!(/[^/]*)$!!; # BUG: incorrect if sparator not /
+		$tail = $1 . $tail;
+		$path =~ s!/[^/]+$!!;
+		$link = &LXR::Common::incdirref($file, "include", $path, $dir);
+	}
+	# A known directory (at least) has been found.
+	# Build links to higher path elements
+	if (substr($link, 0, 1) eq '<') {
+		while ($path =~ m!/!) {
+			$link =~ s!^([^>]+>)([^/]*/)+?([^/<]+<)!$1$3!; # BUG: incorrect if sparator not /
+			$tail = '/' . $link . $tail;
+			$file =~ s!/[^/]*$!!; # BUG: incorrect if sparator not /
 			$path =~ s!/[^/]+$!!;
-			$link = &LXR::Common::incdirref($file, "include", $path, $dir)
-					. "/"
-					. $link ;
+			$link = &LXR::Common::incdirref($file, "include", $path, $dir);
 		}
-	} else {
-		$link = $file;
 	}
 
 	# Rescan the tail for more "code" constructs
@@ -485,6 +499,7 @@
 				)
 			.	$spacer . $lsep
 			.	$link
+			.	$tail
 			.	$rsep
 }
 

Index: Java.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Java.pm,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Java.pm	21 Nov 2012 15:08:48 -0000	1.9
+++ Java.pm	11 Mar 2013 16:11:42 -0000	1.10
@@ -66,7 +66,7 @@
 	# "import java.awt.classname" by providing links to the
 	# package and the class
 	elsif ($source =~ s/^
-				(import\s+)
+				(import\s+(?:static\s+)?)
 				([\w.]+)	# package 'path'
 				\.(\*|\w+)	# class or *
 				//sx) {
@@ -88,10 +88,7 @@
 
 		# Assemble the highlighted bits
 		$$frag =	"<span class='reserved'>$dirname</span>"
-				.	( defined($link)
-					? $link
-					: $file
-					);
+				.	$link;
 }
 
 sub _packagelinks {
@@ -99,18 +96,34 @@
 
 	my $link = &LXR::Common::incdirref
 				($file, "include", $path, $dir);
-	if (defined($link)) {
+		# Now iteratively pop the last part of the path to
+		# build direct links to the corresponding sub-directory.
+	my $tail;
+
+		# Part 1: there is not yet a link in the path,
+		#		  try to find a known directory.
+	while	(	$file =~ m!\.!
+			&&	substr($link, 0, 1) ne '<'
+			) {
+		$file =~ s!(\.[^.]*)$!!;
+		$tail = $1 . $tail;
+		$path =~ s!/[^/]+$!!;
+		$link = &LXR::Common::incdirref($file, "include", $path, $dir);
+	}
+
+		# Part 2: the path leads to a known file/directory,
+		#		  build now links to higher path elements.
+	if (substr($link, 0, 1) eq '<') {
 		while ($file=~m!\.!) {
 			$link =~ s!^([^>]+>)([^.]*\.)+?([^.<]+<)!$1$3!;
+			$tail = '.' . $link . $tail;
 			$file =~ s!\.[^.]*$!!;
 			$path =~ s!/[^/]+$!!;
 			$link = &LXR::Common::incdirref($file, "include", $path, $dir)
-					. "."
-					. $link ;
 		}
-	} else {
-		$link = $file;
 	}
+
+	$link .= $tail;
 	return $link;
 }
 

Index: Perl.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Perl.pm,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Perl.pm	21 Nov 2012 15:08:48 -0000	1.11
+++ Perl.pm	11 Mar 2013 16:11:43 -0000	1.12
@@ -73,6 +73,7 @@
 	my $file;		# language include file
 	my $path;		# OS include file
 	my $link;		# link to include file
+	my $tail;		# lower-lever links after current $link
 
 	# Faster surrogate for 'directive'
 	if ($source =~ s/^		# reminder: no initial space in the grammar
@@ -92,18 +93,30 @@
 
 		# Create the hyperlinks
 		$link = &LXR::Common::incref($file, "include", $path, $dir);
-		if (defined($link)) {
+		if (!defined($link)) {
+			$tail = $file if $path !~ m!/!;
+		}
+		# incref above did not return a link to the file.
+		# Explore however the path to see if directories are
+		# known along the way.
+		while	(	$file =~ m!::!
+				&&	substr($link, 0, 1) ne '<'
+				) {
+			$file =~ s!(::[^:]*)$!!;
+			$tail = $1 . $tail;
+			$path =~ s!/[^/]+$!!;
+			$link = &LXR::Common::incdirref($file, "include", $path, $dir);
+		}
+		if (substr($link, 0, 1) eq '<') {
 			while ($file =~ m!::!) {
 				$link =~ s!^([^>]+>)([^:]*::)+!$1!;
+				$tail = '::' . $link . $tail;
 				$file =~ s!::[^:]*$!!;
 				$path =~ s!/[^/]+$!!;
-				$link = &LXR::Common::incdirref($file, "include" ,$path ,$dir)
-						. "::"
-						. $link ;
+				$link = &LXR::Common::incdirref($file, "include" ,$path ,$dir);
 			}
-		} else {
-			$link = $file;
 		}
+		$link .= $tail;
 	} elsif ($source =~ s/^	# reminder: no initial space in the grammar
 					([\w]+	# reserved keyword for include construct
 					\s+)	#   and space in same capture
@@ -121,19 +134,27 @@
 
 		# Create the hyperlinks
 		$link = &LXR::Common::incref($file, "include", $path, $dir);
-		if (defined($link)) {
+		if (!defined($link)) {
+			$tail = $file if $path !~ m!/!;
+		}
+		while	(	$file =~ m!/!
+				&&	substr($link, 0, 1) ne '<'
+				) {
+			$file =~ s!(/[^/]*)$!!;
+			$tail = $1 . $tail;
+			$path =~ s!/[^/]+$!!;
+			$link = &LXR::Common::incdirref($file, "include", $path, $dir);
+		}
+		if (substr($link, 0, 1) eq '<') {
 			while ($file =~ m!/!) {
 				$link =~ s!^([^>]+>)([^/]*/)+!$1!;
+				$tail = '/' . $link . $tail;
 				$file =~ s!/[^/]*$!!;
 				$path =~ s!/[^/]+$!!;
-				$link = &LXR::Common::incdirref($file, "include" ,$path ,$dir)
-						. "/"
-						. $link ;
+				$link = &LXR::Common::incdirref($file, "include" ,$path ,$dir);
 			}
-		} else {
-			$link = $file;
 		}
-		$link = $delim . $link . $delim;
+		$link = $delim . $link . $tail . $delim;
 	} else {
 		# Guard against syntax error or variant
 		# Advance past keyword, so that parsing may continue without loop.

Index: Python.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Python.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Python.pm	21 Nov 2012 15:08:48 -0000	1.7
+++ Python.pm	11 Mar 2013 16:11:43 -0000	1.8
@@ -24,7 +24,7 @@
 
 =head1 Perl language module
 
-This module is the Perl language highlighting engine.
+This module is the Python language highlighting engine.
 
 It shares most of its methods with I<Generic.pm>.
 It only overrides C<processinclude> for efficiency.
@@ -73,6 +73,7 @@
 	my $file;		# language include file
 	my $path;		# OS include file
 	my $link;		# link to include file
+	my $tail;		# lower-lever links after current $link
 
 	# Faster surrogate for 'directive'
 	if ($source !~ s/^		# reminder: no initial space in the grammar
@@ -114,23 +115,32 @@
 		# Erase last path separator from <a> link to enable
 		# following partial path processing.
 		# NOTE: this creates a dependency of link structure from incref!
-		if (substr($link, 0, 3) eq '<a ') {
+		if (substr($link, 0, 1) eq '<') {
 			$link =~ s!/">!">!;
-		} else {
-			$link = undef;
 		}
 	}
-	if (defined($link)) {
+	while	(	$file =~ m!\.!
+			&&	substr($link, 0, 1) ne '<'
+			) {
+		$file =~ s!(\.[^.]*)$!!;
+		$tail = $1 . $tail;
+		$path =~ s!/[^/]+$!!;
+		$link = &LXR::Common::incdirref($file, "include", $path, $dir);
+	}
+	if (substr($link, 0, 1) eq '<') {
 		while ($file =~ m!\.!) {
 			$link =~ s!^([^>]+>)([^.]*\.)+?([^.<]+<)!$1$3!;
+			$tail = '.' . $link . $tail;
 			$file =~ s!\.[^.]*$!!;
 			$path =~ s!/[^/]+$!!;
-			$link = &LXR::Common::incdirref($file, "include", $path, $dir)
-					. "."
-					. $link ;
+			$link = &LXR::Common::incdirref	( $file, "include", $path, $dir)
 		}
 	} else {
-		$link = join('.', map {$self->processcode(\$_)} split(/\./, $file));
+		$link = join	( '.'
+						, map {$self->processcode(\$_)}
+							split(/\./, $link.$tail)
+						);
+		$tail = '';
 	}
 
 	# As a goodie, rescan the tail of import/from for Python code
@@ -138,10 +148,8 @@
 
 	# Assemble the highlighted bits
 	$$frag =	"<span class='reserved'>$dirname</span>"
-			.	( defined($link)
-				? $link
-				: $file
-				);
+			.	$link
+			.	$tail;
 }
 
 1;

Index: Ruby.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Lang/Ruby.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Ruby.pm	17 Sep 2012 12:15:43 -0000	1.2
+++ Ruby.pm	11 Mar 2013 16:11:43 -0000	1.3
@@ -43,6 +43,7 @@
 	my $lsep;		# left separator
 	my $rsep;		# right separator
 	my $link;		# link to include file
+	my $tail;		# lower-lever links after current $link
 	my $identdef = $self->langinfo('identdef');
 
 	if ($source =~ s/^				# Parse instruction
@@ -69,24 +70,47 @@
 
 	$path =~ s@(?<!\.rb)$@.rb@;
 	$link = &LXR::Common::incref($file, "include" ,$path ,$dir);
-	if (defined($link)) {
-		while ($file =~ m!/!) {
-			$link =~ s!^([^>]+>)([^/]*/)+!$1!g;
+	if (!defined($link)) {
+		$tail = $file if $path !~ m!/!;
+	}
+	while	(	$file =~ m!/!
+			&&	substr($link, 0, 1) ne '<'
+			) {
+		$file =~ s!(/[^/]*)$!!;
+		$tail = $1 . $tail;
+		$path =~ s!/[^/]+$!!;
+		$link = &LXR::Common::incdirref($file, "include", $path, $dir);
+	}
+	if (substr($link, 0, 1) eq '<') {
+		while ($path =~ m!/!) {
+			$link =~ s!^([^>]+>)([^/]*/)+?!$1!;
+			$tail = '/' . $link . $tail;
 			$file =~ s!/[^/]*$!!;
 			$path =~ s!/[^/]+$!!;
-			$link = &LXR::Common::incdirref($file, "include", $path, $dir)
-					. "/"
-					. $link ;
+			$link = &LXR::Common::incdirref($file, "include", $path, $dir);
 		}
-	} else {
-		$link = $file;
 	}
+# 	if (defined($link)) {
+# 		while ($file =~ m!/!) {
+# 			$link =~ s!^([^>]+>)([^/]*/)+!$1!g;
+# 			$file =~ s!/[^/]*$!!;
+# 			$path =~ s!/[^/]+$!!;
+# 			$link = &LXR::Common::incdirref($file, "include", $path, $dir)
+# 					. "/"
+# 					. $link ;
+# 		}
+# 	} else {
+# 		$link = $file;
+# 	}
+	# Rescan the unused part of the source line
+	&LXR::SimpleParse::requeuefrag($source);
+
 	$$frag =	"<span class='reserved'>$dirname</span>"
 			.	$spacer
 			.	$lsep
 			.	$link
-			.	$rsep
-			. $source;
+			.	$tail
+			.	$rsep;
 }
 
 1;

[Lxr-commits] CVS: html/fr index.shtml,1.8,1.9

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/fr
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv22245/fr

Modified Files:
	index.shtml 
Log Message:
Tell 1.1.0 is in the demo

Index: index.shtml
===================================================================
RCS file: /cvsroot/lxr/html/fr/index.shtml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- index.shtml	24 Jan 2013 19:36:30 -0000	1.8
+++ index.shtml	26 Jan 2013 09:44:19 -0000	1.9
@@ -144,7 +144,7 @@
 		</li>
 		<li>Démo: l'arbre LXR indexé et référencé par LXR lui-même
 			<p class="comment">
-Les versions 0.9.8 à 1.0 peuvent être affichées et comparées.
+Les versions 0.9.8 à 1.1 peuvent être affichées et comparées.
 			</p>
 			<p class="comment">
 La démo présente deux variantes d'arbre:

[Lxr-commits] CVS: lxr/doc CHANGES, 1.4, 1.5 CREDITS.txt, 1.2, 1.3 INSTALL, 1.1, 1.2

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/doc
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv10188/doc

Modified Files:
	CHANGES CREDITS.txt INSTALL 
Log Message:
doc/*: update shipping documentation before release

Index: CHANGES
===================================================================
RCS file: /cvsroot/lxr/lxr/doc/CHANGES,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- CHANGES	21 Nov 2012 17:16:14 -0000	1.4
+++ CHANGES	25 Jan 2013 14:43:43 -0000	1.5
@@ -4,6 +4,16 @@
         LXR 1.0  -->  LXR 1.1
         ======================
 
+Easy upgrade
+------------
+Since the database definition did not change between 1.0 and 1.1,
+you can upgrade without reconfiguring not reindexing.
+1/ Save lxr.conf and other customised files (mainly apache-lxrserver.conf
+   and lighttpd-lxrserver.conf)
+2/ Install the new release.
+3/ Reload lxr.conf and other saved customised files
+4/ Restart your web server
+
 User'Manual
 -----------
 Updated to reflect new 1.1 features; separately downloadable on SourceFourge.
@@ -11,7 +21,14 @@
 
 Installation
 ------------
-No change, instructions for 1.0 still valid
+Few user-visible changes, instructions for 1.0 still valid
+Better web server configuration taking into account the way are described
+in lxr.conf
+Configuration can disable free-text search if no search engine is detected,
+allowing to test LXR without the burden of installing a text search engine
+Script configure-lxr.pl modified so that all (configuration) templates are
+processed the same. Extended macro language (now called LCL) well defined
+and made easily readable.
 
 Directory and file view, identifier cross-references
 ----------------------------------------------------
@@ -36,6 +53,17 @@
 ----------------
 Ant, asm, Fortran, Java, JavaScript, Make, Pascal, PHP, SQL enabled
 
+Mercurial.pm: NEW NEW NEW
+-------------
+Experimental support for Mercurial VCS.
+Repository restricted to directory in the local file system, no network
+access allowed.
+Note: this preliminary implementation runs horribly sloooooooow on directory
+====| listing (rougly 0.5 seconds per line). The problem lies in function
+    | getdir(). Though it is similar to Subversion's, it does not run with
+    | the expected speed.
+    | Please send suggestions for improvement.
+
         ======================
         LXR 0.11  -->  LXR 1.0
         ======================

Index: CREDITS.txt
===================================================================
RCS file: /cvsroot/lxr/lxr/doc/CREDITS.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- CREDITS.txt	22 Sep 2012 13:08:14 -0000	1.2
+++ CREDITS.txt	25 Jan 2013 14:43:43 -0000	1.3
@@ -31,9 +31,10 @@
 Patrick Gerlier <pag...@ya...>			en & fr User's manual
 Andre-Littoz <ajl...@us...>			Website
 	"						Config scripts, genxref "POST" checks
+	"						Interactive configurator
 	"						Revised INSTALL document
 	"						Directory re-org
-	"						Git & Subversion backends
+	"						Git, Mercurial & Subversion backends
 	"						SQLite backend & many DB patches
 
 

Index: INSTALL
===================================================================
RCS file: /cvsroot/lxr/lxr/doc/INSTALL,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- INSTALL	22 Sep 2012 13:08:14 -0000	1.1
+++ INSTALL	25 Jan 2013 14:43:43 -0000	1.2
@@ -531,7 +531,7 @@
 of both first  - your question may already have been answered.
 
 By web:    http://lxr.sf.net/
-By web:    http://sf.net/projects/lxr/forums/forum/861451
+By web:    http://sf.net/p/lxr/discussion/?source=navbar
 By email:  Send a mail to lxr...@li...
 
 

[Lxr-commits] CVS: html/prototype index.shtml, 1.6, 1.7 newfeatures.shtml, 1.12, 1.13

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/prototype
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3661/prototype

Modified Files:
	index.shtml newfeatures.shtml 
Log Message:
Update for last minute 1.1 features
Fix links to bug tracker, feature request and discussion (changed when switching from "Classic" to "Allura")

Index: index.shtml
===================================================================
RCS file: /cvsroot/lxr/html/prototype/index.shtml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- index.shtml	24 Nov 2012 13:23:14 -0000	1.6
+++ index.shtml	24 Jan 2013 19:36:31 -0000	1.7
@@ -124,11 +124,11 @@
 			<p class="comment">
 Please report any inaccuracy, error or misunderstanding
 on the project site
-(<a href="http://sourceforge.net/projects/lxr/forums/forum/86144">forum</a> is suited for comments,
+(<a href="http://sourceforge.net/p/lxr/discussion">forum</a> is suited for comments,
 errors should be filed in the
-<a href="http://sourceforge.net/tracker/?atid=390117&amp;group_id=27350&amp;func=browse">bug tracker</a>
+<a href="http://sourceforge.net/p/lxr/bugs">bug tracker</a>
 and you may even ask for
-<a href="http://sourceforge.net/tracker/?atid=390118&amp;group_id=27350&amp;func=browse">feature request</a>
+<a href="http://sourceforge.net/p/lxr/feature-requests">feature request</a>
 if a topic is missing)
 			</p>
 		</li>

Index: newfeatures.shtml
===================================================================
RCS file: /cvsroot/lxr/html/prototype/newfeatures.shtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- newfeatures.shtml	21 Jan 2013 10:28:51 -0000	1.12
+++ newfeatures.shtml	24 Jan 2013 19:36:31 -0000	1.13
@@ -49,6 +49,14 @@
 only the most common cases are covered.
 Read the User's Manual for the necessary checks.
 				</p>
+				<p class="normal">
+Configurator can disable free-text search if neither <strong>Glimpse</strong>
+nor <strong>Swish-E</strong> is detected.
+This allows to have a try with LXR without the pain of installing
+a text search engine.
+Of course, the feature becomes unavailable
+until you install one and update <em>lxr.conf</em>.
+				</p>
 			</li>
 			<li class="classics">Experimental <strong>Mercurial</strong> support added
 				<p class="normal">
@@ -61,6 +69,8 @@
 and directory listing runs horribly slow.
 Suggestions for improvement are welcome.
 			</li>
+			<li class="classics">New version of the <em>User's Manual</em>
+			</li>
 			<li class="classics">Bug fixes
 				<p class="normal">
 Among these,

[Lxr-commits] CVS: html/en index.shtml, 1.7, 1.8 newfeatures.shtml, 1.12, 1.13

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/en
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3661/en

Modified Files:
	index.shtml newfeatures.shtml 
Log Message:
Update for last minute 1.1 features
Fix links to bug tracker, feature request and discussion (changed when switching from "Classic" to "Allura")

Index: index.shtml
===================================================================
RCS file: /cvsroot/lxr/html/en/index.shtml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- index.shtml	3 Jan 2013 11:07:03 -0000	1.7
+++ index.shtml	24 Jan 2013 19:36:30 -0000	1.8
@@ -122,11 +122,11 @@
 			<p class="comment">
 Please report any inaccuracy, error or misunderstanding
 on the project site
-(<a href="http://sourceforge.net/projects/lxr/forums/forum/86144">forum</a> is suited for comments,
+(<a href="http://sourceforge.net/p/lxr/discussion">forum</a> is suited for comments,
 errors should be filed in the
-<a href="http://sourceforge.net/tracker/?atid=390117&amp;group_id=27350&amp;func=browse">bug tracker</a>
+<a href="http://sourceforge.net/p/lxr/bugs">bug tracker</a>
 and you may even ask for
-<a href="http://sourceforge.net/tracker/?atid=390118&amp;group_id=27350&amp;func=browse">feature request</a>
+<a href="http://sourceforge.net/p/lxr/feature-requests">feature request</a>
 if a topic is missing)
 			</p>
 		</li>

Index: newfeatures.shtml
===================================================================
RCS file: /cvsroot/lxr/html/en/newfeatures.shtml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- newfeatures.shtml	21 Jan 2013 10:28:51 -0000	1.12
+++ newfeatures.shtml	24 Jan 2013 19:36:30 -0000	1.13
@@ -49,6 +49,14 @@
 only the most common cases are covered.
 Read the User's Manual for the necessary checks.
 				</p>
+				<p class="normal">
+Configurator can disable free-text search if neither <strong>Glimpse</strong>
+nor <strong>Swish-E</strong> is detected.
+This allows to have a try with LXR without the pain of installing
+a text search engine.
+Of course, the feature becomes unavailable
+until you install one and update <em>lxr.conf</em>.
+				</p>
 			</li>
 			<li class="classics">Experimental <strong>Mercurial</strong> support added
 				<p class="normal">
@@ -61,6 +69,8 @@
 and directory listing runs horribly slow.
 Suggestions for improvement are welcome.
 			</li>
+			<li class="classics">New version of the <em>User's Manual</em>
+			</li>
 			<li class="classics">Bug fixes
 				<p class="normal">
 Among these,

[Lxr-commits] CVS: html/en/Tips tipnotextsearch.shtml,NONE,1.1

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/en/Tips
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv3661/en/Tips

Added Files:
	tipnotextsearch.shtml 
Log Message:
Update for last minute 1.1 features
Fix links to bug tracker, feature request and discussion (changed when switching from "Classic" to "Allura")

--- NEW FILE: tipnotextsearch.shtml ---
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
<!-- $Id: tipnotextsearch.shtml,v 1.1 2013/01/24 19:36:30 ajlittoz Exp $ -->
<html>
<!--#set var="pageLang" value="en" -->
<head>
	<meta http-equiv="content-type" content="text/html; charset=UTF-8">
	<meta http-equiv="Content-Language" content="<!--#echo var="pageLang" -->">
	<title>Running LXR without Free-text Search</title>
	<link rel="stylesheet" type="text/css" href="/backstore/LXRweb.css">
	<link rel="icon" type="image/x-icon" href="/backstore/LXRlogo2.ico">
</head>

<body>
  <!--#set var="pageHeaderTitle" value="Running LXR without Free-text Search" -->
  <!--#set var="homePageHeader" value="0" -->
  <!--#include virtual="/backstore/header.shtml" -->
	<p class="comment">
As part of configuration verification,
LXR always checks that one free-text search engine has been defined.
This implies you must install one with all the related trouble.
This could not be worth the pain
when you only want to have a try on LXR.
	</p>
	<p class="comment">
The following tip tells how to cheat LXR into believing a free-text
search engine is available.
	</p>

	<h2>Case 1: initial configuration (1.0 and higher)</h2>
	<p class="comment">
This is the usual case when you install LXR for the first time on a system
without free-text search engine.
	</p>
	<p class="normal">
Launch script <em>configure-lxr.pl</em> from your <em>LXR root directory</em>.
	</p>
<pre class="shell">
<samp>$ </samp><kbd>cd <em>/LXR/root/directory</em></kbd>
<samp>$ </samp><kbd>./scripts/configure-lxr.pl --verbose</kbd>
<samp>*** LXR configurator (version: x.y) ***

LXR root directory is <em>/home/myself/lxr</em>
Configuration will be stored in <em>custom.d/lxr.conf</em>
</samp></pre>
	<p class="normal">
The script proceeds with database configuration,
then discovers it cannot reach any free-text search engine.
This usually means the free-text search engines have been installed
in non-system directories.
The script asks for the location
and puts it into configuration parameters
so that it may later be referenced.
	</p>
	<p>
With adequate answers,
the free-text search feature can be disabled without disturbing LXR operation.
	</p>
<pre class="shell">
<samp>Error: neither glimpse nor swish-e found in $PATH!
Is your source tree stored in a VCS repository? (yes/NO) </samp><kbd>y</kbd>
<samp>Since free-text search is not compatible with VCSes, you can continue</samp></pre>
	<p class="normal">
You can safely answer <code>Y</code> in all circumstances.
	</p>
	<p class="normal">
If your tree is indeed in a VCS repository,
this is the expected answer
since free-text search is not compatible with VCS storage.
	</p>
	<p class="normal">
If it is made of plain files,
it is also safe because this answer is independent from the later questions
about your tree characteristics.
No internal inconsistency will result from this apparent contradiction.
But you may also give the real (or default) answer
then confirm the search engine does not exist:
	</p>
<pre class="shell">
<samp>Error: neither glimpse nor swish-e found in $PATH!
Is your source tree stored in a VCS repository? (yes/NO)
Does one of them exist in a non standard directory? (YES/no) </samp><kbd>n</kbd>
<samp>Sorry: free-text search disabled</samp></pre>
	<p class="normal">
Configuration then proceeds as usual.
	</p>
	<p class="comment">
With such a configuration,
free-text search will always silently return zero results.
"Silently" means you get no warning nor reminder for disabling the engine.
	</p>

	<h2>Case 2: later change or previous releases</h2>
	<p class="comment">
This manual procedure is used on an active LXR
when you remove the free-text search engine
(because finally you do not need the feature)
or after you reconfigure your computer
(<em>e.g.</em> after a system upgrade without reloading the free-text search engine).
	</p>
	<p class="normal">
Open configuration file <em>lxr.conf</em> with your favorite editor.
Locate the parameter related to your free-text search engine in
<em>Auxiliary tools subsection</em>
(either <code>'glimpsebin'</code> or <code>'swishbin'</code>)
and change its value to <code>'/bin/true'</code>:
	</p>
<pre class="example">
, 'glimpsebin'    => '/bin/true'
</pre>
	<p class="normal">
or
	</p>
<pre class="example">
, 'swishbin'      => '/bin/true'
</pre>
	<p class="normal">
If parameters <code>'glimpsedirbase'</code> or <code>'swishdirbase'</code>
have not been initialized,
give them a "neutral" value,
an existing write-enabled directory.
For lack of an adequate directory,
you can use <em>/tmp</em>.
But, when installing later a text search engine,
do not forget to give them a real value.
	</p>
<pre class="example">
, 'glimpsedirbase'  => '/tmp'
</pre>
	<p class="normal">
or
	</p>
<pre class="example">
, 'swishdirbase'    => '/tmp'
</pre>

<!--#include virtual="/backstore/footer.shtml" -->

[Lxr-commits] CVS: lxr search,1.49,1.50

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv17058

Modified Files:
	search 
Log Message:
search, Template.pm, templates/lxr.css & classic.css: prevent access to free-text search when disabled

Free-text search is disabled when there is no search engine or when tree is stored in VCS

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- search	23 Jan 2013 16:29:05 -0000	1.49
+++ search	24 Jan 2013 15:09:52 -0000	1.50
@@ -594,11 +594,11 @@
 makeheader('search');
 if ($files->isa("LXR::Files::Plain")) {
 	if	(	$config->{'glimpsebin'}
-			&& $config->{'glimpsebin'} =~ m!$(.*/)?true$!
+			&& $config->{'glimpsebin'} =~ m!^(.*/)?true$!
 		||	$config->{'swishbin'}
-			&& $config->{'swishbin'} =~ m!$(.*/)?true$!
+			&& $config->{'swishbin'} =~ m!^(.*/)?true$!
 		) {
-		print "<h2 class='error'>Free-text search disabled in configuration!</h2>\n";
+		print "<h2 class='error'>Free-text search disabled by configuration file!</h2>\n";
 	} else {
 		&search;
 	}

[Lxr-commits] CVS: lxr/scripts configure-lxr.pl,1.12,1.13

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23875/scripts

Modified Files:
	configure-lxr.pl 
Log Message:
scripts/configure-lxr.pl: error on comparison operator

Use eq instead of == for string comparison

Index: configure-lxr.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/scripts/configure-lxr.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- configure-lxr.pl	22 Jan 2013 16:59:52 -0000	1.12
+++ configure-lxr.pl	23 Jan 2013 16:48:48 -0000	1.13
@@ -253,7 +253,7 @@
 		print "\n";
 	}
 	contextServer ($verbose);
-	if ('c' == $virtrootpolicy) {
+	if ('c' eq $virtrootpolicy) {
 		print "${VTyellow}Reminder:${VTnorm} do not forget to implement your management in the following files:\n";
 		print "- ${confdir}/${VTbold}apache-lxrserver.conf${VTnorm} if using Apache,\n";
 		print "- ${confdir}/${VTbold}lighttpd-lxrserver.conf${VTnorm} if using lighttpd,\n";

[Lxr-commits] CVS: lxr search,1.48,1.49

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv23005

Modified Files:
	search 
Log Message:
search: Issue a warning when free-text search disabled in lxr.conf

Index: search
===================================================================
RCS file: /cvsroot/lxr/lxr/search,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- search	21 Nov 2012 13:30:16 -0000	1.48
+++ search	23 Jan 2013 16:29:05 -0000	1.49
@@ -593,7 +593,15 @@
 httpinit;
 makeheader('search');
 if ($files->isa("LXR::Files::Plain")) {
-	&search;
+	if	(	$config->{'glimpsebin'}
+			&& $config->{'glimpsebin'} =~ m!$(.*/)?true$!
+		||	$config->{'swishbin'}
+			&& $config->{'swishbin'} =~ m!$(.*/)?true$!
+		) {
+		print "<h2 class='error'>Free-text search disabled in configuration!</h2>\n";
+	} else {
+		&search;
+	}
 } else {
 	print "<h2 class='error'>Free-text search not available with VCSs!</h2>\n";
 }

[Lxr-commits] CVS: lxr/scripts ContextMgr.pm, 1.2, 1.3 configure-lxr.pl, 1.11, 1.12 recreatedb.pl, 1.6, 1.7

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8775/scripts

Modified Files:
	ContextMgr.pm configure-lxr.pl recreatedb.pl 
Log Message:
scripts/configure-lxr.pl, recreatedb.pl, ContextMgr.pm: manage some web server context and configuration

Index: ContextMgr.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/scripts/ContextMgr.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ContextMgr.pm	21 Jan 2013 10:49:36 -0000	1.2
+++ ContextMgr.pm	22 Jan 2013 16:59:52 -0000	1.3
@@ -49,6 +49,7 @@
 	&contextSave
 	&contextTrees
 	&contextDB
+	&contextServer
 );
 
 	# Single/multiple operation
@@ -106,24 +107,80 @@
 			print "Delete or rename file $ctxtfile to remove lock.\n";
 			exit 1;
 		}
-		if ($context_created != $context_version) {
-			print "${VTred}ERROR:${VTnorm} saved context file probably too old!\n";
+		if ($context_created > $context_version) {
+			print "${VTyellow}WARNING:${VTnorm} saved context file created with newer version!\n";
 			print "Recorded state version = $context_created while expecting version = $context_version\n";
-			print "It is wise to 'quit' now and add manually the new tree or reconfigure from scratch.\n";
-			print "You can however try to restore the initial context at your own risk.\n";
-			print "\n";
-			print "${VTyellow}WARNING:${VTnorm} inconsistent answers can lead to LXR malfunction.\n";
+			if ($context_version != $context_created - 1) {
+				print "${VTred}ERROR:${VTnorm}Contexts are too different to continue.\n";
+				exit 1;
+			}
+			print "Context are maintained compatible as much as possible.\n";
+			print "You may try to continue at your own risk.\n";
 			print "\n";
 			if ('q' eq get_user_choice
-				( 'Do you want to quit or manually restore context?'
+				( 'Do you want to quit or tentatively continue?'
 				, 1
-				, [ 'quit', 'restore' ]
-				, [ 'q', 'r' ]
+				, [ 'quit', 'continue' ]
+				, [ 'q', 'c' ]
 				) ) {
 				exit 1;
 			}
-			$reloadstatus = 1;
-		};
+		}
+		if ($context_created < $context_version) {
+			print "${VTred}ERROR:${VTnorm} saved context file too old!\n";
+			print "Recorded state version = $context_created while expecting version = $context_version\n";
+			if ($context_version == $context_created + 1) {
+				print "It is possible to upgrade the context (without saving it),\n";
+				print "but without any guarantee.\n";
+				print "Note also that templates may have changed and\n";
+				print "no longer be compatible with your configuration files.\n";
+				print "\n";
+				print "${VTyellow}WARNING:${VTnorm} inconsistent answers can lead to LXR malfunction.\n";
+				print "\n";
+				if ('q' eq get_user_choice
+					( 'Do you want to quit or try to upgrade context?'
+					, 1
+					, [ 'quit', 'upgrade' ]
+					, [ 'q', 'u' ]
+					) ) {
+					exit 1;
+					}
+				print "\n";
+				print "Previous configuration was made for:\n";
+				print "- ";
+				if ('m' eq $cardinality) {
+					print "multiple trees";
+				} else {
+					print "single tree";
+				}
+				print "\n";
+				print "- ";
+				if ('t' eq $dbpolicy) {
+					print "per tree";
+				} else {
+					print "global";
+				}
+				print " database\n";
+				print "\n";
+				contextServer (2);
+				print "\n";
+			} else {
+				print "It is wise to 'quit' now and add manually the new tree or reconfigure from scratch.\n";
+				print "You can however try to restore the initial context at your own risk.\n";
+				print "\n";
+				print "${VTyellow}WARNING:${VTnorm} inconsistent answers can lead to LXR malfunction.\n";
+				print "\n";
+				if ('q' eq get_user_choice
+					( 'Do you want to quit or manually restore context?'
+					, 1
+					, [ 'quit', 'restore' ]
+					, [ 'q', 'r' ]
+					) ) {
+					exit 1;
+				}
+				$reloadstatus = 1;
+			}
+		}
 
 		if ($dbpolicy eq 't') {
 			print "Your DB engine was: ${VTbold}";
@@ -215,7 +272,7 @@
 		if ($nodbprefix) {
 			print DEST "\$nodbprefix = 1;\n";
 		} else {
-			print DEST "\$dbprefix = '$dbprefix'\n";
+			print DEST "\$dbprefix = '$dbprefix';\n";
 		}
 	# Set added in version 2
 		print DEST "\$servertype = '$servertype';\n";
@@ -388,4 +445,120 @@
 }
 
 
+##############################################################
+#
+#				Describe web server context
+#
+##############################################################
+
+sub contextServer {
+	my ($verbose) = @_;
+
+	if ($verbose > 1) {
+		print "LXR can be configured as the default server (the only service in your computer),\n";
+		print "a section of this default server or an independent server (with its own\n";
+		print "host name).\n";
+		print "Refer to the ${VTbold}User's Manual${VTnorm} for a description of the differences.\n";
+	}
+
+	$servertype = get_user_choice
+			( 'Web server type?'
+			, 1
+			,	[ "1.default\n"
+				, "2.section in default\n"
+				, "3.indepedent\n"
+				, "4.section in indepedent\n"
+				]
+			, [ 'D', 'DS', 'I', 'IS' ]
+			);
+	if ($verbose) {
+		print "The computer hosting the server is described by an URL.\n";
+		print "The form is scheme://host_name:port\n";
+	}
+	if ($verbose > 1) {
+		print "where:\n";
+		print "  - scheme is either http or https (http: can be omitted),\n";
+		print "  - host_name can be given as an IP address such as 123.45.67.89\n";
+		print "              or a domain name like localhost or lxr.url.example,\n";
+		print "  - port may be omitted if standard for the scheme.\n";
+		print "The following question asks for a primary URL. Later, you'll have\n";
+		print "the opportunity to give aliases to this primary URL.\n";
+	}
+	my $primaryhost;
+	while (!defined($primaryhost)) {
+		$primaryhost = get_user_choice
+			( '--- Host name or IP?'
+			, ('D' eq substr($servertype, 0, 1)) ? -1 : -2
+			, [ ]
+			, ('D' eq substr($servertype, 0, 1))
+				? [ '//localhost' ]
+				: [ ]
+			);
+		$primaryhost =~ m!^(https?:)?(//[^:]+)(?::(\d+))?!;
+		$scheme = $1;
+		$hostname = $2;
+		$port = $3;
+		$scheme = undef if 'http:' eq $scheme;
+		$port = 80  if !defined($1) && !defined($3);
+		$port = 443 if 'https:' eq $1 && !defined($3);
+		if (!defined($hostname)) {
+			print "${VTred}ERROR:${VTnorm} invalid host name or scheme, try again ...\n";
+			$primaryhost = undef;
+			next;
+		}
+		if	(	'I' eq substr($servertype, 0, 1)
+			&&	(	'//localhost' eq $hostname
+				||	'//127.0.0.1' eq $hostname
+				)
+			) {
+			print "You are configuring for an independent web server and you named it ${hostname},\n";
+			print "which is the common name for the default server\n";
+			if	( 'y' eq get_user_choice
+						( 'Do you want to change its name?'
+						, 1
+						, [ 'yes', 'no' ]
+						, [ 'y', 'n' ]
+						)
+				) {
+				$primaryhost = undef;
+			}
+		}
+	}
+
+
+	$virtrootbase = '';
+	if (1 < length($servertype)) {
+		$virtrootbase = get_user_choice
+				( 'URL section name for LXR in your server?'
+				, -1
+				, [ ]
+				, [ '/lxr' ]
+				);
+	}
+
+	if ('m' eq $cardinality) {
+		if (1 < $verbose) {
+			print "The built-in method to manage several trees with a single instance of LXR is to include\n";
+			print "a designation of the tree in the URL at the end of the section name.\n";
+			print "This sequence after host name is called \"virtual root\".\n";
+			print "Supposing one of your trees is to be referred as \"my-tree\", an URL to list the content\n";
+			print "of the default version directory would presently be:\n";
+			print "     ${VTyellow}${primaryhost}${virtrootbase}/${VTnorm}${VTbold}my-tree${VTyellow}/source${VTnorm}\n";
+			print "with virtual root equal to ${VTyellow}${virtrootbase}/my-tree${VTnorm}\n";
+			print "\n";
+		}
+		$virtrootpolicy = 'b';	# 'b' for built-in
+		if	('n' eq get_user_choice
+						( 'Use built-in multiple trees management with tree designation at end of virtual root?'
+						, 1
+						, [ 'yes', 'no' ]
+						, [ 'y', 'n' ]
+						)
+			) {
+			$virtrootpolicy = 'c';	# 'c' for custom
+		}
+	}
+}
+
+
 1;

Index: configure-lxr.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/scripts/configure-lxr.pl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- configure-lxr.pl	22 Jan 2013 11:20:25 -0000	1.11
+++ configure-lxr.pl	22 Jan 2013 16:59:52 -0000	1.12
@@ -69,6 +69,7 @@
 my $confdir = 'custom.d';
 my $rootdir = `pwd`;
 chomp($rootdir);
+my ($scriptdir) = $0 =~ m!([^/]+)/[^/]+$!;
 my $tmpldir = 'templates';
 my $verbose;
 my $confout;
@@ -153,7 +154,7 @@
 		. " ${VTred}$rootdir${VTnorm} does not exist!\n";
 	$error = 1;
 }
-if (! -d $rootdir.'/scripts') {
+if (! -d $rootdir.'/'.$scriptdir) {
 	print "${VTred}ERROR:${VTnorm} ${VTred}$rootdir${VTnorm} does not look "
 		. "like an LXR root directory (scripts directory not found)!\n";
 	$error = 1;
@@ -251,122 +252,21 @@
 		print "${VTyellow}***${VTnorm} ${VTred}L${VTblue}X${VTgreen}R${VTnorm} web server configuration ${VTyellow}***${VTnorm}\n";
 		print "\n";
 	}
-	if ($verbose > 1) {
-		print "LXR can be configured as the default server (the only service in your computer),\n";
-		print "a section of this default server or an independent server (with its own\n";
-		print "host name).\n";
-		print "Refer to the ${VTbold}User's Manual${VTnorm} for a description of the differences.\n";
-	}
-
-	$servertype = get_user_choice
-			( 'Web server type?'
-			, 1
-			,	[ "1.default\n"
-				, "2.section in default\n"
-				, "3.indepedent\n"
-				, "4.section in indepedent\n"
-				]
-			, [ 'D', 'DS', 'I', 'IS' ]
-			);
-	if ($verbose) {
-		print "The computer hosting the server is described by an URL.\n";
-		print "The form is scheme://host_name:port\n";
-	}
-	if ($verbose > 1) {
-		print "where:\n";
-		print "  - scheme is either http or https (http: can be omitted),\n";
-		print "  - host_name can be given as an IP address such as 123.45.67.89\n";
-		print "              or a domain name like localhost or lxr.url.example,\n";
-		print "  - port may be omitted if standard for the scheme.\n";
-		print "The following question asks for a primary URL. Later, you'll have\n";
-		print "the opportunity to give aliases to this primary URL.\n";
-	}
-	my $primaryhost;
-	while (!defined($primaryhost)) {
-		$primaryhost = get_user_choice
-			( '--- Host name or IP?'
-			, ('D' eq substr($servertype, 0, 1)) ? -1 : -2
-			, [ ]
-			, ('D' eq substr($servertype, 0, 1))
-				? [ '//localhost' ]
-				: [ ]
-			);
-		$primaryhost =~ m!^(https?:)?(//[^:]+)(?::(\d+))?!;
-		$scheme = $1;
-		$hostname = $2;
-		$port = $3;
-		$scheme = undef if 'http:' eq $scheme;
-		$port = 80  if !defined($1) && !defined($3);
-		$port = 443 if 'https:' eq $1 && !defined($3);
-		if (!defined($hostname)) {
-			print "${VTred}ERROR:${VTnorm} invalid host name or scheme, try again ...\n";
-			$primaryhost = undef;
-			next;
-		}
-		if	(	'I' eq substr($servertype, 0, 1)
-			&&	(	'//localhost' eq $hostname
-				||	'//127.0.0.1' eq $hostname
-				)
-			) {
-			print "You are configuring for an independent web server and you named it ${hostname},\n";
-			print "which is the common name for the default server\n";
-			if	( 'y' eq get_user_choice
-						( 'Do you want to change its name?'
-						, 1
-						, [ 'yes', 'no' ]
-						, [ 'y', 'n' ]
-						)
-				) {
-				$primaryhost = undef;
-			}
-		}
-	}
-
-
-	$virtrootbase = '';
-	if (1 < length($servertype)) {
-		$virtrootbase = get_user_choice
-				( 'URL section name for LXR in your server?'
-				, -1
-				, [ ]
-				, [ '/lxr' ]
-				);
-	}
-
-	if ('m' eq $cardinality) {
-		if (1 < $verbose) {
-			print "The built-in method to manage several trees with a single instance of LXR is to include\n";
-			print "a designation of the tree in the URL at the end of the section name.\n";
-			print "This sequence after host name is called \"virtual root\".\n";
-			print "Supposing one of your trees is to be referred as \"my-tree\", an URL to list the content\n";
-			print "of the default version directory would presently be:\n";
-			print "     ${VTyellow}${primaryhost}${virtrootbase}/${VTnorm}${VTbold}my-tree${VTyellow}/source${VTnorm}\n";
-			print "with virtual root equal to ${VTyellow}${virtrootbase}/my-tree${VTnorm}\n";
-			print "\n";
-		}
-		$virtrootpolicy = 'b';	# 'b' for built-in
-		if	('n' eq get_user_choice
-						( 'Use built-in multiple trees management with tree designation at end of virtual root?'
+	contextServer ($verbose);
+	if ('c' == $virtrootpolicy) {
+		print "${VTyellow}Reminder:${VTnorm} do not forget to implement your management in the following files:\n";
+		print "- ${confdir}/${VTbold}apache-lxrserver.conf${VTnorm} if using Apache,\n";
+		print "- ${confdir}/${VTbold}lighttpd-lxrserver.conf${VTnorm} if using lighttpd,\n";
+		print "- ${confdir}/${VTbold}${confout}${VTnorm} for parameter 'treeextract'.\n";
+		print "It is wise to thoroughly read the Web server chapter in the User's Manual.\n";
+		if	('s' eq get_user_choice
+						( 'Continue or stop?'
 						, 1
-						, [ 'yes', 'no' ]
-						, [ 'y', 'n' ]
+						, [ 'continue', 'stop' ]
+						, [ 'c', 's' ]
 						)
 			) {
-			print "${VTyellow}Reminder:${VTnorm} do not forget to implement your management in the following files:\n";
-			print "- custom.d/${VTbold}apache-lxrserver.conf${VTnorm} if using Apache,\n";
-			print "- custom.d/${VTbold}lighttpd-lxrserver.conf${VTnorm} if using lighttpd,\n";
-			print "- custom.d/${VTbold}${confout}${VTnorm} for parameter 'treeextract'.\n";
-			print "It is wise to thoroughly read the Web server chapter in the User's Manual.\n";
-			if	('s' eq get_user_choice
-							( 'Continue or stop?'
-							, 1
-							, [ 'continue', 'stop' ]
-							, [ 'c', 's' ]
-							)
-				) {
-				exit 0;
-			}
-			$virtrootpolicy = 'c';	# 'c' for custom
+			exit 0;
 		}
 	}
 }
@@ -828,9 +728,10 @@
 #	We suppose configure-lxr.pl has correct permissions, otherwise we
 #	can't bootstrap.
 chmod 0775, 'diff', 'genxref', 'ident', 'search', 'showconfig', 'source';
-chmod 0775, 'scripts/kernel-vars-grab.sh';
-chmod 0775, 'scripts/set-lxr-version.sh';
-chmod 0775, 'scripts/lighttps-init';
+chmod 0775, "${scriptdir}/kernel-vars-grab.sh";
+chmod 0775, "${scriptdir}/set-lxr-version.sh";
+chmod 0775, "${scriptdir}/recreatedb.pl";
+chmod 0775, "${scriptdir}/lighttpd-init";
 
 if ($verbose) {
 		print "configuration saved in ${VTbold}$confdir/$confout${VTnorm}\n";

Index: recreatedb.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/scripts/recreatedb.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- recreatedb.pl	21 Jan 2013 10:49:36 -0000	1.6
+++ recreatedb.pl	22 Jan 2013 16:59:52 -0000	1.7
@@ -23,7 +23,7 @@
 # $Id$
 
 use strict;
-use lib 'lib', 'scripts';
+use lib 'lib', do { $0 =~ m{(.*)/}; "$1" };
 use Fcntl;
 use Getopt::Long;
 use IO::Handle;
@@ -75,6 +75,7 @@
 my $confdir = 'custom.d';
 my $rootdir = `pwd`;
 chomp($rootdir);
+my ($scriptdir) = $0 =~ m!([^/]+)/[^/]+$!;
 my $tmpldir = 'templates';
 my $verbose;
 my $scriptout = 'initdb.sh';
@@ -161,7 +162,7 @@
 		. " ${VTred}$rootdir${VTnorm} does not exist!\n";
 	$error = 1;
 }
-if (! -d $rootdir.'/scripts') {
+if (! -d "$rootdir/$scriptdir") {
 	print "${VTred}ERROR:${VTnorm} ${VTred}$rootdir${VTnorm} does not look "
 		. "like an LXR root directory (scripts directory not found)!\n";
 	$error = 1;

[Lxr-commits] CVS: lxr/scripts configure-lxr.pl,1.10,1.11

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/scripts
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv18968/scripts

Modified Files:
	configure-lxr.pl 
Log Message:
scripts/configure-lxr.pl: correct typo in marker

Final % forgotten in %glimpsedirbase%

Index: configure-lxr.pl
===================================================================
RCS file: /cvsroot/lxr/lxr/scripts/configure-lxr.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure-lxr.pl	21 Jan 2013 16:35:03 -0000	1.10
+++ configure-lxr.pl	22 Jan 2013 11:20:25 -0000	1.11
@@ -556,7 +556,7 @@
 		} else {
 			print "${VTyellow}Sorry:${VTnorm} free-text search disabled\n";
 			$markers{'%glimpse%'} = '/bin/true';	# disable free-text search
-			$markers{'%glimpsedirbase'} = '/tmp';	# only to silence config check
+			$markers{'%glimpsedirbase%'} = '/tmp';	# only to silence config check
 		}
 	}
 

[Lxr-commits] CVS: lxr/lib/LXR Config.pm,1.56,1.57

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/lib/LXR
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13102/lib/LXR

Modified Files:
	Config.pm 
Log Message:
Config.pm: fix for bug #230, bad links when LXR at site root

Ensure 'virtroot' is not equal to '/'; set it to empty string if it would be

Index: Config.pm
===================================================================
RCS file: /cvsroot/lxr/lxr/lib/LXR/Config.pm,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- Config.pm	11 Jan 2013 17:35:51 -0000	1.56
+++ Config.pm	22 Jan 2013 09:39:28 -0000	1.57
@@ -265,7 +265,12 @@
 		my $virtroot = $config->{'virtroot'};
 		my $hits = $virtroot =~ s!/+$!!;	# ensure no ending /
 		$hits += $virtroot =~ s!^/*!/!;		# and a single starting /
-		if ($hits > 0) { $config->{'virtroot'} = $virtroot }
+		if ($hits > 0) {
+			$config->{'virtroot'} = $virtroot
+		}
+		if ('/' eq $virtroot) {				# special case: LXR at root
+			$config->{'virtroot'} = '';		# make sure no trouble on relative links
+		}
 		if (scalar(@hostnames)>0) {
 			foreach my $rt (@hostnames) {
 				$rt =~ s!/*$!!;		# remove trailing /

[Lxr-commits] CVS: lxr/templates/lighttpd lighttpd-lxrserver.conf, 1.9, 1.10

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/lighttpd
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv12992/templates/lighttpd

Modified Files:
	lighttpd-lxrserver.conf 
Log Message:
templates/lighttpd/lighttpd-lxrserver.conf: fix automatic configuration for standard cases

Macro expansion tuned for the "classic" cases handled by interactive configurator

Index: lighttpd-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lighttpd/lighttpd-lxrserver.conf,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- lighttpd-lxrserver.conf	22 Jan 2013 09:15:53 -0000	1.9
+++ lighttpd-lxrserver.conf	22 Jan 2013 09:36:40 -0000	1.10
@@ -457,36 +457,38 @@
 ##
 #ssi.extension += ( ".html" )
 
+# The following directive may cause conflict when LXR server is merged
+# with an existing server. Then remove it and keep the one describing
+# the real site root.
 	server.document-root = "%LXRroot%/"
-#	$HTTP["host"] == "host_name" {
-#		server.document-root = "%LXRroot%/"
-#	}
 
-## ------- URL black magic for multiple trees ------
+	$HTTP["host"] == "%hostname%" {
+		server.document-root = "%LXRroot%/"
+	}
+# Add more for alias names
+
+## ------- URL black magic for multiple trees and sub-siting ------
 ##
 ## Format is "virtroot" => "%LXRroot%"
 ## for all 'virtroot' to be served by the same LXR server
 ## located in the root directory.
 #@IF	%_singlecontext%
 #	$HTTP["url"] =~ "^%virtrootbase%/[^/]+/" {
-#		alias.url +=	("%virtrootbase%/tree1/" => "%LXRroot%/")
-#		alias.url +=	("%virtrootbase%/tree2/" => "%LXRroot%/")
-#		alias.url +=	("%virtrootbase%/tree3/" => "%LXRroot%/")
+#		alias.url +=	("%virtrootbase%/tree/" => "%LXRroot%/")
 #	}
 # 
-#@ELSE
-	$HTTP["url"] =~ "^%virtrootbase%/[^/]+/" {
+#@ENDIF
+#@IF	'' ne "%virtrootbase%"
+	$HTTP["url"] =~ "^%virtrootbase%/" {
 #@ENDIF
 #- - -
 #- - - Note: block below is interpreted during pass 2.
 #- - -
 #@PASS2 here_virtroot
-#@	IF	!%_singlecontext%
 		alias.url +=	("%virtroot%/" => "%LXRroot%/")
-#@	ENDIF
 #@ENDP2
 #- - - End of second pass additions
-#@IF	!%_singlecontext%
+#@IF	'' ne "%virtrootbase%"
 	}
 #@ENDIF
 

[Lxr-commits] CVS: lxr/templates/lighttpd lighttpd-lxrserver.conf, 1.8, 1.9

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/lighttpd
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11864/templates/lighttpd

Modified Files:
	lighttpd-lxrserver.conf 
Log Message:
templates/lighttpd/lighttpd-lxrserver.cong: discrepancy between config and script lighttpd-init

Script lighttpd-init puts/gets everything into/from /var/run/lighttpd, notably the pid file, while lighttpd-lxrserver.conf defines the state directory as /var/run resulting in the pid file created in a different location. Fixed by changing var.state_dir

Index: lighttpd-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lighttpd/lighttpd-lxrserver.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- lighttpd-lxrserver.conf	21 Jan 2013 16:35:04 -0000	1.8
+++ lighttpd-lxrserver.conf	22 Jan 2013 09:15:53 -0000	1.9
@@ -19,7 +19,7 @@
 var.log_root    = "/var/log/lighttpd/"
 # var.server_root = "/srv/www/"
 var.server_root = "/var/www/"
-var.state_dir   = "/var/run/"
+var.state_dir   = "/var/run/lighttpd/"
 var.home_dir    = "/var/lib/lighttpd/"
 var.conf_dir    = "/etc/lighttpd/"
 

[Lxr-commits] CVS: lxr/templates lxrkernel.conf,1.8,1.9

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv8257/templates

Modified Files:
	lxrkernel.conf 
Log Message:
configure-lxr.pl and templates: minor adjustments

Correction of a serious bug in lxrkernel.conf preventing from correctly configuring 'virtroot'

Index: lxrkernel.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxrkernel.conf,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- lxrkernel.conf	21 Jan 2013 10:49:36 -0000	1.8
+++ lxrkernel.conf	21 Jan 2013 16:35:03 -0000	1.9
@@ -47,7 +47,7 @@
 #@MSG Buttons-and-menus interface is highly recommended, otherwise your
 #@MSG screen will be seriously cluttered and ugly.
 #@MSG This interface is selected by the 'htmlhead' parameter in the
-#@MSG	HTML subsection.
+#@MSG HTML subsection.
 #
 #	To use this file 'as is', move it to its final location with:
 #		cp custom.d/lxrkernel.conf lxr.conf
@@ -98,10 +98,10 @@
 #@	MSG You previously defined the virtual root as %virtroot%
 #@ELSE
 #- - Multiple trees context - -
-#@	IF	'b' eq "%virtrootpolicy%"
-#@		ASK --- Tree designation for URL?; -1; kernel
+#@	IF	'b' eq "%_virtrootpolicy%"
+#@		ASK --- Tree designation for URL?; -1; ; kernel
 #@		DEFINE virtroot="%virtrootbase%/%A%"
-#@	ELSEIF	'c' eq "%virtrootpolicy%"
+#@	ELSEIF	'c' eq "%_virtrootpolicy%"
 #@		REMIND The custom multiple trees management method must contain
 #@		MSG at least the server section name %virtrootbase% and a unique
 #@		MSG tree designation (in an order compatible with the URL magic
@@ -117,7 +117,7 @@
 #@ENDIF	%_singlecontext%
 #- - End of virtroot differences - -
 #-
-	  'virtroot'    => '%A%'
+	  'virtroot'    => '%virtroot%'
 #- The following @DEFINE allows automatic transfer of correct 'virtroot'
 #- into lighttpd-lxrserver.conf.
 #@IF	'' eq "%virtroot%"

[Lxr-commits] CVS: lxr/templates/lighttpd lighttpd-lxrserver.conf, 1.6, 1.7

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/lighttpd
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16874/templates/lighttpd

Modified Files:
	lighttpd-lxrserver.conf 
Log Message:
In scripts configure-lxr.pl, ContextMgr.pm, LCLInterpreter.pm, recreatedb.pm
Some templates

Modifications to configurator to manage web server setup, changes to LCL to better handle configuration variants; all of these imply adaptations and additions to Apache, lighttpd templates and lxr.conf (& associated parts).

Index: lighttpd-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lighttpd/lighttpd-lxrserver.conf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- lighttpd-lxrserver.conf	19 Jan 2013 13:59:42 -0000	1.6
+++ lighttpd-lxrserver.conf	21 Jan 2013 10:49:36 -0000	1.7
@@ -92,7 +92,7 @@
 ##  Basic Configuration
 ## ---------------------
 ##
-# server.port = 80
+server.port = %port%
 
 ##
 ## Use IPv6?
@@ -468,21 +468,21 @@
 ## for all 'virtroot' to be served by the same LXR server
 ## located in the root directory.
 #@IF	%_singlecontext%
-#	$HTTP["url"] !~ "^/lxr/[^/]+/" {
-#		alias.url +=	("/lxr/tree1/" => "%LXRroot%/")
-#		alias.url +=	("/lxr/tree2/" => "%LXRroot%/")
-#		alias.url +=	("/lxr/tree3/" => "%LXRroot%/")
+#	$HTTP["url"] !~ "^%virtrootbase%/[^/]+/" {
+#		alias.url +=	("%virtrootbase%/tree1/" => "%LXRroot%/")
+#		alias.url +=	("%virtrootbase%/tree2/" => "%LXRroot%/")
+#		alias.url +=	("%virtrootbase%/tree3/" => "%LXRroot%/")
 #	}
 # 
 #@ELSE
-	$HTTP["url"] =~ "^/lxr/[^/]+/" {
+	$HTTP["url"] =~ "^%virtrootbase%/[^/]+/" {
 #@ENDIF
 #- - -
 #- - - Note: block below is interpreted during pass 2.
 #- - -
 #@PASS2 here_virtroot
 #@	IF	!%_singlecontext%
-#@U		alias.url +=	("%virtroot%/" => "%LXRroot%/")
+		alias.url +=	("%virtroot%/" => "%LXRroot%/")
 #@	ENDIF
 #@ENDP2
 #- - - End of second pass additions
@@ -491,12 +491,18 @@
 #@ENDIF
 
 ## ------- Tell which files are CGI scripts ------
-	cgi.assign +=	( "/source" => ""
-					, "/ident" => ""
-					, "/diff" => ""
-					, "/search" => ""
-					, "/showconfig" => ""
-					)
+#@IF	'' ne "%virtrootbase%"
+	$HTTP["url"] =~ "^%virtrootbase%/" {
+#@ENDIF
+		cgi.assign +=	( "/source" => ""
+						, "/ident" => ""
+						, "/diff" => ""
+						, "/search" => ""
+						, "/showconfig" => ""
+						)
+#@IF	'' ne "%virtrootbase%"
+	}
+#@ENDIF
 
 ##
 #######################################################################

[Lxr-commits] CVS: html/prototype newfeatures.shtml,1.11,1.12

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/prototype
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16122/prototype

Modified Files:
	newfeatures.shtml 
Log Message:
newfeatures.shtml

Configurator handles now web server setup

Index: newfeatures.shtml
===================================================================
RCS file: /cvsroot/lxr/html/prototype/newfeatures.shtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- newfeatures.shtml	3 Jan 2013 11:07:04 -0000	1.11
+++ newfeatures.shtml	21 Jan 2013 10:28:51 -0000	1.12
@@ -42,6 +42,13 @@
 This allows to share blocks of configuration among templates,
 resulting in easier management of similar templates.
 				</p>
+				<p class="normal">
+To a certain extent,
+web server setup is now under control of the interactive configurator.
+However,
+only the most common cases are covered.
+Read the User's Manual for the necessary checks.
+				</p>
 			</li>
 			<li class="classics">Experimental <strong>Mercurial</strong> support added
 				<p class="normal">

[Lxr-commits] CVS: html/en newfeatures.shtml,1.11,1.12

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/html/en
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv16122/en

Modified Files:
	newfeatures.shtml 
Log Message:
newfeatures.shtml

Configurator handles now web server setup

Index: newfeatures.shtml
===================================================================
RCS file: /cvsroot/lxr/html/en/newfeatures.shtml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- newfeatures.shtml	3 Jan 2013 11:07:03 -0000	1.11
+++ newfeatures.shtml	21 Jan 2013 10:28:51 -0000	1.12
@@ -42,6 +42,13 @@
 This allows to share blocks of configuration among templates,
 resulting in easier management of similar templates.
 				</p>
+				<p class="normal">
+To a certain extent,
+web server setup is now under control of the interactive configurator.
+However,
+only the most common cases are covered.
+Read the User's Manual for the necessary checks.
+				</p>
 			</li>
 			<li class="classics">Experimental <strong>Mercurial</strong> support added
 				<p class="normal">

[Lxr-commits] CVS: lxr/templates/lighttpd lighttpd-lxrserver.conf, 1.5, 1.6

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/lighttpd
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13644/templates/lighttpd

Modified Files:
	lighttpd-lxrserver.conf 
Log Message:
templates/lighttpd/lighttpd-lxrserver.conf: fix bug #227 wrong operator

Use =~ for pattern matching

Index: lighttpd-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lighttpd/lighttpd-lxrserver.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lighttpd-lxrserver.conf	11 Jan 2013 12:10:09 -0000	1.5
+++ lighttpd-lxrserver.conf	19 Jan 2013 13:59:42 -0000	1.6
@@ -475,7 +475,7 @@
 #	}
 # 
 #@ELSE
-	$HTTP["url"] !~ "^/lxr/[^/]+/" {
+	$HTTP["url"] =~ "^/lxr/[^/]+/" {
 #@ENDIF
 #- - -
 #- - - Note: block below is interpreted during pass 2.

[Lxr-commits] CVS: lxr/templates/Apache apache-lxrserver.conf, 1.4, 1.5 htaccess-generic, 1.4, 1.5

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/Apache
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv13381/templates/Apache

Modified Files:
	apache-lxrserver.conf htaccess-generic 
Log Message:
templates/Apache/apache-lxrserver.conf & htaccess-generic: implement Apache 2.4 access controls

Index: apache-lxrserver.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/apache-lxrserver.conf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- apache-lxrserver.conf	11 Jan 2013 12:06:13 -0000	1.4
+++ apache-lxrserver.conf	19 Jan 2013 13:54:22 -0000	1.5
@@ -85,6 +85,9 @@
 <Directory "%LXRroot%">
 	Options FollowSymLinks
 	AllowOverride FileInfo Limit Options
+		# Apache 2.2 access control
 	Order allow,deny
 	Allow from all
+		# Apache 2.4 access control
+	Require all granted
 </Directory>

Index: htaccess-generic
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/Apache/htaccess-generic,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- htaccess-generic	11 Nov 2012 14:00:40 -0000	1.4
+++ htaccess-generic	19 Jan 2013 13:54:22 -0000	1.5
@@ -14,7 +14,10 @@
 # Enable CGI script execution and use of symlinks
 Options ExecCGI FollowSymlinks
 
+		# up to Apache 2.2
 Order deny,allow
+		# from Apache 2.4
+#	No directive needed
 
 
 # =================================================
@@ -29,16 +32,25 @@
 
 # Forbid direct access to any file in LXR root and its subdirectories
 <FilesMatch ".">
+		# up to Apache 2.2
 	Deny from all
+		# from Apache 2.4
+	Require all denied
 </FilesMatch>
 
 # But allow access to style sheets
 <FilesMatch "\.css$">
+		# up to Apache 2.2
 	Allow from all
+		# from Apache 2.4
+	Require all granted
 </FilesMatch>
 # and graphic files (for icons)
 <FilesMatch "\.(bmp|gif|icon?|jpe?g|png|svg|tiff?)$">
+		# up to Apache 2.2
 	Allow from all
+		# from Apache 2.4
+	Require all granted
 </FilesMatch>
 
 

[Lxr-commits] CVS: lxr/templates/Mercurial hg-lxr-ext.py, NONE, 1.1 hg.rc, NONE, 1.1

[Andre-Littoz <ajl...@us...>]

Update of /cvsroot/lxr/lxr/templates/Mercurial
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv4479/templates/Mercurial

Added Files:
	hg-lxr-ext.py hg.rc 
Log Message:
Mercurial.pm, templates/Mercurial/: add Mercurial support

Experimental support; still performance issue in Marcurial.pm's getdir()

--- NEW FILE: hg-lxr-ext.py ---
###############################################
#
# $Id: hg-lxr-ext.py,v 1.1 2013/01/18 17:48:50 ajlittoz Exp $
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#
###############################################

#	Mercurial plugin for LXR commands ls-onelevel and fsize

#	ls-onelevel lists only the designated directory without
#		recursively traversing sub-directories.
#		Contrary to Hg-standard ls, it reports contained
#		sub-directories (with which LXR can build links to
#		these directories).
#	fsize returns filesize
#		(otherwise, filesize can only be computed by checking
#		out file and counting characters)

#------------------------------------------------
from mercurial import cmdutil
import mercurial.hgweb.webcommands

cmdtable = {}
command = cmdutil.command(cmdtable)

@command('ls-onelevel',
        [('r', 'rev', '.',
          'revision to list')],
        'hg ls-onelevel [-r REV] [path]')
def lxrls(ui, repo, path='', rev='.'):

	files = {}
	dirs = {}
	ctx = repo[rev]
	mf = ctx.manifest()
	if path and not path.endswith('/'):
		path += '/'
	l = len(path)

	for full, n in mf.iteritems():
		f = mercurial.hgweb.webcommands.decodepath(full)

		if f[:l] != path:
			continue
		remain = f[l:]
		elements = remain.split('/')
		if len(elements) == 1:
			files[remain] = full
		else:
			h = dirs # need to retain ref to dirs (root)
			elem = elements[0]
			if elem not in h:
				h[elem] = {}

	for d in sorted(dirs):
		ui.write('%s/\n' % (d))

	for f in sorted(files):
		full = files[f]
		ui.write('%s\n' % (f))

#------------------------------------------------

@command('fsize',
        [('r', 'rev', '.',
          'return file size')],
        'hg fsize [-r REV] [path]')
def lxrfsize(ui, repo, path='', rev='.'):

	ctx = repo[rev]
	if path and path.endswith('/'):
		ui.write('0\n')
		return

	fctx = ctx.filectx(path)
	ui.write('%d\n' % (fctx.size()))

--- NEW FILE: hg.rc ---
[extensions]
lxr-ext = %LXRroot%/%LXRconfdir%/hg-lxr-ext.py

[trusted]
users = %LXRconfUser%