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

Purge empty/whitespace before calling abs_path

Browse Source 
Fixes #542
This commit is contained in:
Derek Bankieris 2018-01-11 13:54:38 -06:00
parent 020dd0c1c9
commit 58103ff889
1 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libexec/trick/convert_swig
View File

@ -127,29 +127,14 @@ if ( $help ) {
@include_dirs = $ENV{"TRICK_CFLAGS"} =~ /-I\s*(\S+)/g ; # get include paths from TRICK_CFLAGS
@exclude_paths = map abs_path($_), split /:/ , $ENV{"TRICK_EXCLUDE"} ;
if (scalar @exclude_paths) {
@exclude_paths = sort(@exclude_paths );
# Error check - delete any element that is null
# (note: sort forced all blank names to front of array
@exclude_paths = map { s/(^\s+|\s+$)//g ; $_ } @exclude_paths ;
while ( not length @exclude_paths[0] ) {
# Delete an element from the left side of an array (element zero)
shift @exclude_paths ;
}
# Get environment variables, split on colons, strip leading/trailing whitespace, remove empty elements, get absolute paths
sub get_paths {
return map abs_path($_), grep { $_ ne '' } map { s/(^\s+|\s+$)//g ; $_ } split /:/, $ENV{$_[0]} ;
}
@swig_exclude_paths = map abs_path($_), split /:/ , $ENV{"TRICK_SWIG_EXCLUDE"} ;
if (scalar @swig_exclude_paths) {
@swig_exclude_paths = sort(@swig_exclude_paths );
# Error check - delete any element that is null
# (note: sort forced all blank names to front of array
@swig_exclude_paths = map { s/(^\s+|\s+$)//g ; $_ } @swig_exclude_paths ;
while ( not length @swig_exclude_paths[0] ) {
# Delete an element from the left side of an array (element zero)
shift @swig_exclude_paths ;
}
}
@ext_lib_paths = map abs_path($_), split /:/ , $ENV{"TRICK_EXT_LIB_DIRS"} ;
@exclude_paths = get_paths( "TRICK_EXCLUDE") ;
@swig_exclude_paths = get_paths( "TRICK_SWIG_EXCLUDE") ;
@ext_lib_paths = get_paths( "TRICK_EXT_LIB_DIRS") ;
@defines = $ENV{"TRICK_CFLAGS"} =~ /(-D\S+)/g ; # get defines from TRICK_CFLAGS
if ( $ENV{"TRICK_CFLAGS"} !~ /DTRICK_VER=/ ) {
push @defines , "-DTRICK_VER=$year" ;