From 6e0fcbd947fbce9642e42aed8eea7b82c690e64b Mon Sep 17 00:00:00 2001 From: Christopher LaChance Date: Thu, 7 Dec 2017 15:10:39 -0600 Subject: [PATCH] Updated formating and replaced formating variables. --- Makefile | 15 ++++---------- share/trick/makefiles/Makefile.tricklib | 20 +++++-------------- trick_source/data_products/DPX/DPC/makefile | 7 ------- .../data_products/DPX/DPV/UTILS/makefile | 10 ++-------- trick_source/data_products/EQParse/makefile | 9 +-------- trick_source/data_products/Log/makefile | 9 +-------- trick_source/data_products/Var/makefile | 9 +-------- trick_source/data_products/units/makefile | 9 +-------- trick_source/trick_swig/Makefile | 14 +++---------- 9 files changed, 18 insertions(+), 84 deletions(-) diff --git a/Makefile b/Makefile index 0cfc582f..dcaeb0ad 100644 --- a/Makefile +++ b/Makefile @@ -281,17 +281,10 @@ clean: clean_sim_serv clean_utils clean_swig clean_dp clean_ICG clean_java @/bin/rm -rf $(TRICK_BIN_DIR) @/bin/rm -rf $(TRICK_LIB_DIR) - @echo -e "\e[31m# #" - @echo -e "\e[33m## ##" - @echo -e "\e[32m### ###" - @echo -e "\e[34m#### ####" - @echo -e "\e[35m##### #####" - @echo -e "\e[39m-----Trick has been successfully cleaned.-----" - @echo -e "\e[35m##### #####" - @echo -e "\e[34m#### ####" - @echo -e "\e[32m### ###" - @echo -e "\e[33m## ##" - @echo -e "\e[31m# #\n" + @echo -e "\e[32m####################################" + @echo -e "\e[32mTrick has been successfully cleaned." + @echo -e "\e[32m####################################\e[0m\n" + ifeq ($(USE_ER7_UTILS), 1) clean: clean_er7_utils diff --git a/share/trick/makefiles/Makefile.tricklib b/share/trick/makefiles/Makefile.tricklib index 603ed2ba..14b12434 100644 --- a/share/trick/makefiles/Makefile.tricklib +++ b/share/trick/makefiles/Makefile.tricklib @@ -160,16 +160,7 @@ $(L_OBJS) : $(OBJ_DIR)/%.lex.o : $(SRC_DIR)%.lex.c $(SRC_DIR)%.tab.h | $(OBJ_DI $(Y_OBJS) : $(OBJ_DIR)/%.tab.o : $(SRC_DIR)%.tab.c | $(OBJ_DIR) $(CD_CMD) $(TRICK_CPPC) $(TRICK_CXXFLAGS) $(TRICK_SYSTEM_CXXFLAGS) -c ${> $(DEPTEMPFILE) @@ -178,17 +169,17 @@ depend: @ echo "Created dependency file $(DEPFILE)" io_clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf io_src - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf $(OBJ_DIR) $(L_C) $(Y_C) $(Y_H) - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" real_clean: clean io_clean - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf xml *~ *.bak core @ echo -e "\e[32mDirectory cleaned.\e[0m" @@ -206,4 +197,3 @@ Source Directory Make Options:\n\ \n\ make real_clean - Deletes xml/, io_src/,\n\ and object_${TRICK_HOST_CPU}/ directories\n" - diff --git a/trick_source/data_products/DPX/DPC/makefile b/trick_source/data_products/DPX/DPC/makefile index 400f361c..6e5a0aac 100644 --- a/trick_source/data_products/DPX/DPC/makefile +++ b/trick_source/data_products/DPX/DPC/makefile @@ -33,12 +33,6 @@ endif ifeq ($(TRICK_HOST_TYPE), Darwin) endif -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -65,4 +59,3 @@ clean: spotless: clean ${RM} ${LIBDIR}/${LIBNAME} - diff --git a/trick_source/data_products/DPX/DPV/UTILS/makefile b/trick_source/data_products/DPX/DPV/UTILS/makefile index 8fc48ca1..33db54eb 100644 --- a/trick_source/data_products/DPX/DPV/UTILS/makefile +++ b/trick_source/data_products/DPX/DPV/UTILS/makefile @@ -19,12 +19,6 @@ LIBOBJS = ${OBJDIR}/DPV_textbuffer.o #.cpp.o: # ${CPP} ${CFLAGS} ${INCDIRS} -c $< -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - all: ${LIBDIR}/${LIBNAME} $(LIBOBJS): $(OBJDIR)/%.o : %.cpp | ${OBJDIR} @@ -40,11 +34,11 @@ ${LIBDIR}: mkdir -p ${LIBDIR} clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" ${RM} *~ ${RM} *.o ${RM} ${OBJDIR} - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" @ echo -e "\e[32mDirectory cleaned.\e[0m" spotless: clean diff --git a/trick_source/data_products/EQParse/makefile b/trick_source/data_products/EQParse/makefile index 99d6163e..e647f96e 100644 --- a/trick_source/data_products/EQParse/makefile +++ b/trick_source/data_products/EQParse/makefile @@ -63,12 +63,6 @@ IO_OBJS = $(IO_C_OBJS) $(IO_CPP_OBJS) OBJECT_FILES = $(IO_OBJS) $(C_OBJS) $(CPP_OBJS) $(F_OBJS) -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -99,10 +93,9 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/Log/makefile b/trick_source/data_products/Log/makefile index fdb85b34..c1f9b066 100644 --- a/trick_source/data_products/Log/makefile +++ b/trick_source/data_products/Log/makefile @@ -49,12 +49,6 @@ ifeq ($(TRICK_DP_FORCE_32BIT), 1) DP_CFLAGS += -m32 endif -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -71,10 +65,9 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) | $(LIBDIR) ar crs $(LIBDIR)/$(LIBNAME) $? clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/Var/makefile b/trick_source/data_products/Var/makefile index 6b36b93c..769cbd28 100644 --- a/trick_source/data_products/Var/makefile +++ b/trick_source/data_products/Var/makefile @@ -39,12 +39,6 @@ MAKEFILE = makefile AWKTEMPFILE = awk.temp MAKEDEPEND = makedepend -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -67,10 +61,9 @@ depend: @ echo "Appended dependencies to $(MAKEFILE)" clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/data_products/units/makefile b/trick_source/data_products/units/makefile index 22d5acf3..c16725a8 100644 --- a/trick_source/data_products/units/makefile +++ b/trick_source/data_products/units/makefile @@ -28,12 +28,6 @@ ifeq ($(TRICK_DP_FORCE_32BIT), 1) DP_CFLAGS += -m32 endif -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" - ############################################################################# ## MODEL TARGETS ## ############################################################################# @@ -52,10 +46,9 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIBDIR) ar crs $(LIBDIR)/$(LIBNAME) $(CPP_OBJECTS) $(C_OBJECTS) clean: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf $(OBJ_DIR) rm -f $(LIBDIR)/$(LIBNAME) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" real_clean: clean diff --git a/trick_source/trick_swig/Makefile b/trick_source/trick_swig/Makefile index 4ec9097f..2d74c2df 100644 --- a/trick_source/trick_swig/Makefile +++ b/trick_source/trick_swig/Makefile @@ -81,25 +81,17 @@ $(SWIG_SRC_FILES): swig_${TRICK_HOST_CPU}/%_wrap.cpp : %.i $(TRICK_LIB) : $(SWIG_OBJECT_FILES) $(OBJECT_FILES) ar crs $@ $? -############################################# -# FORMATTING VARIABLES -############################################# -REMOVAL_COLOR := @ echo -e "\e[31m\c" -DEFAULT_COLOR := @ echo -e "\e[0m\c" -MESSAGE_COLOR := @ echo -e "\e[32m\c" - real_clean: clean clean: clean_python - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" $(RM) -rf $(OBJ_DIR) $(TEST_DIR) $(PY_FILES) - $(DEFAULT_COLOR) @ echo -e "\e[32mDirectory cleaned.\e[0m" clean_python: - $(REMOVAL_COLOR) + @ echo -e "\e[31m\c" rm -rf swig_${TRICK_HOST_CPU} sim_services.py swig_double.py swig_int.py swig_ref.py - $(DEFAULT_COLOR) + @ echo -e "\e[0m\c" # some depends swig_int_wrap.cpp: swig_int.cpp