summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Gu <timothygu99@gmail.com>2014-05-04 20:35:47 (GMT)
committerTimothy Gu <timothygu99@gmail.com>2014-05-04 21:22:40 (GMT)
commit1bf5679e1a8e1fbfc7692d0678f2b56b76e725c0 (patch)
tree3cdd4e9ae2d77af983ecd453366430373defcc45
parent22d382743f3e7574a5cfa5e86dd866f767c81f18 (diff)
downloadmxe-1bf5679e1a8e1fbfc7692d0678f2b56b76e725c0.zip
mxe-1bf5679e1a8e1fbfc7692d0678f2b56b76e725c0.tar.gz
mxe-1bf5679e1a8e1fbfc7692d0678f2b56b76e725c0.tar.bz2
Separate out native-only packages in build matrix (& cosmetics)
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
-rw-r--r--Makefile16
1 files changed, 12 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 7ba4bd8..5d6c275 100644
--- a/Makefile
+++ b/Makefile
@@ -494,6 +494,7 @@ cleanup-style:
build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
$(foreach TARGET,$(MXE_TARGET_LIST),$(eval $(TARGET)_PKGCOUNT := 0))
$(eval BUILD_PKGCOUNT := 0)
+ $(eval BUILD_ONLY_PKGCOUNT := 0)
$(eval VIRTUAL_PKGCOUNT := 0)
@echo '<!DOCTYPE html>' > $@
@echo '<html>' >> $@
@@ -534,12 +535,14 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
@echo '<tbody>' >> $@
@$(foreach PKG,$(PKGS), \
$(eval $(PKG)_VIRTUAL := $(true)) \
+ $(eval $(PKG)_BUILD_ONLY := $(true)) \
echo '<tr>' >> $@; \
echo '<th class="row">$(PKG)</th>' >> $@; \
$(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)) \
echo '<td class="supported">Y</td>' >> $@;, \
echo '<td class="unsupported">N</td>' >> $@;)) \
$(if $(call set_is_member,$(PKG),$(BUILD_PKGS)), \
@@ -548,12 +551,17 @@ build-matrix.html: $(foreach PKG,$(PKGS), $(TOP_DIR)/src/$(PKG).mk)
echo '<td class="supported">Y</td>' >> $@;, \
echo '<td class="unsupported">N</td>' >> $@;) \
$(if $($(PKG)_VIRTUAL), \
- $(eval VIRTUAL_PKGCOUNT := $(call inc,$(VIRTUAL_PKGCOUNT)))))
+ $(eval VIRTUAL_PKGCOUNT := $(call inc,$(VIRTUAL_PKGCOUNT)))) \
+ $(if $($(PKG)_BUILD_ONLY), \
+ $(eval BUILD_ONLY_PKGCOUNT := $(call inc,$(BUILD_ONLY_PKGCOUNT)))))
@echo '<tr>' >> $@
- @echo '<th class="row">Total: $(call subtract,$(words $(PKGS)),$(VIRTUAL_PKGCOUNT)) (+$(VIRTUAL_PKGCOUNT) virtual)</th>' >> $@
- @$(foreach TARGET,$(MXE_TARGET_LIST), \
+ $(eval TOTAL_PKGCOUNT := $(call subtract,$(call subtract,$(words $(PKGS)),$(VIRTUAL_PKGCOUNT)),$(BUILD_ONLY_PKGCOUNT)))
+ @echo '<th class="row">' >> $@
+ @echo 'Total: $(TOTAL_PKGCOUNT)<br>(+$(VIRTUAL_PKGCOUNT) virtual +$(BUILD_ONLY_PKGCOUNT) native-only)' >> $@
+ @echo '</th>' >> $@
+ @$(foreach TARGET,$(MXE_TARGET_LIST), \
echo '<th>$($(TARGET)_PKGCOUNT)</th>' >> $@;)
- @echo '<th>$(BUILD_PKGCOUNT)</th>' >> $@
+ @echo '<th>$(BUILD_PKGCOUNT)</th>' >> $@
@echo '</tr>' >> $@
@echo '</tbody>' >> $@
@echo '</table>' >> $@