ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-19 21:27:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

S_overrides.mk is included twice when building #360

Browse Source 
Moved some rules from trick-CP to convert_swig.  Using alternative pattern
rules in Makefile_src I believe is faster.
This commit is contained in:
Alex Lin 2017-02-23 14:05:38 -06:00
parent e6ad95f493
commit 31f0ea95ad
3 changed files with 58 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/trick-CP
View File

@ -70,8 +70,7 @@ ifndef TRICK_VERBOSE_BUILD
PRINT_MAKEFILE_SWIG = $(info $(call COLOR,Writing) Makefile_swig)
endif
all: $(S_MAIN) S_sie.resource
$(info Trick Build Process Complete)
all:
test: TRICK_SYSTEM_CFLAGS += -DTRICK_UNIT_TEST
test: TRICK_SYSTEM_CXXFLAGS += -DTRICK_UNIT_TEST

2
libexec/trick/convert_swig
View File

@ -288,7 +288,7 @@ sub process_file() {
my $out_file ;
$out_file = basename($f) ;
$out_file =~ s/\.h.*$/_py\.i/ ;
$out_file =~ s/(\.h|\.H|\.hh|\.h\+\+|\.hxx|\.hpp)$/_py\.i/ ;
$out_file = "$out_dir/${out_file}" ;

70
libexec/trick/make_makefile_src
View File

@ -82,6 +82,10 @@ if ( scalar @ARGV ) {
$any_deps_changed = 1 ;
}
if ( ! -e "build/Makefile_src") {
$any_deps_changed = 1 ;
}
# Read in dependency tree starting at the roots. The dependency tree starts with all of the
# header files ICG processed and the lib deps listed in the S_define file.
open FILE, "build/ICG_processed" or die 'cannot open build/ICG_processed' ;
@ -280,12 +284,20 @@ $num_inc_objs = 0 ;
# List out all of the object files and put the list in a file that we can pass to the linker.
# Passing all of them directly to the linker in the command line can exceed the line limit.
open MODEL_LINK_LIST, ">build/model_link_list" or die "Could not open build/model_link_list" ;
print MAKEFILE "
# MODEL_OBJECTS ================================================================
MODEL_OBJECTS =" ;
foreach $k ( sort keys %files_by_dir ) {
foreach my $ext ( qw{ c C cc cxx cpp c++ } ) {
#foreach $k ( sort keys %files_by_dir ) {
# foreach my $ext ( qw{ c C cc cxx cpp c++ } ) {
# if ( scalar @{$files_by_dir{$k}{$ext}} ne 0 ) {
# foreach $f ( @{$files_by_dir{$k}{$ext}} ) {
# print MAKEFILE " \\\n build$k/$files_by_dir{$k}{src_dir}$f" . "o" ;
# print MODEL_LINK_LIST "build$k/$files_by_dir{$k}{src_dir}$f" . "o\n" ;
# }
# $num_inc_objs++ ;
# }
# }
#}
foreach my $ext ( qw{ c C cc cxx cpp c++ } ) {
print MAKEFILE "\n\nMODEL_${ext}_OBJECTS =" ;
foreach $k ( sort keys %files_by_dir ) {
if ( scalar @{$files_by_dir{$k}{$ext}} ne 0 ) {
foreach $f ( @{$files_by_dir{$k}{$ext}} ) {
print MAKEFILE " \\\n build$k/$files_by_dir{$k}{src_dir}$f" . "o" ;
@ -297,6 +309,13 @@ foreach $k ( sort keys %files_by_dir ) {
}
close MODEL_LINK_LIST ;
print MAKEFILE "\n\nMODEL_OBJECTS =" ;
foreach my $ext ( qw{ c C cc cxx cpp c++ } ) {
print MAKEFILE " \${MODEL_${ext}_OBJECTS}" ;
}
print MAKEFILE "\n" ;
# Write out the compile rules for each type of file.
print MAKEFILE "
@ -305,18 +324,38 @@ print MAKEFILE "
# directories appear to be created as part of the read_lib_deps function, so I'm leaving it out
# for now.
build/%.o : /%.c build/%.d
\${MODEL_c_OBJECTS} : build/%.o : /%.c build/%.d
\t\$(PRINT_COMPILE)
\t\$(ECHO_CMD)\$(TRICK_CC) \$(TRICK_CFLAGS) \$(TRICK_SYSTEM_CFLAGS) -I\$(<D) -I\$(<D)/../include -MMD -MP -c -o \$\@ \$<
define create_compile_rule
build/%.o: /%.\$1 build/%.d
\t\$\$(PRINT_COMPILE)
\t\$\$(ECHO_CMD)\$\$(TRICK_CPPC) \$\$(TRICK_CXXFLAGS) \$\$(TRICK_SYSTEM_CXXFLAGS) -I\$\$(<D) -I\$\$(<D)/../include -MMD -MP -c -o \$\$@ \$\$<
endef
\${MODEL_cc_OBJECTS} : build/%.o : /%.cc build/%.d
\t\$(PRINT_COMPILE)
\t\$(ECHO_CMD)\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) -I\$(<D) -I\$(<D)/../include -MMD -MP -c \$< -o \$\@
EXTENSIONS := C cc cpp cxx c++
\$(foreach EXTENSION,\$(EXTENSIONS),\$(eval \$(call create_compile_rule,\$(EXTENSION))))
\${MODEL_cpp_OBJECTS} : build/%.o : /%.cpp build/%.d
\t\$(PRINT_COMPILE)
\t\$(ECHO_CMD)\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) -I\$(<D) -I\$(<D)/../include -MMD -MP -c \$< -o \$\@
\${MODEL_C_OBJECTS} : build/%.o : /%.C build/%.d
\t\$(PRINT_COMPILE)
\t\$(ECHO_CMD)\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) -I\$(<D) -I\$(<D)/../include -MMD -MP -c \$< -o \$\@
\${MODEL_cxx_OBJECTS} : build/%.o : /%.cxx build/%.d
\t\$(PRINT_COMPILE)
\t\$(ECHO_CMD)\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) -I\$(<D) -I\$(<D)/../include -MMD -MP -c \$< -o \$\@
\${MODEL_c++_OBJECTS} : build/%.o : /%.c++ build/%.d
\t\$(PRINT_COMPILE)
\t\$(ECHO_CMD)\$(TRICK_CPPC) \$(TRICK_CXXFLAGS) \$(TRICK_SYSTEM_CXXFLAGS) -I\$(<D) -I\$(<D)/../include -MMD -MP -c \$< -o \$\@
#define compile_rule
#build/%.o: /%.\$1
#\t\$\$(PRINT_COMPILE)
#\t\$\$(ECHO_CMD)\$\$(TRICK_CPPC) \$\$(TRICK_CXXFLAGS) \$\$(TRICK_SYSTEM_CXXFLAGS) -I\$\$(<D) -I\$\$(<D)/../include -MMD -MP -c \$\$< -o \$\$@
#endef
#
#EXTENSIONS := C cc cpp cxx c++
#\$(foreach EXTENSION,\$(EXTENSIONS),\$(eval \$(call compile_rule,\$(EXTENSION))))
\$(MODEL_OBJECTS:.o=.d): ;
@ -336,6 +375,9 @@ foreach ( @all_read_only_libs ) {
print MAKEFILE "
all: \$(S_MAIN) S_sie.resource
\t\$(info Trick Build Process Complete)
\$(S_MAIN): \$(TRICK_STATIC_LIB) \$(S_OBJECTS) \$(MODEL_OBJECTS)
\t\$(PRINT_EXE_LINK)
\t\$(ECHO_CMD)\$(TRICK_CPPC) -o \$@ \$(TRICK_SYSTEM_LDFLAGS) \$(S_OBJECTS) \$(LINK_LISTS) \$(TRICK_LDFLAGS) \$(TRICK_USER_LINK_LIBS) \$(READ_ONLY_LIBS) \$(LD_WHOLE_ARCHIVE) \$(TRICK_LIBS) \$(LD_NO_WHOLE_ARCHIVE) \$(TRICK_EXEC_LINK_LIBS)