diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2014-10-13 04:23:46 (GMT) |
|---|---|---|
| committer | Timothy Gu <timothygu99@gmail.com> | 2014-10-13 04:23:46 (GMT) |
| commit | d96134bf3d063b10d3148a9fbe2d23ec3241aaac (patch) | |
| tree | 9803387290f95fe5034cd641ea32b7b38a381ed0 | |
| parent | adbcd704c3deab6e897b6b7e3703f36b6736995d (diff) | |
| parent | 1ea23498338e2d77cf1b153075f72e278d231e85 (diff) | |
| download | mxe-d96134bf3d063b10d3148a9fbe2d23ec3241aaac.zip mxe-d96134bf3d063b10d3148a9fbe2d23ec3241aaac.tar.gz mxe-d96134bf3d063b10d3148a9fbe2d23ec3241aaac.tar.bz2 | |
Merge branch 'build-matrix-work'
Merges #526.
| -rw-r--r-- | Makefile | 19 | ||||
| -rw-r--r-- | assets/common.css | 1 |
2 files changed, 11 insertions, 9 deletions
@@ -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),…)</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">✓</td>, \ - <td class="unsupported">✗</td>)) \ + <td class="unsupported">✗</td>)\n) \ $(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \ $(eval BUILD_PKGCOUNT := $(call inc,$(BUILD_PKGCOUNT))) \ $(eval $(PKG)_VIRTUAL := $(false)) \ <td class="supported">✓</td>, \ - <td class="unsupported">✗</td>) \ - </tr>'; \ + <td class="unsupported">✗</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), \ diff --git a/assets/common.css b/assets/common.css index 6dae66b..49499b4 100644 --- a/assets/common.css +++ b/assets/common.css @@ -59,6 +59,7 @@ th.row { background: #ececec; vertical-align: middle; + text-align: left; } pre { font-size: 8pt; |