Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d615307c authored by Oliver Middleton's avatar Oliver Middleton Committed by Steve Kondik
Browse files

build: Fix some colored build issues 

 * Fix some broken lines in definitions.mk
 * Finish adding colors to product-graph.mk

Change-Id: I235a60c967b1f10ec6dd1cac25740badbd3b64c9
parent 737235cc

core/definitions.mk

+3 −3
Original line number Diff line number Diff line
@@ -1848,19 +1848,19 @@ endef 


# Copy a prebuilt file to a target location.

define transform-prebuilt-to-target

@echo -e "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

$(copy-file-to-target)

endef



# Copy a prebuilt file to a target location, using zipalign on it.

define transform-prebuilt-to-target-with-zipalign

@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt APK:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt APK:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

$(copy-file-to-target-with-zipalign)

endef



# Copy a prebuilt file to a target location, stripping "# comment" comments.

define transform-prebuilt-to-target-strip-comments

@echo "$(if $(PRIVATE_IS_HOST_MODULE),host,target) "${CL_CYN}"Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

@echo -e ${CL_CYN}"$(if $(PRIVATE_IS_HOST_MODULE),host,target) Prebuilt:"${CL_RST}" $(PRIVATE_MODULE) ($@)"

$(copy-file-to-target-strip-comments)

endef

core/tasks/product-graph.mk

+4 −4
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ $(products_graph): PRIVATE_PRODUCTS := $(really_all_products) 
$(products_graph): PRIVATE_PRODUCTS_FILTER := $(products_list)



$(products_graph): $(this_makefile)

	@echo Product graph DOT:"${CL_RST}" $@ for $(PRIVATE_PRODUCTS_FILTER)

	@echo -e ${CL_GRN}"Product graph DOT:"${CL_RST}" $@ for $(PRIVATE_PRODUCTS_FILTER)"

	$(hide) echo 'digraph {' > $@.in

	$(hide) echo 'graph [ ratio=.5 ];' >> $@.in

	$(hide) $(foreach p,$(PRIVATE_PRODUCTS), \
@@ -89,7 +89,7 @@ endef 
# $(1) product file

define transform-product-debug

$(OUT_DIR)/products/$(strip $(1)).txt: $(this_makefile)

	@echo Product debug info file: $$@

	@echo -e ${CL_GRN}"Product debug info file:"${CL_RST}" $$@"

	$(hide) rm -f $$@

	$(hide) mkdir -p $$(dir $$@)

	$(hide) echo 'FILE=$(strip $(1))' >> $$@
@@ -125,7 +125,7 @@ $(call product-debug-filename, $(p)): \ 
			$(OUT_DIR)/products/$(strip $(1)).txt \

			build/tools/product_debug.py \

			$(this_makefile)

	@echo Product debug html file: $$@

	@echo -e ${CL_GRN}"Product debug html file:"${CL_RST}" $$@"

	$(hide) mkdir -p $$(dir $$@)

	$(hide) cat $$< | build/tools/product_debug.py > $$@

endef
@@ -141,7 +141,7 @@ $(products_pdf): $(products_graph) 
	dot -Tpdf -Nshape=box -o $@ $<



$(products_svg): $(products_graph) $(product_debug_files)

	@echo Product graph SVG: $@

	@echo -e ${CL_GRN}"Product graph SVG:"${CL_RST}" $@"

	dot -Tsvg -Nshape=box -o $@ $<



product-graph: $(products_pdf) $(products_svg)