ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-21 22:17:51 +00:00
Code Issues Actions 4 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

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

@ -47,6 +47,13 @@ sub extract_trick_header($$$$) {
# print " "x$indent , "*/\n\n" ; # 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 ) ; $header{language} = "CPP" if ( $header{language} =~ /c[p\+]+/i ) ;
return %header ; 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/\(\(/\(/ ;
$header{libdep} =~ s/\)\)/\)/ ; $header{libdep} =~ s/\)\)/\)/ ;
@lib_list = $header{libdep} =~ m/\((.+?)\)/sg ; @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) { foreach my $object_file (@lib_list) {
#print " look for object $object_file\n" ; #print " look for object $object_file\n" ;
if ( $object_file =~ /^\// ) { if ( $object_file =~ /^\// ) {