diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | devtools/document_template.pl | 15 |
2 files changed, 19 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Tue Feb 27 15:17:35 UTC 2007 Chad Elliott <elliott_c@ociweb.com> + + * devtools/document_template.pl: + + Modified this script to look one directory up from the templates + directory for docs/templates to find documentation for templates + that do not reside in the MPC tree. + Tue Feb 27 13:33:42 UTC 2007 Chad Elliott <elliott_c@ociweb.com> * modules/Creator.pm: diff --git a/devtools/document_template.pl b/devtools/document_template.pl index 21ce5e99..b2b8aeb5 100755 --- a/devtools/document_template.pl +++ b/devtools/document_template.pl @@ -238,7 +238,7 @@ if (open($fh, $input)) { elsif ($name eq 'if') { $vname =~ s/(!|&&|\|\|)//g; foreach my $keyword (keys %keywords) { - $vname =~ s/$keyword\(.*\)//g; + $vname =~ s/$keyword\(.*[\)]?//g; } if ($vname !~ /^\s*$/) { $name = lc($vname); @@ -322,10 +322,17 @@ if (open($fh, $input)) { close($fh); my($cp) = new ConfigParser(); - my($doc) = basename($input); - $doc =~ s/\.[^\.]+$/$doc_ext/; $cp->read_file("$basePath/docs/templates/common$doc_ext"); - $cp->read_file("$basePath/docs/templates/$doc"); + + my($doc) = $input; + $doc =~ s/\.[^\.]+$/$doc_ext/; + $doc =~ s/templates/docs\/templates/; + if (-r $doc) { + $cp->read_file($doc); + } + else { + $cp->read_file("$basePath/docs/templates/" . basename($doc)); + } if (open($fh, ">$output")) { display_template($fh, $cp, $input, \%template_keys); |