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

Merge pull request #744 from nasa/VERBOSE-synonym

Browse Source 
Verbose synonym
This commit is contained in:
Scott Fennell 2019-04-02 13:35:08 -05:00 committed by GitHub
commit 5e0fdc824c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
bin/trick-CP
View File

@ -12,6 +12,11 @@ use Pod::Text ;
$trick_bin = dirname(abs_path($0)) ; $trick_bin = dirname(abs_path($0)) ;
$trick_home = dirname($trick_bin) ; $trick_home = dirname($trick_bin) ;
### Set TRICK_VERBOSE_BUILD if VERBOSE is defined (synonyms) ###
if(defined $ENV{'VERBOSE'}) {
$ENV{'TRICK_VERBOSE_BUILD'} = 1;
}
#### Handle arguments #### #### Handle arguments ####
$numArgs = $#ARGV + 1; $numArgs = $#ARGV + 1;
$makefileAddArgs = ' '; $makefileAddArgs = ' ';
@ -237,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) \$@)

7
libexec/trick/make_makefile_swig
View File

@ -18,7 +18,8 @@ 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'})) ;
my %trick_headers ; my %trick_headers ;
my %python_modules ; my %python_modules ;
my %python_module_dirs ; my %python_module_dirs ;
@ -192,6 +193,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 */