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

#741 add VERBOSE synonym everywhere

Browse Source
This commit is contained in:
Scott Fennell 2019-03-21 09:28:52 -05:00
parent 422d5ee2ac
commit 644a9a0e00
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/trick-CP
View File

@ -242,7 +242,7 @@ print-%:
help: help:
@echo -e "\ @echo -e "\
Simulation make options:\n\ Simulation make options:\n\
make [debug] [TRICK_VERBOSE_BUILD=1] - Makes everything: S_main and S_sie.resource\n\ make [debug] [TRICK_VERBOSE_BUILD=1] [VERBOSE=1] - Makes everything: S_main and S_sie.resource\n\
make sie - Builds the S_sie.resource file.\n\ make sie - Builds the S_sie.resource file.\n\
make clean - Removes all object files in simulation directory\n\ make clean - Removes all object files in simulation directory\n\
make spotless - Performs a clean\n\ make spotless - Performs a clean\n\

6
libexec/trick/make_makefile_src
View File

@ -57,7 +57,7 @@ sub read_lib_deps($@) {
read_lib_deps($indent + 1 , @resolved_files) ; read_lib_deps($indent + 1 , @resolved_files) ;
} }
} }
} elsif ( exists $ENV{TRICK_VERBOSE_BUILD} ) { } elsif ( exists( $ENV{TRICK_VERBOSE_BUILD} ) or exists( $ENV{VERBOSE} ) ) {
print "Skipping Previously processed file \"$l\"\n" ; print "Skipping Previously processed file \"$l\"\n" ;
} }
} }
@ -214,6 +214,10 @@ print MAKEFILE
# #
################################################################################ ################################################################################
ifdef VERBOSE
TRICK_VERBOSE_BUILD=1
endif
ifndef TRICK_VERBOSE_BUILD ifndef TRICK_VERBOSE_BUILD
PRINT_COMPILE = \$(info \$(call COLOR,Compiling) \$<) PRINT_COMPILE = \$(info \$(call COLOR,Compiling) \$<)
PRINT_EXE_LINK = \$(info \$(call COLOR,Linking) \$@) PRINT_EXE_LINK = \$(info \$(call COLOR,Linking) \$@)

6
libexec/trick/make_makefile_swig
View File

@ -18,7 +18,7 @@ my @ext_lib_paths ;
my @files_to_process ; my @files_to_process ;
my @ext_lib_files ; my @ext_lib_files ;
my %md5s ; my %md5s ;
my $verbose_build = exists($ENV{'TRICK_VERBOSE_BUILD'}) ; my $verbose_build = (exists($ENV{'TRICK_VERBOSE_BUILD'}) or exists($ENV{'VERBOSE'}));
sub get_paths { sub get_paths {
my @paths = split /:/ , $ENV{$_[0]} ; my @paths = split /:/ , $ENV{$_[0]} ;
@ -177,6 +177,10 @@ else
TRICK_SYSTEM_SWIG_CFLAGS += -Wno-unused-but-set-variable TRICK_SYSTEM_SWIG_CFLAGS += -Wno-unused-but-set-variable
endif endif
ifdef VERBOSE
TRICK_VERBOSE_BUILD=1
endif
ifndef TRICK_VERBOSE_BUILD ifndef TRICK_VERBOSE_BUILD
PRINT_SWIG = \$(info \$(call COLOR,SWIGing) \$<) PRINT_SWIG = \$(info \$(call COLOR,SWIGing) \$<)
PRINT_COMPILE_SWIG = \$(info \$(call COLOR,Compiling) \$<) PRINT_COMPILE_SWIG = \$(info \$(call COLOR,Compiling) \$<)

4
share/trick/makefiles/Makefile.common
View File

@ -9,6 +9,10 @@ export TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)
COLOR = $(1) COLOR = $(1)
ifdef VERBOSE
TRICK_VERBOSE_BUILD=1
endif
ifndef TRICK_VERBOSE_BUILD ifndef TRICK_VERBOSE_BUILD
ECHO_CMD = @ ECHO_CMD = @
endif endif

2
trick_source/codegen/Interface_Code_Gen/PrintAttributes.hh
View File

@ -63,7 +63,7 @@ class PrintAttributes {
protected: protected:
const bool verboseBuild = getenv("TRICK_VERBOSE_BUILD"); const bool verboseBuild = (getenv("TRICK_VERBOSE_BUILD") || getenv("VERBOSE"));
const std::string skipping = color(SKIP, "ICG Skip "); const std::string skipping = color(SKIP, "ICG Skip ");
/** Directory to put class and enum map files */ /** Directory to put class and enum map files */