ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-02-07 11:20:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #799 from nasa/798

Browse Source 
Redo accidentally undone changes
This commit is contained in:
dbankieris 2019-06-03 09:42:32 -05:00 committed by GitHub
commit f7a7419e0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libexec/trick/make_makefile_swig
View File

@ -11,6 +11,7 @@ use Digest::MD5 qw(md5_hex) ;
use trick_version ; use trick_version ;
use html ; use html ;
use verbose_build ; use verbose_build ;
use get_paths ;
use strict ; use strict ;
my @exclude_paths ; my @exclude_paths ;
@ -24,21 +25,6 @@ my %trick_headers ;
my %python_modules ; my %python_modules ;
my %python_module_dirs ; my %python_module_dirs ;
sub get_paths {
my @paths = split /:/ , $ENV{$_[0]} ;
if (scalar @paths) {
@paths = sort(@paths ) ;
# trim whitespace
@paths = map { s/(^\s+|\s+$)//g ; $_ } @paths ;
# Remove empty elements. Sort forced all blank names to the front.
while ( scalar @paths and not length @paths[0] ) {
shift @paths ;
}
@paths = map { (-e $_) ? abs_path($_) : $_ } @paths ;
}
return @paths ;
}
sub read_files_to_process() { sub read_files_to_process() {
my @include_paths ; my @include_paths ;
my $cc ; my $cc ;
@ -83,6 +69,7 @@ sub read_files_to_process() {
# skip duplicate files # skip duplicate files
next if (exists($md5s{$word})) ; next if (exists($md5s{$word})) ;
$md5s{$word} = md5_hex($word) ;
# skip system headers that are missed by the compiler -MM flag # skip system headers that are missed by the compiler -MM flag
next if ( $word =~ /^\/usr\/include/ ) ; next if ( $word =~ /^\/usr\/include/ ) ;
@ -94,11 +81,7 @@ sub read_files_to_process() {
# skip paths in TRICK_EXCLUDE # skip paths in TRICK_EXCLUDE
foreach my $path ( @exclude_paths ) { foreach my $path ( @exclude_paths ) {
if ( $word =~ /^\Q$path\E(.*)/ ) { if ( $word =~ /^\Q$path\E(.*)/ or abs_path($word) =~ /^\Q$path\E(.*)/ ) {
print "SWIG Skip TRICK_EXCLUDE: $path$1\n" if $verbose_build ;
next outer ;
}
if ( abs_path($word) =~ /^\Q$path\E(.*)/ ) {
print "SWIG Skip TRICK_EXCLUDE: $path$1\n" if $verbose_build ; print "SWIG Skip TRICK_EXCLUDE: $path$1\n" if $verbose_build ;
next outer ; next outer ;
} }
@ -106,22 +89,15 @@ sub read_files_to_process() {
# skip paths in TRICK_SWIG_EXCLUDE # skip paths in TRICK_SWIG_EXCLUDE
foreach my $path ( @swig_exclude_paths ) { foreach my $path ( @swig_exclude_paths ) {
if ( $word =~ /^\Q$path\E(.*)/ ) { if ( $word =~ /^\Q$path\E(.*)/ or abs_path($word) =~ /^\Q$path\E(.*)/ ) {
print "SWIG Skip TRICK_SWIG_EXCLUDE: $path$1\n" if $verbose_build ;
next outer ;
}
if ( abs_path($word) =~ /^\Q$path\E(.*)/ ) {
print "SWIG Skip TRICK_SWIG_EXCLUDE: $path$1\n" if $verbose_build ; print "SWIG Skip TRICK_SWIG_EXCLUDE: $path$1\n" if $verbose_build ;
next outer ; next outer ;
} }
} }
# we'll be needing this later
$md5s{$word} = md5_hex($word) ;
# separate paths in TRICK_EXT_LIB_DIRS # separate paths in TRICK_EXT_LIB_DIRS
foreach my $path ( @ext_lib_paths ) { foreach my $path ( @ext_lib_paths ) {
if ( $word =~ /^\Q$path\E(.*)/ ) { if ( $word =~ /^\Q$path\E(.*)/ or abs_path($word) =~ /^\Q$path\E(.*)/ ) {
print "SWIG Skip TRICK_EXT_LIB_DIRS: $path$1\n" if $verbose_build ; print "SWIG Skip TRICK_EXT_LIB_DIRS: $path$1\n" if $verbose_build ;
$ext_libs{$word} = 1 ; $ext_libs{$word} = 1 ;
next outer ; next outer ;