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

Add make spotless target to get rid of config info, patch together various other spots missed by clean (#1515)

Browse Source
This commit is contained in:
Jacqueline Deans 2023-06-13 09:50:19 -05:00 committed by GitHub
parent 479171f569
commit 2e0e580c98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile
View File

@ -370,10 +370,11 @@ clean_ICG :
$(MAKE) -C ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen clean $(MAKE) -C ${TRICK_HOME}/trick_source/codegen/Interface_Code_Gen clean
clean_unit_test: clean_unit_test:
@/bin/rm -rf ${TRICK_HOME}/trick_test/*.xml @/bin/rm -rf ${TRICK_HOME}/trick_test/
@ for i in $(UNIT_TEST_DIRS) ; do \ @ for i in $(UNIT_TEST_DIRS) ; do \
$(MAKE) -C $$i clean ; \ $(MAKE) -C $$i clean ; \
done done
$(MAKE) -C $(DPX_UNIT_TEST_DIR) clean
clean_doxygen: clean_doxygen:
@ $(MAKE) -C ${TRICK_HOME}/doxygen clean @ $(MAKE) -C ${TRICK_HOME}/doxygen clean
@ -394,9 +395,17 @@ clean_sim_serv_xml:
clean_test: clean_unit_test clean_test: clean_unit_test
-@ $(MAKE) -C trick_sims clean -@ $(MAKE) -C trick_sims clean
-@ $(MAKE) -C test clean -@ $(MAKE) -C test clean
@/bin/rm -rf ${TRICK_HOME}/trickops_logs
clean_gui: clean_java clean_gui: clean_java
spotless: clean clean_test
rm -f config.log config.status share/trick/makefiles/config_user.mk
apocalypse: spotless
@echo "I love the smell of napalm in the morning"
################################################################################ ################################################################################
# INSTALL Targets # INSTALL Targets
################################################################################ ################################################################################

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

@ -59,7 +59,7 @@ sub gte (@) {
# remove possible ccache from TRICK_CC # remove possible ccache from TRICK_CC
my ($temp) = $ENV{TRICK_CC} ; my ($temp) = $ENV{TRICK_CC} ;
$temp =~ s/.*?ccache\s+// ; $temp =~ s/.*?ccache\s+// ;
$ret = `$temp --dumpfullversion dumpversion` ; $ret = `$temp -dumpfullversion dumpversion` ;
} }
} }
else { else {

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

@ -81,8 +81,9 @@ TRICK_RANLIB =
ifndef CONFIG_MK ifndef CONFIG_MK
ifneq ($(MAKECMDGOALS), clean) # These are the targets that are allowed to run without configure
$(error Please run $(TRICK_HOME)/configure before running make) ifeq ($(filter $(MAKECMDGOALS), clean real_clean spotless apocalypse),)
$(error Please run $(TRICK_HOME)/configure before running make $(MAKECMDGOALS))
endif endif
endif endif

1
trick_source/data_products/DPX/makefile
View File

@ -52,6 +52,7 @@ clean:
$(MAKE) -C TESTING spotless $(MAKE) -C TESTING spotless
$(MAKE) -C APPS spotless $(MAKE) -C APPS spotless
$(MAKE) -C XML clean $(MAKE) -C XML clean
$(MAKE) -C test clean
${RM} *~ ${RM} *~
${RM} *.o ${RM} *.o

1
trick_source/sim_services/CommandLineArguments/test/Makefile
View File

@ -34,6 +34,7 @@ test: $(TESTS)
clean : clean :
rm -f $(TESTS) *.o *.gcno *.gcda rm -f $(TESTS) *.o *.gcno *.gcda
rm -rf a pre_existing_output_dir/a ../a
create_path_test.o : create_path_test.cpp create_path_test.o : create_path_test.cpp
$(TRICK_CXX) $(TRICK_CXXFLAGS) -c $< $(TRICK_CXX) $(TRICK_CXXFLAGS) -c $<