[Lxr-commits] CVS: lxr/templates tree-ignore.conf.part, NONE, 1.1 tree-server1.conf.part, NONE, 1.1
Brought to you by:
ajlittoz
Menu
▾
▴
[Lxr-commits] CVS: lxr/templates tree-ignore.conf.part, NONE, 1.1 tree-server1.conf.part, NONE, 1.1 tree-server2.conf.part, NONE, 1.1 datastorage.conf.part, 1.1, 1.2 global.conf.part, 1.4, 1.5 lxr.conf, 1.57, 1.58 lxrkernel.conf, 1.9, 1.10
Update of /cvsroot/lxr/lxr/templates In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv30378/templates Modified Files: datastorage.conf.part global.conf.part lxr.conf lxrkernel.conf Added Files: tree-ignore.conf.part tree-server1.conf.part tree-server2.conf.part Log Message: templates/lxr.conf, lxrkernel.conf, datastorage.conf.part, global.conf.part, tree-ignore.conf.part, tree-server1.conf.part, tree-server2.conf.part Upgrade to new LCL version, create new @ADD'ed files so that there is a better commonality between lxr.conf and lxrkernel.conf --- NEW FILE: tree-ignore.conf.part --- #- -*- mode: perl -*- #- LXR master configuration file #- Tree configuration section #- Subdirectory subsection #- Ignore definitions #- #- $Id: tree-ignore.conf.part,v 1.1 2013/09/03 08:45:12 ajlittoz Exp $ #- #- #- This file fragment is meant to be "included" to form the #- complete configuration file. #- #- #- ############################### #- # Tree configuration sections # #- ############################### #- #- # Subdirectory subsection # #- #=========================# # Tree-specific files to ignore (in every directory of the tree) # Extend and uncomment the following copy of the global # parameter to override: # , 'ignorefiles' => # '^\\.|~$|\\.(o|a|orig)$|^CVS$|^core$' # Directories to always ignore. These usually are the SCM's # private directories which possibly may contain non-public # project history. Note that .xxx directories are hidden # by an internal hard-coded rule. Redundant example: # , 'ignoredirs' => ['CVSROOT', 'CVS', '.git'] #@MSG Some directories may contain non-public project data (binaries, #@MSG compilers caches, SCM control data, ...). They can be hidden from LXR. #@KEEPON --- Directory to ignore, e.g. CVSROOT or CVS? (hit return to stop) #@ ON first , 'ignoredirs' => [qw( #@ ENDON %A% #@ ON epilog )] #@ ENDON #@ENDK --- NEW FILE: tree-server1.conf.part --- #- -*- mode: perl -*- #- LXR master configuration file #- Tree configuration section #- Server configuration subsection part 1 #- #- $Id: tree-server1.conf.part,v 1.1 2013/09/03 08:45:12 ajlittoz Exp $ #- #- #- This file fragment is meant to be "included" to form the #- complete configuration file. #- #- #- ############################### #- # Tree configuration sections # #- ############################### #- #- # Server configuration subsection # #- #=================================# #@LOG Configuring LXR server parameters #- #- NOTE --------------------------------------------------- # #- ---- 'baseurl' and 'baseurl_aliases' are deprecated ---- # #- ---- in favor of 'host_names'. ---- # #- ---- See "Global configuration section" ---- # #- ---- ---- # #- ---- 'host_names' takes precedence if 'baseurl' is ---- # #- ---- also defined. ---- # #- ---- ---- # #- ---- Support for 'baseurl' is maintained for ---- # #- ---- compatibility with existing LXRs. ---- # #- ---- ---- # #- Configuration for http://192.168.1.1/lxr. #- baseurl is used to select configuration block. #- 'baseurl' => 'http://192.168.1.1/lxr' # Put your URL here #- # baseurl_aliases allows other URLs to be used to reach the site #- # comment this out if you do not want any aliases #- , 'baseurl_aliases' => #- [ 'http://localhost/lxr' #- , 'http://mydomain/lxr' #- ] #- ---- ---- # #- ---- End of deprecated parameters ---- # #- ---- If you use them, uncomment the comma below ---- # #- -------------------------------------------------------- # #- , #@DEFINE treeid='' #- #@IF 'H' eq "%_routing%" #@ LOG Configuring individual host name or IP (as http://...) #@ MSG Remember: they must be unique! #@ ASK,hostname --- Host name?; -2 , 'host_names' => [ '%hostname%' #@ KEEPON --- Alias name ? (hit return to stop) , '%A%' #@ ENDK ] , #@ELSEIF 'P' eq "%_routing%" #@ ASK,treeid --- Prefix for host name?; -2 'host_names' => [ '%scheme%//%treeid%.%hostname%' #@ ARRAY schemealiases,S hostaliases,A portaliases,P #@ ON none # Put here aliases for host name, such as # , '//%treeid%.localhost' # , 'http://%treeid%.mycomputer.outside.domain:12345' #@ ENDON , '%S%//%treeid%.%A%:%P%' #@ ENDA ] , #@ELSE #@ENDIF #- #@MSG The virtual root is the fixed URL part after the hostname. #- - Virtual root is slightly different depending on context - - #- - because we want to handle everything with a single LXR instance - - #- - except for the "section" case (though it can through symbolic - - #- - links). - - #@IF 'N' eq "%_routing%" #- - Single tree context - - #@ IF %_shared% #@ DEFINE virtroot="%virtrootbase%" #@ MSG You previously defined the virtual root as %virtroot% #@ ELSE #@ DEFINE virtroot='' #@ MSG No virtual root for dedicated server #@ ENDIF #- #- - Multiple trees context - - #- - a) Routing through section path #@ELSEIF 'S' eq "%_routing%" #@ MSG All section paths must be unique! #@ ASK,virtroot --- Full virtual root? (e.g. /section/project/title); -2 #- - b) Routing through extraction from section path #@ELSEIF 'E' eq "%_routing%" #@ IF 'b' eq "%_virtrootpolicy%" #@ MSG The tree needs to be uniquely identified as e.g. %virtrootbase%/the_tree #@ ASK,treeid --- Tree designation for URL? (e.g. the_tree); -2 #@ DEFINE virtroot="%virtrootbase%/%treeid%" #@ ELSEIF 'c' eq "%_virtrootpolicy%" #@ REMIND The custom multiple trees management method must contain #@ REMIND at least the server section name %virtrootbase% and a unique #@ REMIND tree designation (in an order compatible with the URL magic #@ REMIND in the server configuration files). #@ ASK,virtroot --- Full virtual root? (e.g. %virtrootbase%/something); -2 #@ ELSE #@ ERROR Unknown multiple trees management choice! #@ ERROR If you did not tamper with context file, #@ ERROR report this as a bug. #@ DEFINE virtroot='*** ERROR ***' #@ ENDIF %_virtrootpolicy% #- - c) Other cases: host name, host prefix, argument #@ELSE #@ IF %_shared% #@ IF %_commonvirtroot% #@ DEFINE virtroot="%virtrootbase%" #@ MSG You previously defined the virtual root as %virtroot% #@ ELSE #@ ASK,virtroot --- Virtual root? (i.e. URL part after host); -1; ; %virtrootbase% #@ ENDIF #@ ELSE #@ DEFINE virtroot='' #@ MSG No virtual root for dedicated server #@ ENDIF #@ENDIF #- - End of virtroot differences - - #- #@IF !%_commonvirtroot% 'virtroot' => '%virtroot%' , #@ELSE #@ENDIF #- The following @DEFINE allows automatic transfer of correct 'virtroot' #- into lighttpd-lxrserver.conf. #@IF '' eq "%virtroot%" #@ DEFINE virtroot='/' #@ENDIF --- NEW FILE: tree-server2.conf.part --- #- -*- mode: perl -*- #- LXR master configuration file #- Tree configuration section #- Server configuration subsection part 2 #- #- $Id: tree-server2.conf.part,v 1.1 2013/09/03 08:45:12 ajlittoz Exp $ #- #- #- This file fragment is meant to be "included" to form the #- complete configuration file. #- #- #- ############################### #- # Tree configuration sections # #- ############################### #- #- # Server configuration subsection # #- #=================================# #- #- - In single tree context, just output a reminder in case of change; #- - for multiple trees, generate the speed switch buttons #@IF %_singlecontext% # Button title to switch to this tree when multiple # trees are managed by LXR # , 'shortcaption' => 'Tree' #@ELSE #@ ASK Do you want a speed switch button for this tree ?; 1; yes, no; Y, N #@ IF "%A%" eq 'Y' #@ IF %treeid% #@ ASK --- Short title for button? (e.g. XYZZY); -1; ; %treeid% #@ ELSE #@ ASK --- Short title for button? (e.g. XYZZY); -2 #@ ENDIF , 'shortcaption' => '%A%' #@ ENDIF #@ IF 'A' eq "%_routing%" #@ ASK,treeid --- Tree identification in URL? (e.g. the-tree); -2 , 'treename' => '%treeid%' #@ ENDIF #@ENDIF %_singlecontext% #- #@ASK Do you need a specific encoding for this tree ?; 2; yes, no; Y, N #@IF "%A%" eq 'Y' #@ ASK --- Encoding name? (e.g. iso-8859-1); -2 # Character encoding (overrides default) , 'encoding' => '%A%' #@ENDIF # a link of the form (prefix)($filepath)(postfix) is generated when viewing a file # example for cvsweb: # , 'cvswebprefix' => 'http://cvs.myhost.com/cgi-bin/cvsweb.cgi' # , 'cvswebpostfix' => '?cvsroot=rootname' # example for viewcvs: # , 'cvswebprefix' => 'http://cvs.myhost.com/cgi-bin/viewcvs.cgi/myroot' # , 'cvswebpostfix' => '' Index: datastorage.conf.part =================================================================== RCS file: /cvsroot/lxr/lxr/templates/datastorage.conf.part,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- datastorage.conf.part 11 Jan 2013 12:04:27 -0000 1.1 +++ datastorage.conf.part 3 Sep 2013 08:45:11 -0000 1.2 @@ -24,8 +24,7 @@ #- ----- MySQL ----- #@m: #@ IF !%_globaldb% -#@ ASK --- Database name?; -2 -#@ DEFINE DB_name="%A%" +#@ ASK,DB_name --- Database name?; -2 #@ ENDIF , 'dbname' => 'dbi:mysql:dbname=%DB_name%' #- @@ -36,16 +35,14 @@ #- ----- PostgreSQL ----- #@p: #@ IF !%_globaldb% -#@ ASK --- Database name?; -2 -#@ DEFINE DB_name="%A%" +#@ ASK,DB_name --- Database name?; -2 #@ ENDIF , 'dbname' => 'dbi:Pg:dbname=%DB_name%;host=localhost' #- #- ----- SQLite ----- #@s: #@ IF !%_globaldb% -#@ ASK --- Database file? (e.g. /home/myself/storage.db); -2 -#@ DEFINE DB_name="%A%" +#@ ASK,DB_name --- Database file? (e.g. /home/myself/storage.db); -2 #@ ENDIF , 'dbname' => 'dbi:SQLite:dbname=%DB_name%' #@ENDC %_dbengine% @@ -53,10 +50,8 @@ #- #@IF %_dbengine% ne "s" #@ IF !%_dbuser% -#@ ASK --- DB user name?; -1; ; lxr -#@ DEFINE DB_tree_user="%A%" -#@ ASK --- DB password?; -1; ; lxrpw -#@ DEFINE DB_tree_password="%A%" +#@ ASK,DB_tree_user --- DB user name?; -1; ; lxr +#@ ASK,DB_tree_password --- DB password?; -1; ; lxrpw , 'dbuser' => '%DB_tree_user%' , 'dbpass' => '%DB_tree_password%' @@ -64,10 +59,8 @@ #@ ELSEIF !%_globaldb% #@ ASK,C Do you want to override the global '%DB_user%' user name?; 2; yes,no; Y,N #@ IF %C% eq "Y" -#@ ASK --- DB user name?; -1; ; lxr -#@ DEFINE DB_tree_user="%A%" -#@ ASK --- DB password?; -1; ; lxrpw -#@ DEFINE DB_tree_password="%A%" +#@ ASK,DB_tree_user --- DB user name?; -1; ; lxr +#@ ASK,DB_tree_password --- DB password?; -1; ; lxrpw , 'dbuser' => '%DB_tree_user%' , 'dbpass' => '%DB_tree_password%' @@ -82,8 +75,7 @@ #- #- #@IF !%_dbprefix% -#@ ASK --- DB table prefix?; -1; ; lxr_ -#@ DEFINE DB_tbl_prefix="%A%" +#@ ASK,DB_tbl_prefix --- DB table prefix?; -1; ; lxr_ , 'dbprefix' => '%DB_tbl_prefix%' #- @@ -91,8 +83,7 @@ #@ ASK,C Do you want to override the global '%DB_global_prefix%' table prefix?; 2; yes,no; Y,N #@ IF %C% eq "Y" -#@ ASK --- DB table prefix?; -1; ; lxr_ -#@ DEFINE DB_tbl_prefix="%A%" +#@ ASK,DB_tbl_prefix --- DB table prefix?; -1; ; lxr_ , 'dbprefix' => '%DB_tbl_prefix%' #@ ELSE # If you need multiple lxr configurations in one database, set different table Index: global.conf.part =================================================================== RCS file: /cvsroot/lxr/lxr/templates/global.conf.part,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- global.conf.part 31 Aug 2013 19:30:32 -0000 1.4 +++ global.conf.part 3 Sep 2013 08:45:11 -0000 1.5 @@ -14,12 +14,43 @@ #- ################################ #- { + # + # Master mode (where to find the tree name) # + #===========================================# + + # Possible values are: + # - 'single' single-tree context, no tree name (implicit) + # - 'host' one host per tree + # - 'prefix' generic host prefixed with tree name + # - 'section' one section per tree (to be handled through symbolic + # links or duplication) + # - 'embedded' tree name embedded in section path + # - 'argument' first argument is tree name [PREFERRED] + # CAUTION! + # Changing this parameter after initial configuration may + # require adjustements to other parameters! + +#@CASE %_routing% +#@N: + 'routing' => 'single' +#@H: + 'routing' => 'host' +#@P: + 'routing' => 'prefix' +#@S: + 'routing' => 'section' +#@E: + 'routing' => 'embedded' +#@A: + 'routing' => 'argument' +#@ENDC + # Auxiliary tools subsection # #============================# #@LOG Configuring auxiliary tool paths #- Place where lxr can write temporary files - 'tmpdir' => '/tmp' + , 'tmpdir' => '/tmp' #- Define this OR the swish-e variable depending which search engine you want to use. #- Path to glimpse executables. @@ -44,18 +75,23 @@ # Computer DNS names subsection # #================================ -#@LOG Configuring host name or IP (as http://...) -#-#@ASK --- Host name?; -2 -#- , 'host_names' => [ '%A%' -#@LOG Host name previously defined as %scheme%%hostname% - , 'host_names' => [ '%scheme%%hostname%' -#@KEEPON --- Alias name ? (hit return to stop) - , '%A%' -#@ENDK -#- , //localhost -#- , https://192.168.1.1 -#- , 'http://mycomputer.outside.domain:12345' +#@IF 'H' ne "%_routing%" && 'P' ne "%_routing%" +#@ LOG Host name previously defined as %scheme%//%hostname% + , 'host_names' => [ '%scheme%//%hostname%' +#@ ARRAY schemealiases,S hostaliases,A portaliases,P +#@ ON none + # Put here aliases for host name, such as + # , '//localhost' + # , 'https://192.168.1.1' + # , 'http://mycomputer.outside.domain:12345' +#@ ENDON + , '%S%//%A%:%P%' +#@ ENDA ] +#@ELSE + + # Specific host names are defined in tree sections +#@ENDIF # HTML subsection # #=================# @@ -129,33 +165,33 @@ # , 'iconfolder' => 'small-icons/' # Don't forget the final / above. # , 'icons' => -# { '[gm]?awk' => 'application-x-awk.png' -# , 'c|pc' => 'text-x-csrc.png' -# , 'h|hh' => 'text-x-chdr.png' -# , 'c\+\+|cc|cpp|cxx' => 'text-x-c++src.png' -# , 'hpp|hxx|h\+\+' => 'text-x-c++hdr.png' -# , 'java' => 'text-x-java.png' -# , 'js' => 'application-x-javascript.png' -# , 'ma?k' => 'text-x-makefile.png' -# , 'plx?|pm|perl' => 'application-x-perl.png' -# , 'php3?|phtml' => 'application-x-php.png' -# , 'py|python|px' => 'text-x-python.png' -# , 'sh|ba?sh|ksh|zsh|m4' => 'text-x-script.png' -# , 's?html?' => 'text-html.png' -# , 'css' => 'text-css.png' -# , 'p|pas' => 'text-x-pascal.png' -# , 'patch' => 'text-x-patch.png' -# , 'pdf' => 'application-pdf.png' -# , 'sql|pk(s|b)' => 'text-x-sql.png' -# , 'rb|ruby' => 'application-x-ruby.png' -# , 'txt' => 'text-plain.png' -# , 'ui' => 'text-xml.png' -# , '.*\~' => 'application-x-trash' +# { '[gm]?awk' => 'mimetypes/application-x-awk.png' +# , 'c|pc' => 'mimetypes/text-x-csrc.png' +# , 'h|hh' => 'mimetypes/text-x-chdr.png' +# , 'c\+\+|cc|cpp|cxx' => 'mimetypes/text-x-c++src.png' +# , 'hpp|hxx|h\+\+' => 'mimetypes/text-x-c++hdr.png' +# , 'java' => 'mimetypes/text-x-java.png' +# , 'js' => 'mimetypes/application-x-javascript.png' +# , 'ma?k' => 'mimetypes/text-x-makefile.png' +# , 'plx?|pm|perl' => 'mimetypes/application-x-perl.png' +# , 'php3?|phtml' => 'mimetypes/application-x-php.png' +# , 'py|python|px' => 'mimetypes/text-x-python.png' +# , 'sh|ba?sh|ksh|zsh|m4' => 'mimetypes/text-x-script.png' +# , 's?html?' => 'mimetypes/text-html.png' +# , 'css' => 'mimetypes/text-css.png' +# , 'p|pas' => 'mimetypes/text-x-pascal.png' +# , 'patch' => 'mimetypes/text-x-patch.png' +# , 'pdf' => 'mimetypes/application-pdf.png' +# , 'sql|pk(s|b)' => 'mimetypes/text-x-sql.png' +# , 'rb|ruby' => 'mimetypes/application-x-ruby.png' +# , 'txt' => 'mimetypes/text-plain.png' +# , 'ui' => 'mimetypes/text-xml.png' +# , '.*\~' => 'mimetypes/application-x-trash' # } -# , 'graphicicon' => 'image-x-generic.png' -# , 'defaulticon' => 'unknown.png' -# , 'diricon' => 'inode-directory.png' -## , 'parenticon' => 'go-up.png' # this one, in the actions subdirectory +# , 'graphicicon' => 'mimetypes/image-x-generic.png' +# , 'defaulticon' => 'mimetypes/unknown.png' +# , 'diricon' => 'mimetypes/inode-directory.png' +# , 'parenticon' => 'actions/go-up.png' #- How to map files to languages , 'filetypeconf' => '%LXRroot%/templates/filetype.conf' @@ -172,16 +208,28 @@ # your source trees. # A parameter is "common" if its value must be simultaneously # adjusted in every tree. +#@IF %_shared% +#@ IF 'H' eq "%_routing%" || 'P' eq "%_routing%" || 'A' eq "%_routing%" +#@ IF %_commonvirtroot% + + # Virtual root shared by all trees (or hosts) + , 'virtroot' => '%virtrootbase%' +#@ ENDIF +#@ ENDIF +#@ENDIF # Pattern for extracting tree name from URL, since all # trees are usually served from the same physical server. -#@IF %_singlecontext% +#@IF 'E' ne "%_routing%" # Meaningful only in multiple trees context. Example for # built-in method where tree id is last before script name # , 'treeextract' => '([^/]*)/[^/]*$' #@ELSE # Built-in method where tree id is last before script name , 'treeextract' => '([^/]*)/[^/]*$' +#@ IF 'b' ne "%_virtrootpolicy%" + ##### REPLACE WITH YOUR OWN METHOD ##### +#@ ENDIF #@ENDIF #@IF !%_dbuser% Index: lxr.conf =================================================================== RCS file: /cvsroot/lxr/lxr/templates/lxr.conf,v retrieving revision 1.57 retrieving revision 1.58 diff -u -d -r1.57 -r1.58 --- lxr.conf 21 Jan 2013 10:49:36 -0000 1.57 +++ lxr.conf 3 Sep 2013 08:45:12 -0000 1.58 @@ -18,13 +18,15 @@ #- updated for automatic configuration -- ajl 2012/05/05 #- updated to use LCL statements -- ajl 2012/11/30 #- updated for web server config. -- ajl 2013/01/20 +#- updated for change in LCL statements-- ajl 2013/04/28 +#- updated for more common factoring -- ajl 2013/05/13 ( ################################ # Global configuration section # ################################ -#@ADD %LXRtmpldir%/global.conf.part +#@ADD global.conf.part # ------------------------------------------------------------------------ @@ -39,105 +41,13 @@ # Server configuration subsection # #=================================# -#@LOG Configuring LXR server parameters - #- - #- NOTE --------------------------------------------------- # - #- ---- 'baseurl' and 'baseurl_aliases' are deprecated ---- # - #- ---- in favor of 'host_names'. ---- # - #- ---- See "Global configuration section" ---- # - #- ---- ---- # - #- ---- 'host_names' takes precedence if 'baseurl' is ---- # - #- ---- also defined. ---- # - #- ---- ---- # - #- ---- Support for 'baseurl' is maintained for ---- # - #- ---- compatibility with existing LXRs. ---- # - #- ---- ---- # - #- Configuration for http://192.168.1.1/lxr. - #- baseurl is used to select configuration block. -#- 'baseurl' => 'http://192.168.1.1/lxr' # Put your URL here -#- # baseurl_aliases allows other URLs to be used to reach the site -#- # comment this out if you do not want any aliases -#- , 'baseurl_aliases' => -#- [ 'http://localhost/lxr' -#- , 'http://mydomain/lxr' -#- ] - #- ---- ---- # - #- ---- End of deprecated parameters ---- # - #- ---- If you use them, uncomment the comma below ---- # - #- -------------------------------------------------------- # -#- , - -#@MSG The virtual root is the fixed URL part after the hostname. -#- - Virtual root is slightly different depending on context - - -#- - because we want to handle everything with a single LXR instance - - -#@IF %_singlecontext% -#- - Single tree context - - -#-@ ASK --- Virtual root? (i.e. URL part after host); -1; ; /lxr -#@ DEFINE virtroot="%virtrootbase%" -#@ MSG You previously defined the virtual root as %virtroot% -#@ELSE -#- - Multiple trees context - - -#@ IF 'b' eq "%_virtrootpolicy%" -#@ MSG The tree needs to be uniquely identified as e.g. %virtrootbase%/the_tree -#@ ASK --- Tree designation for URL? (e.g. the_tree); -2 -#@ DEFINE virtroot="%virtrootbase%/%A%" -#@ 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 -#@ MSG in the server configuration files). -#@ ASK --- Full virtual root? (e.g. %virtrootbase%/something); -2 -#@ DEFINE virtroot="%A%" -#@ ELSE -#@ ERROR Unknown multiple trees management choice! -#@ ERROR If you did not tamper with context file, -#@ ERROR report this as a bug. -#@ DEFINE virtroot='*** ERROR ***' -#@ ENDIF %_virtrootpolicy% -#@ENDIF %_singlecontext% -#- - End of virtroot differences - - +#@ADD tree-server1.conf.part #- - 'virtroot' => '%virtroot%' -#- The following @DEFINE allows automatic transfer of correct 'virtroot' -#- into lighttpd-lxrserver.conf. -#@IF '' eq "%virtroot%" -#@ DEFINE virtroot='/' -#@ENDIF - #- Title for this tree to display in page header area #- if you aren't satisfied with the default #@ASK --- Caption in page header? (e.g. Project XYZZY displayed by LXR); -2 - , 'caption' => '%A%' -#- -#- - In single tree context, just output a reminder in case of change; -#- - for multiple trees, generate the speed switch buttons -#@IF %_singlecontext% - # Button title to switch to this tree when multiple - # trees are managed by LXR -# , 'shortcaption' => 'Tree' -#@ELSE -#@ ASK Do you want a speed switch button for this tree ?; 1; yes, no; Y, N -#@ IF "%A%" eq 'Y' -#@ ASK --- Short title for button? (e.g. XYZZY); -2 - , 'shortcaption' => '%A%' -#@ ENDIF -#@ENDIF %_singlecontext% -#- -#@ASK Do you need a specific encoding for this tree ?; 2; yes, no; Y, N -#@IF "%A%" eq 'Y' - -#@ ASK --- Encoding name? (e.g. iso-8859-1); -2 - # Character encoding (overrides default) - , 'encoding' => '%A%' -#@ENDIF - - # a link of the form (prefix)($filepath)(postfix) is generated when viewing a file - # example for cvsweb: -# , 'cvswebprefix' => 'http://cvs.myhost.com/cgi-bin/cvsweb.cgi' -# , 'cvswebpostfix' => '?cvsroot=rootname' - # example for viewcvs: -# , 'cvswebprefix' => 'http://cvs.myhost.com/cgi-bin/viewcvs.cgi/myroot' -# , 'cvswebpostfix' => '' + 'caption' => '%A%' +#@ADD tree-server2.conf.part # Tree location subsection # #==========================# @@ -177,9 +87,8 @@ #- directories. #@ MSG A Git repository is a directory containing objects, refs, index, ... subdirectories. #@ MSG It is usually named .git in some user directory and is thus not visible. -#@ ASK --- Git repository? (e.g. /home/myself/project-git/.git); -2 -#@ DEFINE GITrepo="%A%" - , 'sourceroot' => 'git:%A%' +#@ ASK,GITrepo --- Git repository? (e.g. /home/myself/project-git/.git); -2 + , 'sourceroot' => 'git:%GITrepo%' #- #- Any parameters to the source access method should be specified below. #- @@ -269,7 +178,7 @@ #@ENDC #- - End of tree storage - - -# # The string to display as the base part of every path in the tree + # The string to display as the base part of every path in the tree #- , 'sourcerootname' => 'Example' #- # Or if you want automatic version insertion #- , 'sourcerootname' => '$v' @@ -304,7 +213,7 @@ #- - Case No. 2: versions given explicitly in a list #@L: , 'range' => [qw( -#@ KEEPON --- Version name? (hit return to stop); -2 +#@ KEEPON --- Version name? (hit return to stop) %A% #@ ENDK )] @@ -522,29 +431,7 @@ # Subdirectory subsection # #=========================# #@LOG Setting directory lists - - # Tree-specific files to ignore (in every directory of the tree) - # Extend and uncomment the following copy of the global - # parameter to override: -# , 'ignorefiles' => -# '^\\.|~$|\\.(o|a|orig)$|^CVS$|^core$' - - # Directories to always ignore. These usually are the SCM's - # private directories which possibly may contain non-public - # project history. Note that .xxx directories are hidden - # by an internal hard-coded rule. Redundant example: -# , 'ignoredirs' => ['CVSROOT', 'CVS', '.git'] -#@MSG Some directories may contain non-public project data (binaries, -#@MSG compilers caches, SCM control data, ...). They can be hidden from LXR. -#@KEEPON --- Directory to ignore, e.g. CVSROOT or CVS? (hit return to stop) -#@ ON first - , 'ignoredirs' => [qw( -#@ ENDON - %A% -#@ ON last - )] -#@ ENDON -#@ENDK +#@ADD tree-ignore.conf.part # Where to look for include files inside the sourcetree. # This is used to hyperlink to included files. Example: @@ -555,7 +442,7 @@ , 'incprefix' => [qw( #@ ENDON %A% -#@ ON last +#@ ON epilog )] #@ ENDON #@ ON none @@ -581,7 +468,7 @@ # Data storage subsection # #=========================# #- -#@ADD %LXRtmpldir%/datastorage.conf.part +#@ADD datastorage.conf.part #- } Index: lxrkernel.conf =================================================================== RCS file: /cvsroot/lxr/lxr/templates/lxrkernel.conf,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- lxrkernel.conf 21 Jan 2013 16:35:03 -0000 1.9 +++ lxrkernel.conf 3 Sep 2013 08:45:12 -0000 1.10 @@ -59,13 +59,14 @@ #- updated for automatic configuration -- ajl 2012/05/05 #- updated to use LCL statements -- ajl 2012/11/30 #- updated for web server config. -- ajl 2013/01/20 +#- updated for more common factoring -- ajl 2013/05/13 ( ################################ # Global configuration section # ################################ -#@ADD %LXRtmpldir%/global.conf.part +#@ADD global.conf.part # ------------------------------------------------------------------------ @@ -79,85 +80,17 @@ , { # This kernel LXR configuration is generated from - # a template contributed by André Littoz (C) 2012 + # a template contributed by André Littoz (C) 2012-2013 # Server configuration subsection # #=================================# -#- -#- CAUTION! This section is not common factored in an @ADD file. -#- Remember to forward modifications from lxr.conf -#- -#@LOG Configuring LXR server parameters - -#@MSG The virtual root is the fixed URL part after the hostname. -#- - Virtual root is slightly different depending on context - - -#- - because we want to handle everything with a single LXR instance - - -#@IF %_singlecontext% -#- - Single tree context - - -#@ DEFINE virtroot="%virtrootbase%" -#@ MSG You previously defined the virtual root as %virtroot% -#@ELSE -#- - Multiple trees context - - -#@ IF 'b' eq "%_virtrootpolicy%" -#@ ASK --- Tree designation for URL?; -1; ; kernel -#@ DEFINE virtroot="%virtrootbase%/%A%" -#@ 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 -#@ MSG in the server configuration files). -#@ ASK --- Full virtual root? (e.g. %virtrootbase%/kernel); -2 -#@ DEFINE virtroot="%A%" -#@ ELSE -#@ ERROR Unknown multiple trees management choice! -#@ ERROR If you did not tamper with context file, -#@ ERROR report this as a bug. -#@ DEFINE virtroot='*** ERROR ***' -#@ ENDIF %virtrootpolicy% -#@ENDIF %_singlecontext% -#- - End of virtroot differences - - -#- - 'virtroot' => '%virtroot%' -#- The following @DEFINE allows automatic transfer of correct 'virtroot' -#- into lighttpd-lxrserver.conf. -#@IF '' eq "%virtroot%" -#@ DEFINE virtroot='/' -#@ENDIF +#@ADD tree-server1.conf.part #- Title for this tree to display in page header area #- if you aren't satisfied with the default #@ASK --- Caption in page header?; -1; ; Linux kernel cross-references , 'caption' => '%A%' -#- -#- - In single tree context, just output a reminder in case of change; -#- - for multiple trees, generate the speed switch buttons -#@IF %_singlecontext% - # Button title to switch to this tree when multiple - # trees are managed by LXR -# , 'shortcaption' => 'Tree' -#@ELSE -#@ ASK Do you want a speed switch button for this tree ?; 1; yes, no; Y, N -#@ IF "%A%" eq 'Y' -#@ ASK --- Short title for button? (e.g. XYZZY); -2 - , 'shortcaption' => '%A%' -#@ ENDIF -#@ENDIF %_singlecontext% -#- -#@ASK Do you need a specific encoding for this tree ?; 2; yes, no; Y, N -#@IF "%A%" eq 'Y' - -#@ ASK --- Encoding name? (e.g. iso-8859-1); -2 - # Character encoding (overrides default) - , 'encoding' => '%A%' -#@ENDIF - - # a link of the form (prefix)($filepath)(postfix) is generated when viewing a file - # example for cvsweb: -# , 'cvswebprefix' => 'http://cvs.myhost.com/cgi-bin/cvsweb.cgi' -# , 'cvswebpostfix' => '?cvsroot=rootname' - # example for viewcvs: -# , 'cvswebprefix' => 'http://cvs.myhost.com/cgi-bin/viewcvs.cgi/myroot' -# , 'cvswebpostfix' => '' +#@ADD tree-server2.conf.part # Tree location subsection # #==========================# @@ -211,7 +144,11 @@ # | you must manually make the adjustment. { 'v' => - { 'name' => 'Version' +#@ASK Label for version selection menu? ; -1; ; Version + { 'name' => '%A%' +#@MSG Versions are retrieved from file %LXRconfdir%/version_list.txt +#@MSG They are collected into this file by script kernel-vars-grab.sh + # This is the list of versions to index. , 'range' => [ readfile('%LXRconfdir%/version_list.txt') ] #- - Default initial version to display #@MSG By default, first version in list is displayed. You may also indicate @@ -227,7 +164,8 @@ #@ ENDIF } , 'a' => - { 'name' => 'Architecture' +#@ASK Label for architecture selection menu? ; -1; ; Architecture + { 'name' => '%A%' , 'range' => [ readfile('%LXRconfdir%/arch_list.txt') ] , 'default' => 'x86' } @@ -276,29 +214,7 @@ # Subdirectory subsection # #=========================# #@LOG Setting directory lists - - # Tree-specific files to ignore (in every directory of the tree) - # Extend and uncomment the following copy of the global - # parameter to override: -# , 'ignorefiles' => -# '^\\.|~$|\\.(o|a|orig)$|^CVS$|^core$' - - # Directories to always ignore. These usually are the SCM's - # private directories which possibly may contain non-public - # project history. Note that .xxx directories are hidden - # by an internal hard-coded rule. Redundant example: -# , 'ignoredirs' => ['CVSROOT', 'CVS', '.git'] -#@MSG Some directories may contain non-public project data (binaries, -#@MSG compilers caches, SCM control data, ...). They can be hidden from LXR. -#@KEEPON --- Directory to ignore, e.g. CVSROOT or CVS? (hit return to stop) -#@ ON first - , 'ignoredirs' => [qw( -#@ ENDON - %A% -#@ ON last - )] -#@ ENDON -#@ENDK +#@ADD tree-ignore.conf.part # Where to look for include files inside the sourcetree. # This is used to hyperlink to included files. @@ -328,7 +244,7 @@ # Data storage subsection # #=========================# #- -#@ADD %LXRtmpldir%/datastorage.conf.part +#@ADD datastorage.conf.part #- } |
