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

Trick makefile output formatting and cleanup. #533

Browse Source 
Removed the red from the clean rules.  We'd like to reserve red for
errors.  Ended up removing all color from the clean side.
This commit is contained in:
Alex Lin 2018-03-01 08:51:57 -06:00
parent 9643311f4c
commit 9dd302f4b1
23 changed files with 0 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -148,10 +148,8 @@ MAKE_TRAVERSAL_NEWLINE := | sed '/^make.*: Leaving directory/a\ '
# DEFAULT TARGET
# 1 Build Trick-core and Trick Data-products.
all: no_dp dp
@ echo -e "\n\e[32m#####################################\e[0m"
@ echo -e "\e[32mTrick has been successfully compiled.\e[34m"
@date
@ echo -e "\e[32m#####################################\e[0m\n"
ifeq ($(USE_JAVA), 1)
all: java
@ -166,7 +164,6 @@ no_dp: $(TRICK_LIB) $(TRICK_SWIG_LIB)
$(TRICK_LIB): $(SIM_SERV_DIRS) $(UTILS_DIRS) | $(TRICK_LIB_DIR)
@ echo -e "\e[34m[---Building $@---]\e[0m"
ar crs $@ $(SIM_SERV_OBJS) $(UTILS_OBJS)
@ echo ""
ifeq ($(USE_ER7_UTILS), 1)
ER7_UTILS_LIB = $(TRICK_LIB_DIR)/liber7_utils.a
@ -175,7 +172,6 @@ no_dp: $(ER7_UTILS_LIB)
$(ER7_UTILS_LIB): $(ER7_UTILS_DIRS) | $(TRICK_LIB_DIR)
@ echo -e "\e[34m[---Building $@---]\e[0m"
ar crs $@ $(ER7_UTILS_OBJS)
@ echo ""
endif
# 1.1.1.1 Compile the objects in the specified sim_services directories.
@ -183,14 +179,12 @@ endif
$(SIM_SERV_DIRS): icg_sim_serv $(TRICK_LIB_DIR)
@ echo -e "\e[34m[---Building $@---]\e[0m"
@ $(MAKE) -C $@ trick
@ echo ""
# 1.1.1.2 Compile the objects in the specified utils directories.
.PHONY: $(UTILS_DIRS)
$(UTILS_DIRS): icg_sim_serv
@ echo -e "\e[34m[---Building $@---]\e[0m"
@ $(MAKE) -C $@ trick
@ echo ""
# 1.1.1.3 Compile the objects in the specified er7_utils directories.
.PHONY: $(ER7_UTILS_DIRS)
@ -198,7 +192,6 @@ $(ER7_UTILS_DIRS): TRICK_CXXFLAGS += -Wno-unused-parameter
$(ER7_UTILS_DIRS): make_er7_makefiles icg_sim_serv
@ echo -e "\e[34m[---Building $@---]\e[0m"
@ $(MAKE) -C $@ trick
@ echo ""
.PHONY: make_er7_makefiles
make_er7_makefiles:
@ -216,13 +209,11 @@ endif
icg_sim_serv: $(ICG_EXE)
@ echo -e "\e[34m[---Generating Interface Code---]\e[0m"
${TRICK_HOME}/bin/trick-ICG -s -m ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} ${TRICK_HOME}/include/trick/files_to_ICG.hh
@ echo ""
# 1.1.1.4.1 Build the Interface Code Generator (ICG) executable.
$(ICG_EXE) :
@ echo -e "\e[34m[---Building Interface Code Generator---]\e[0m"
$(MAKE) -C trick_source/codegen/Interface_Code_Gen
@ echo ""
# 1.1.1.5 Create Trick Library directory.
$(TRICK_LIB_DIR):
@ -232,13 +223,11 @@ $(TRICK_LIB_DIR):
$(TRICK_SWIG_LIB): $(SWIG_DIRS) | $(TRICK_LIB_DIR)
@ echo -e "\e[34m[---Building $@---]\e[0m"
ar crs $@ $(SWIG_OBJS)
@ echo ""
.PHONY: $(SWIG_DIRS)
$(SWIG_DIRS): icg_sim_serv $(TRICK_LIB_DIR)
@ echo -e "\e[34m[---Building $@---]\e[0m"
@ $(MAKE) -C $@ trick
@ echo ""
#-------------------------------------------------------------------------------
# 1.2 Build Trick's Data-products Applications.
@ -246,7 +235,6 @@ $(SWIG_DIRS): icg_sim_serv $(TRICK_LIB_DIR)
dp: ${TRICK_HOME}/trick_source/trick_utils/units
@ echo -e "\e[34m[---Building Data-Products Applications---]\e[0m"
@ $(MAKE) -C ${TRICK_HOME}/trick_source/data_products
@ echo ""
#-------------------------------------------------------------------------------
# 1.3 Build Trick's Java Tools
@ -307,9 +295,7 @@ 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[32m####################################"
@echo -e "\e[32mTrick has been successfully cleaned."
@echo -e "\e[32m####################################\e[0m\n"
ifeq ($(USE_ER7_UTILS), 1)

6
share/trick/makefiles/Makefile.tricklib
View File

@ -169,19 +169,13 @@ depend:
@ echo "Created dependency file $(DEPFILE)"
io_clean:
@ echo -e "\e[31m\c"
$(RM) -rf io_src
@ echo -e "\e[0m\c"
clean:
@ echo -e "\e[31m\c"
$(RM) -rf $(OBJ_DIR) $(L_C) $(Y_C) $(Y_H)
@ echo -e "\e[0m\c"
real_clean: clean io_clean
@ echo -e "\e[31m\c"
$(RM) -rf xml *~ *.bak core
@ echo -e "\e[32mDirectory cleaned.\e[0m"
help :
@ echo -e "\n\

2
trick_source/codegen/Interface_Code_Gen/makefile
View File

@ -75,6 +75,4 @@ $(OBJ_DIR):
mkdir -p $(OBJ_DIR)
clean:
@ echo -e "\e[31m\c"
rm -rf $(OBJ_DIR) $(ICG)
@ echo -e "\e[32mDirectory cleaned.\e[0m"

2
trick_source/data_products/Apps/ExternalPrograms/makefile
View File

@ -129,8 +129,6 @@ real_clean:
fi
clean:
@ /bin/echo -e "\e[31m\c"
rm -rf object_${TRICK_HOST_CPU}
rm -rf ${TRICK_HOME}/lib_${TRICK_HOST_CPU}/*.so
@ /bin/echo -e "\e[32mDirectory cleaned.\e[0m"

2
trick_source/data_products/Apps/Trk2csv/makefile
View File

@ -29,10 +29,8 @@ $(OBJDIR)/trk2ascii.o: trk2ascii.cpp | $(OBJDIR)
$(CC) $(DP_CFLAGS) -c trk2ascii.cpp -o $(OBJDIR)/trk2ascii.o
clean:
@ echo -e "\e[31m\c"
rm -f trk2ascii
rm -rf $(OBJDIR)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
real_clean: clean

2
trick_source/data_products/DPX/APPS/FXPLOT/makefile
View File

@ -81,9 +81,7 @@ ${LIBDIR}/libDPC.a:
$(MAKE) -C ${DPX_DIR}/DPC
clean:
@ echo -e "\e[31m\c"
${RM} $(OBJDIR)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
spotless: clean

2
trick_source/data_products/DPX/APPS/GXPLOT/makefile
View File

@ -81,9 +81,7 @@ ${LIBDIR}/libDPV.a:
$(MAKE) -C ${DPX_DIR}/DPV/UTILS
clean:
@ echo -e "\e[31m\c"
${RM} $(OBJDIR)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
spotless: clean

2
trick_source/data_products/DPX/DPC/makefile
View File

@ -52,10 +52,8 @@ ${LIBDIR}:
mkdir -p ${LIBDIR}
clean:
@ echo -e "\e[31m\c"
${RM} *~
${RM} ${OBJDIR}
@ echo -e "\e[32mDirectory cleaned.\e[0m"
spotless: clean
${RM} ${LIBDIR}/${LIBNAME}

2
trick_source/data_products/DPX/DPM/makefile
View File

@ -59,10 +59,8 @@ ${LIBDIR}:
mkdir -p ${LIBDIR}
clean:
@ echo -e "\e[31m\c"
${RM} *~
${RM} ${OBJDIR}
@ echo -e "\e[32mDirectory cleaned.\e[0m"
spotless: clean
${RM} ${LIBDIR}/${LIBNAME}

3
trick_source/data_products/DPX/DPV/UTILS/makefile
View File

@ -34,12 +34,9 @@ ${LIBDIR}:
mkdir -p ${LIBDIR}
clean:
@ echo -e "\e[31m\c"
${RM} *~
${RM} *.o
${RM} ${OBJDIR}
@ echo -e "\e[0m\c"
@ echo -e "\e[32mDirectory cleaned.\e[0m"
spotless: clean
${RM} ${LIBDIR}/${LIBNAME}

2
trick_source/data_products/DPX/TESTING/DPC_TEST/makefile
View File

@ -142,13 +142,11 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@/bin/echo -e "\e[31m\c"
${RM} *~
${RM} *.o
spotless: clean
${RM} ctrl_test
@/bin/echo -e "\e[32mDirectory cleaned.\e[0m"
# Dependencies

2
trick_source/data_products/DPX/TESTING/DPM_TEST/makefile
View File

@ -112,13 +112,11 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@ /bin/echo -e "\e[31m\c"
${RM} *~
${RM} *.o
spotless: clean
${RM} model_test
@ /bin/echo -e "\e[32mDirectory cleaned.\e[0m"
# Dependencies

2
trick_source/data_products/DPX/TESTING/DS/makefile
View File

@ -122,13 +122,11 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@ /bin/echo -e "\e[31m\c"
${RM} *~
${RM} *.o
spotless: clean
${RM} dstest
@ /bin/echo -e "\e[32mDirectory cleaned.\e[0m"
# Dependencies

2
trick_source/data_products/DPX/TESTING/DS_exercisor/makefile
View File

@ -100,10 +100,8 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@ /bin/echo -e "\e[31m\c"
${RM} *~
${RM} *.o
@ /bin/echo -e "\e[32mDirectory cleaned.\e[0m"
spotless: clean

2
trick_source/data_products/DPX/TESTING/TCDS/makefile
View File

@ -125,13 +125,11 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@ /bin/echo -e "\e[31m\c"
${RM} *~
${RM} *.o
spotless: clean
${RM} tcdstest
@ /bin/echo -e "\e[32mDirectory cleaned.\e[0m"
# Dependencies

2
trick_source/data_products/DPX/TESTING/UDS/makefile
View File

@ -125,13 +125,11 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@ /bin/echo -e "\e[31m\c"
${RM} *~
${RM} *.o
spotless: clean
${RM} udstest
@ /bin/echo -e "\e[32mDirectory cleaned.\e[0m"
# Dependencies

2
trick_source/data_products/DPX/makefile
View File

@ -52,12 +52,10 @@ clean:
@ $(MAKE) -C TESTING spotless
@ $(MAKE) -C APPS spotless
@ echo -e "\e[31m\c"
${RM} DOCS
${RM} ${LIBDIR}
${RM} *~
${RM} *.o
@ echo -e "\e[32mDirectory cleaned.\e[0m"
real_clean: clean

2
trick_source/data_products/EQParse/makefile
View File

@ -93,10 +93,8 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@ echo -e "\e[31m\c"
rm -rf $(OBJ_DIR)
rm -f $(LIBDIR)/$(LIBNAME)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
real_clean: clean

2
trick_source/data_products/Log/makefile
View File

@ -65,10 +65,8 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) | $(LIBDIR)
ar crs $(LIBDIR)/$(LIBNAME) $?
clean:
@ echo -e "\e[31m\c"
rm -rf $(OBJ_DIR)
rm -f $(LIBDIR)/$(LIBNAME)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
real_clean: clean

2
trick_source/data_products/Var/makefile
View File

@ -61,10 +61,8 @@ depend:
@ echo "Appended dependencies to $(MAKEFILE)"
clean:
@ echo -e "\e[31m\c"
rm -rf $(OBJ_DIR)
rm -f $(LIBDIR)/$(LIBNAME)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
real_clean: clean

2
trick_source/data_products/units/makefile
View File

@ -46,10 +46,8 @@ $(LIBDIR)/$(LIBNAME): $(CPP_OBJECTS) $(C_OBJECTS) $(LIBDIR)
ar crs $(LIBDIR)/$(LIBNAME) $(CPP_OBJECTS) $(C_OBJECTS)
clean:
@ echo -e "\e[31m\c"
rm -rf $(OBJ_DIR)
rm -f $(LIBDIR)/$(LIBNAME)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
real_clean: clean

2
trick_source/java/makefile
View File

@ -53,12 +53,10 @@ javadoc: ${DOCS_API_DIR}
javadoc -d ${DOCS_API_DIR} -classpath ${CLASS_PATH} -sourcepath ${SRC_DIR} -windowtitle "Trick GUI API" ${JAVA_DOC_LINKS} trick ${SRC_FILES}
clean:
@ echo -e "\e[31m\c"
rm -rf ${BUILD_DIR}
rm -rf ${DIST_DIR}
rm -rf ${RESOURCES_DIR}
rm -rf ${TEST_REPORTS_DIR}
@ echo -e "\e[32mDirectory cleaned.\e[0m"
clean_obj:
rm -rf ${BUILD_DIR}

4
trick_source/trick_swig/Makefile
View File

@ -84,14 +84,10 @@ $(TRICK_LIB) : $(SWIG_OBJECT_FILES) $(OBJECT_FILES)
real_clean: clean
clean: clean_python
@ echo -e "\e[31m\c"
$(RM) -rf $(OBJ_DIR) $(TEST_DIR) $(PY_FILES)
@ echo -e "\e[32mDirectory cleaned.\e[0m"
clean_python:
@ echo -e "\e[31m\c"
rm -rf swig_${TRICK_HOST_CPU} sim_services.py swig_double.py swig_int.py swig_ref.py
@ echo -e "\e[0m\c"
# some depends
swig_int_wrap.cpp: swig_int.cpp