ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-04-07 19:34:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

c preprocessor statements don't work in Trick header blocks in header files #317

Browse Source 
Copied the block of code that sends header file comments through the preprocessor from
15.x to trunk.  This block was left out and is now used by both headers and source files.
This commit is contained in:
Alex Lin 2016-09-26 08:35:26 -05:00
parent e835ecf515
commit 2eadf217a9
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libexec/trick/pm/get_lib_deps.pm
View File

@ -4,6 +4,7 @@ use File::Basename ;
use Cwd 'abs_path';
use File::Path qw(make_path) ;
use Exporter ();
use gte ;
@ISA = qw(Exporter);
@EXPORT = qw(get_lib_deps write_lib_deps);
@ -25,8 +26,19 @@ sub get_lib_deps ($$) {
# another field in the trick header, a doxygen style keyword, or the end of comment *.
# we capture all library dependencies at once into raw_lib_deps
@raw_lib_deps = ($contents =~ /LIBRARY[ _]DEPENDENC(?:Y|IES)\s*:[^(]*(.*?)\)(?:[A-Z _\t\n\r]+:|\s*[\*@])/gsi) ;
foreach ( @raw_lib_deps ) {
push @lib_list , (split /\)[ \t\n\r\*]*\(/ , $_) ;
foreach my $r ( @raw_lib_deps ) {
# if there is preprocessor directive in the library dependencies, run the text through cpp.
if ( $r =~ /#/ ) {
(my $cc = gte("TRICK_CC")) =~ s/\n// ;
my @defines = $ENV{"TRICK_CFLAGS"} =~ /(-D\S+)/g ;
my $temp ;
open FILE, "echo \"$r\" | cpp -P @defines |" ;
while ( <FILE> ) {
$temp .= $_ ;
}
$r = $temp ;
}
push @lib_list , (split /\)[ \t\n\r\*]*\(/ , $r) ;
}
@inc_paths = $ENV{"TRICK_CFLAGS"} =~ /-I\s*(\S+)/g ; # get include paths from TRICK_CFLAGS