[Lxr-commits] CVS: lxr/templates lxr.conf, 1.62, 1.63 lxrkernel.conf, 1.12, 1.13

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

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

Modified Files:
	lxr.conf lxrkernel.conf 
Log Message:
ltemplates/xr.conf, lxrkernel.conf: Debian-family distros compatibility

These distros seem not to set correctly the working directory before launching CGI scripts. To avoid 'file not found' errors, always use absolute file paths in configuration instead of LXR root directory relative paths.

Index: lxr.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- lxr.conf	10 Mar 2014 16:43:31 -0000	1.62
+++ lxr.conf	25 Oct 2014 18:37:29 -0000	1.63
@@ -23,6 +23,7 @@
 #-	updated for new parameters          -- ajl 2013/09/28
 #-	added answer validation criteria	-- ajl 2013/11/06
 #-	updated fix Git 'range' function    -- ajl 2014/03/10
+#-	fixed version file path to OS-abs.  -- ajl 2014/10/25
 
 (
 		################################
@@ -235,7 +236,11 @@
 #@	ASK --- Version file? (absolute path or relative to LXR root dir.); -2\
 	#@		; [^/]$,file required
 #@	CANONR ',\'
+#@	IF %A% =~ m|^/|
 			, 'range' => [ readfile('%A%') ]
+#@	ELSE
+			, 'range' => [ readfile('%LXRroot%/%A%') ]
+#@	ENDIF
 #-
 #- - Case No. 2: versions given explicitly in a list
 #@L:

Index: lxrkernel.conf
===================================================================
RCS file: /cvsroot/lxr/lxr/templates/lxrkernel.conf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- lxrkernel.conf	17 Nov 2013 09:13:21 -0000	1.12
+++ lxrkernel.conf	25 Oct 2014 18:37:29 -0000	1.13
@@ -61,6 +61,7 @@
 #-	updated for web server config.		-- ajl 2013/01/20
 #-	updated for more common factoring	-- ajl 2013/05/13
 #-	added answer validation criteria	-- ajl 2013/11/06
+#-	fixed all parameter file path to OS-absajl 2014/10/25
 
 (
 		################################
@@ -174,48 +175,48 @@
 #@ASK Label for architecture selection menu? ; -1; ; Architecture
 #@CANONR ',\'
 			{ 'name' => '%A%'
-			, 'range' => [ readfile('%LXRconfdir%/arch_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/arch_list.txt') ]
 			, 'default' => 'x86'
 			}
 		, 'arm_mach' =>
 			{ 'name'  => 'ARM machine'
 			, 'when'  => '"$a" eq "arm"'
-			, 'range' => [ readfile('%LXRconfdir%/arm_mach_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/arm_mach_list.txt') ]
 			}
 		, 'arm_plat' =>
 			{ 'name'  => 'ARM platform'
 			, 'when'  => '"$a" eq "arm"'
-			, 'range' => [ readfile('%LXRconfdir%/arm_plat_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/arm_plat_list.txt') ]
 			}
 		, 'avr32_mach' =>
 			{ 'name'  => 'AVR32 machine'
 			, 'when'  => '"$a" eq "avr32"'
-			, 'range' => [ readfile('%LXRconfdir%/avr32_mach_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/avr32_mach_list.txt') ]
 			}
 		, 'blackfin_mach' =>
 			{ 'name'  => 'Blackfin machine'
 			, 'when'  => '"$a" eq "blackfin"'
-			, 'range' => [ readfile('%LXRconfdir%/blackfin_mach_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/blackfin_mach_list.txt') ]
 			}
 		, 'cris_arch' =>
 			{ 'name'  => 'CRIS architecture'
 			, 'when'  => '"$a" eq "cris"'
-			, 'range' => [ readfile('%LXRconfdir%/cris_arch_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/cris_arch_list.txt') ]
 			}
 		, 'mn10300_proc' =>
 			{ 'name'  => 'MN10300 processor'
 			, 'when'  => '"$a" eq "mn10300"'
-			, 'range' => [ readfile('%LXRconfdir%/mn10300_proc_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/mn10300_proc_list.txt') ]
 			}
 		, 'mn10300_unit' =>
 			{ 'name'  => 'MN10300 unit'
 			, 'when'  => '"$a" eq "mn10300"'
-			, 'range' => [ readfile('%LXRconfdir%/mn10300_unit_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/mn10300_unit_list.txt') ]
 			}
 		, 'um_sys' =>
 			{ 'name'  => 'UM system'
 			, 'when'  => '"$a" eq "um"'
-			, 'range' => [ readfile('%LXRconfdir%/um_sys_list.txt') ]
+			, 'range' => [ readfile('%LXRroot%/%LXRconfdir%/um_sys_list.txt') ]
 			}
 		}