Make the build summary more pretty

This commit is contained in:
Tim Angus 2013-03-26 23:12:17 +00:00
parent 946c89b5f1
commit 838fcf45cb

View file

@ -1152,11 +1152,30 @@ release:
OPTIMIZE="-DNDEBUG $(OPTIMIZE)" OPTIMIZEVM="-DNDEBUG $(OPTIMIZEVM)" \ OPTIMIZE="-DNDEBUG $(OPTIMIZE)" OPTIMIZEVM="-DNDEBUG $(OPTIMIZEVM)" \
CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V) CLIENT_CFLAGS="$(CLIENT_CFLAGS)" SERVER_CFLAGS="$(SERVER_CFLAGS)" V=$(V)
ifneq ($(call bin_path, tput),)
TERM_COLUMNS=$(shell echo $$((`tput cols`-4)))
else
TERM_COLUMNS=76
endif
NAKED_TARGETS=$(shell echo $(TARGETS) | sed -e "s!$(B)/!!g")
print_list=@for i in $(1); \
do \
echo " $$i"; \
done
ifneq ($(call bin_path, fmt),)
print_wrapped=@echo $(1) | fmt -w $(TERM_COLUMNS) | sed -e "s/^\(.*\)$$/ \1/"
else
print_wrapped=$(print_list)
endif
# Create the build directories, check libraries and print out # Create the build directories, check libraries and print out
# an informational message, then start building # an informational message, then start building
targets: makedirs targets: makedirs
@echo "" @echo ""
@echo "Building $(CLIENTBIN) in $(B):" @echo "Building in $(B):"
@echo " PLATFORM: $(PLATFORM)" @echo " PLATFORM: $(PLATFORM)"
@echo " ARCH: $(ARCH)" @echo " ARCH: $(ARCH)"
@echo " VERSION: $(VERSION)" @echo " VERSION: $(VERSION)"
@ -1168,50 +1187,25 @@ ifeq ($(PLATFORM),mingw32)
endif endif
@echo "" @echo ""
@echo " CFLAGS:" @echo " CFLAGS:"
-@for i in $(CFLAGS); \ $(call print_wrapped, $(CFLAGS) $(OPTIMIZE))
do \
echo " $$i"; \
done
-@for i in $(OPTIMIZE); \
do \
echo " $$i"; \
done
@echo "" @echo ""
@echo " CLIENT_CFLAGS:" @echo " CLIENT_CFLAGS:"
-@for i in $(CLIENT_CFLAGS); \ $(call print_wrapped, $(CLIENT_CFLAGS))
do \
echo " $$i"; \
done
@echo "" @echo ""
@echo " SERVER_CFLAGS:" @echo " SERVER_CFLAGS:"
-@for i in $(SERVER_CFLAGS); \ $(call print_wrapped, $(SERVER_CFLAGS))
do \
echo " $$i"; \
done
@echo "" @echo ""
@echo " LDFLAGS:" @echo " LDFLAGS:"
-@for i in $(LDFLAGS); \ $(call print_wrapped, $(LDFLAGS))
do \
echo " $$i"; \
done
@echo "" @echo ""
@echo " LIBS:" @echo " LIBS:"
-@for i in $(LIBS); \ $(call print_wrapped, $(LIBS))
do \
echo " $$i"; \
done
@echo "" @echo ""
@echo " CLIENT_LIBS:" @echo " CLIENT_LIBS:"
-@for i in $(CLIENT_LIBS); \ $(call print_wrapped, $(CLIENT_LIBS))
do \
echo " $$i"; \
done
@echo "" @echo ""
@echo " Output:" @echo " Output:"
-@for i in $(TARGETS); \ $(call print_list, $(NAKED_TARGETS))
do \
echo " $$i"; \
done
@echo "" @echo ""
ifneq ($(TARGETS),) ifneq ($(TARGETS),)
ifndef DEBUG_MAKEFILE ifndef DEBUG_MAKEFILE