summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Gruetzmacher <tobias-git@23.gs>2014-10-12 21:07:27 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-10-13 04:10:25 (GMT)
commit67cd70bebb9726ff20d7f17ab366c663c87c80c0 (patch)
tree2dc7ec7c9fe429bef7cd8874babd191ffbed0da4
parentc10b29395d21f2f3215eb8716d1044a812cc661f (diff)
downloadmxe-67cd70bebb9726ff20d7f17ab366c663c87c80c0.zip
mxe-67cd70bebb9726ff20d7f17ab366c663c87c80c0.tar.gz
mxe-67cd70bebb9726ff20d7f17ab366c663c87c80c0.tar.bz2
Add package versions to build-matrix.
This is a bit ugly at the moment, since there are some pretty long version numbers in MXE...
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2db667f..06555eb 100644
--- a/Makefile
+++ b/Makefile
@@ -590,6 +590,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
@echo '<thead>' >> $@
@echo '<tr>' >> $@
@echo '<th rowspan="2">Package</th>' >> $@
+ @echo '<th rowspan="2">Version</th>' >> $@
@$(foreach TRIPLET,$(MXE_TRIPLETS), \
echo '<th colspan="$(words $(MXE_LIB_TYPES))">$(TRIPLET)</th>' >> $@;)
@echo '<th rowspan="2">Native</th>' >> $@
@@ -606,6 +607,7 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
$(eval $(PKG)_BUILD_ONLY := $(true)) \
echo '<tr> \
<th class="row">$(PKG)</th> \
+ <td>$(call substr,$($(PKG)_VERSION),1,12)$(if $(call gt,$(call strlen,$($(PKG)_VERSION)),12),&hellip;)</td> \
$(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 '<th class="row">' >> $@
+ @echo '<th class="row" colspan="2">' >> $@
@echo 'Total: $(TOTAL_PKGCOUNT)<br>(+$(VIRTUAL_PKGCOUNT) virtual +$(BUILD_ONLY_PKGCOUNT) native-only)' >> $@
@echo '</th>' >> $@
@$(foreach TARGET,$(MXE_TARGET_LIST), \