ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #804 from nasa/803

Browse Source 
Remove SWIG_*_CUSTOM_OUTDIR
This commit is contained in:
dbankieris 2019-06-03 13:13:52 -05:00 committed by GitHub
commit 731b9b9c1f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
libexec/trick/make_makefile_swig
View File

@ -187,25 +187,9 @@ all: \$(TRICK_FIXED_PYTHON)
SWIG_I =" ;
foreach my $file ( @files_to_process ) {
if ( !exists $trick_headers{$file}{python_module_dir} ) {
(my $swig_file = $file) =~ s/\.[^.]*$/_py.i/ ;
print MAKEFILE " \\\n build$swig_file" ;
$swig_file =~ s/i$/o/ ;
print PY_LINK_LIST "build$swig_file\n" ;
}
}
print MAKEFILE "
SWIG_I_CUSTOM_OUTDIR =" ;
foreach my $file ( @files_to_process ) {
if ( exists $trick_headers{$file}{python_module_dir} ) {
(my $swig_file = $file) =~ s/\.[^.]*$/_py.i/ ;
print MAKEFILE " \\\n build$swig_file" ;
$swig_file =~ s/i$/o/ ;
print PY_LINK_LIST "build$swig_file\n" ;
}
(my $swig_file = $file) =~ s/(\.[^.]*)?$/_py/ ;
print MAKEFILE " \\\n build$swig_file.i" ;
print PY_LINK_LIST "build$swig_file.o\n" ;
}
print MAKEFILE "
@ -232,26 +216,9 @@ SWIG_SRC = \$(subst .i,.cpp,\$(SWIG_I)) $swig_src_dir/top.cpp
-include \$(SWIG_SRC:.cpp=.d)
SWIG_SRC_CUSTOM_OUTDIR = \$(subst .i,.cpp,\$(SWIG_I_CUSTOM_OUTDIR))\n" ;
foreach my $file ( @files_to_process ) {
if ( exists $trick_headers{$file}{python_module_dir} ) {
(my $swig_file = $file) =~ s/\.[^.]*$/_py.i/ ;
(my $cpp_file = $file) =~ s/\.[^.]*$/_py.cpp/ ;
(my $dependency_file = $file) =~ s/\.[^.]*$/_py.d/ ;
print MAKEFILE "
build$cpp_file : build$swig_file | build$dependency_file trick/$trick_headers{$file}{python_module_dir}
\t\$(PRINT_SWIG)
\t\$(call ECHO_AND_LOG,\$(SWIG) \$(TRICK_INCLUDE) \$(TRICK_DEFINES) \$(TRICK_VERSIONS) \$(TRICK_SWIG_FLAGS) -c++ -python -includeall -ignoremissing -w201 -w303 -w325 -w362 -w389 -w401 -w451 -MMD -MP -outdir trick/$trick_headers{$file}{python_module_dir} -o \$@ \$<)
build$dependency_file: ;
-include build$dependency_file\n";
}
}
print MAKEFILE "
# SWIG_OBJECTS =================================================================
SWIG_OBJECTS = \$(subst .cpp,.o,\$(SWIG_SRC)) \$(subst .cpp,.o,\$(SWIG_SRC_CUSTOM_OUTDIR)) $swig_src_dir/init_swig_modules.o
SWIG_OBJECTS = \$(subst .cpp,.o,\$(SWIG_SRC)) $swig_src_dir/init_swig_modules.o
\$(SWIG_OBJECTS): %.o: %.cpp
\t\$(PRINT_COMPILE_SWIG)

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

@ -7,7 +7,7 @@ use Cwd 'abs_path' ;
use strict ;
# Get environment variables, split on colons, strip leading/trailing whitespace, remove empty elements, get absolute paths then remove more empty elements
# Get environment variable, split on colons, strip leading/trailing whitespace, remove empty elements, get absolute paths, remove more empty elements
sub get_paths {
return grep { $_ ne ''} map abs_path($_), grep { $_ ne '' } map { s/(^\s+|\s+$)//g ; $_ } split /:/, $ENV{$_[0]} ;
}