From 67cd70bebb9726ff20d7f17ab366c663c87c80c0 Mon Sep 17 00:00:00 2001 From: Tobias Gruetzmacher Date: Sun, 12 Oct 2014 23:07:27 +0200 Subject: [PATCH] Add package versions to build-matrix. This is a bit ugly at the moment, since there are some pretty long version numbers in MXE... --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2db667f8..06555ebc 100644 --- a/Makefile +++ b/Makefile @@ -590,6 +590,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) @echo '' >> $@ @echo '' >> $@ @echo 'Package' >> $@ + @echo 'Version' >> $@ @$(foreach TRIPLET,$(MXE_TRIPLETS), \ echo '$(TRIPLET)' >> $@;) @echo 'Native' >> $@ @@ -606,6 +607,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) $(eval $(PKG)_BUILD_ONLY := $(true)) \ echo ' \ $(PKG) \ + $(call substr,$($(PKG)_VERSION),1,12)$(if $(call gt,$(call strlen,$($(PKG)_VERSION)),12),…) \ $(foreach TARGET,$(MXE_TARGET_LIST), \ $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(TARGET))), \ $(eval $(TARGET)_PKGCOUNT := $(call inc,$($(TARGET)_PKGCOUNT))) \ @@ -629,7 +631,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk) $(call subtract, \ $(call subtract,$(words $(PKGS)),$(VIRTUAL_PKGCOUNT)),\ $(BUILD_ONLY_PKGCOUNT))) - @echo '' >> $@ + @echo '' >> $@ @echo 'Total: $(TOTAL_PKGCOUNT)
(+$(VIRTUAL_PKGCOUNT) virtual +$(BUILD_ONLY_PKGCOUNT) native-only)' >> $@ @echo '' >> $@ @$(foreach TARGET,$(MXE_TARGET_LIST), \