Merge branch 'build-matrix-work'

Merges #526.

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>'     >> $@
@@ -601,36 +602,36 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
 	@echo '</tr>'                           >> $@
 	@echo '</thead>'                        >> $@
 	@echo '<tbody>'                         >> $@
-	@{ $(foreach PKG,$(PKGS),                    \
+	@$(foreach PKG,$(PKGS),                      \
 	    $(eval $(PKG)_VIRTUAL := $(true))        \
 	    $(eval $(PKG)_BUILD_ONLY := $(true))     \
-	    echo '<tr>                               \
-	        <th class="row">$(PKG)</th>          \
+	    echo -e '<tr>\n                          \
+	        <th class="row">$(PKG)</th>\n        \
+	        <td>$(call substr,$($(PKG)_VERSION),1,12)$(if $(call gt,$(call strlen,$($(PKG)_VERSION)),12),&hellip;)</td>\n\
 	    $(foreach TARGET,$(MXE_TARGET_LIST),     \
 	        $(if $(value $(call LOOKUP_PKG_RULE,$(PKG),BUILD,$(TARGET))), \
 	            $(eval $(TARGET)_PKGCOUNT := $(call inc,$($(TARGET)_PKGCOUNT))) \
 	            $(eval $(PKG)_VIRTUAL := $(false)) \
 	            $(eval $(PKG)_BUILD_ONLY := $(false)) \
 	            <td class="supported">&#x2713;</td>,            \
-	            <td class="unsupported">&#x2717;</td>))         \
+	            <td class="unsupported">&#x2717;</td>)\n)       \
 	    $(if $(call set_is_member,$(PKG),$(BUILD_PKGS)),        \
 	        $(eval BUILD_PKGCOUNT := $(call inc,$(BUILD_PKGCOUNT))) \
 	        $(eval $(PKG)_VIRTUAL := $(false))   \
 	        <td class="supported">&#x2713;</td>, \
-	        <td class="unsupported">&#x2717;</td>) \
-	        </tr>';                              \
+	        <td class="unsupported">&#x2717;</td>)\n \
+	        </tr>\n' >> $@ $(newline)            \
 	    $(if $($(PKG)_VIRTUAL),                  \
 	        $(eval VIRTUAL_PKGCOUNT := $(call inc,$(VIRTUAL_PKGCOUNT)))) \
 	    $(if $($(PKG)_BUILD_ONLY),               \
-	        $(eval BUILD_ONLY_PKGCOUNT := $(call inc,$(BUILD_ONLY_PKGCOUNT))))) \
-	} >> $@
+	        $(eval BUILD_ONLY_PKGCOUNT := $(call inc,$(BUILD_ONLY_PKGCOUNT)))))
 	@echo '<tr>'                            >> $@
 	@# TOTAL_PKGCOUNT = ( PKGS - VIRTUAL ) - BUILD_ONLY
 	$(eval TOTAL_PKGCOUNT :=                     \
 	    $(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),        \

assets/common.css

@@ -59,6 +59,7 @@
     th.row {
         background: #ececec;
         vertical-align: middle;
+        text-align: left;
     }
     pre {
         font-size: 8pt;