ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 05:07:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add ability to use doxygen style library dependencies in S_define file. #373

Browse Source 
Added a regular expression to collect the library dependencies in the S_define
file.
This commit is contained in:
Alex Lin 2017-01-10 08:09:19 -06:00
parent 0197df7103
commit 0140b0b966
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libexec/trick/pm/html.pm
View File

@ -8,18 +8,18 @@ use File::Basename ;
use strict ;
sub extract_trick_header($$$$) {
my ($file_name , $contents, $verbose, $indent) = @_ ;
my $trick_header = "" ;
my %header ;
if ($contents =~ /\/\*((.*?)PURPOSE:(.*?))\*+\//is ) {
$trick_header = $1 ;
$trick_header =~ s/^.*?([A-Za-z])/$1/s ;
$trick_header =~ s/(\))[^)]*$/$1/s ;
$trick_header =~ s/ //g ;
}
$header{doc_title} = $1 if $trick_header =~ /DOC TITLE:[^(]*(.*?)\)([A-Z _\t\n\r]+:|[ \t\n\r]*$)/si ;
$header{purpose} = $1 if $trick_header =~ /PURPOSE:[^(]*(.*?)\)([A-Z _\t\n\r]+:|[ \t\n\r]*$)/si ;
$header{reference} = $1 if $trick_header =~ /REFERENCE:[^(]*(.*?)\)([A-Z _\t\n\r]+:|[ \t\n\r]*$)/si ;
@ -33,7 +33,7 @@ sub extract_trick_header($$$$) {
$header{python_module} = $1 if $trick_header =~ /PYTHON[ _]MODULE:[^(]*(.*?)\)([A-Z _\t\n\r]+:|[ \t\n\r]*$)/si ;
$header{programmers} = $1 if $trick_header =~ /PROGRAMMERS:[^(]*(.*?)\)([A-Z _\t\n\r]+:|[ \t\n\r]*$)/si ;
$header{language} = $1 if $trick_header =~ /LANGUAGE:[^(]*(.*?)\)([A-Z _\t\n\r]+:|[ \t\n\r]*$)/si ;
# if ( $verbose ) {
# print " "x$indent , "/*\n" ;
# print " "x($indent+3) , "DOC TITLE:\n\t$header{doc_title})\n" if ( exists $header{doc_title} ) ;
@ -46,9 +46,16 @@ sub extract_trick_header($$$$) {
# print " "x($indent+3) , "LANGUAGE:\n\t$header{language})\n" if ( exists $header{language} ) ;
# print " "x$indent , "*/\n\n" ;
# }
if ( $contents =~ /(?:@|\\)trick_li(?:nk|b)_dependency\s*{\s*(.*?)\s*}/) {
my @lib_list ;
@lib_list = ($contents =~ m/(?:@|\\)trick_li(?:nk|b)_dependency\s*{\s*(.*?)\s*}/gs) ;
# save doxygen style trick_lib_dependency fields in field = liblist.
$header{liblist} = [@lib_list] ;
}
$header{language} = "CPP" if ( $header{language} =~ /c[p\+]+/i ) ;
return %header ;
}

2
libexec/trick/pm/parse_s_define.pm
View File

@ -250,6 +250,8 @@ sub parse_s_define ($) {
$header{libdep} =~ s/\(\(/\(/ ;
$header{libdep} =~ s/\)\)/\)/ ;
@lib_list = $header{libdep} =~ m/\((.+?)\)/sg ;
# Append any library deps in doxygen style comments.
push @lib_list , @{$header{liblist}} if ( exists $header{liblist} ) ;
foreach my $object_file (@lib_list) {
#print " look for object $object_file\n" ;
if ( $object_file =~ /^\// ) {