mirror of
https://github.com/servo/servo.git
synced 2025-08-11 08:25:32 +01:00
Prettify make output during builds.
This commit is contained in:
parent
b94a5ab6d1
commit
2539bf744f
3 changed files with 53 additions and 29 deletions
30
mk/check.mk
30
mk/check.mk
|
@ -2,7 +2,7 @@ define DEF_SUBMODULE_TEST_RULES
|
|||
# check target
|
||||
.PHONY: check-$(1)
|
||||
check-$(1) : $$(DONE_$(1))
|
||||
@$$(call E, make check: $(1))
|
||||
@$$(call E, check: $(1))
|
||||
|
||||
$$(Q) \
|
||||
$$(ENV_CFLAGS_$(1)) \
|
||||
|
@ -19,13 +19,16 @@ $(eval $(call DEF_SUBMODULE_TEST_RULES,$(submodule))))
|
|||
# Testing targets
|
||||
|
||||
servo-test: $(DEPS_servo)
|
||||
$(RUSTC) $(RFLAGS_servo) --test -o $@ $<
|
||||
@$(call E, check: servo)
|
||||
$(Q)$(RUSTC) $(RFLAGS_servo) --test -o $@ $<
|
||||
|
||||
reftest: $(S)src/test/harness/reftest/reftest.rs servo
|
||||
$(RUSTC) -o $@ $<
|
||||
@$(call E, compile: $@)
|
||||
$(Q)$(RUSTC) -o $@ $<
|
||||
|
||||
contenttest: $(S)src/test/harness/contenttest/contenttest.rs servo
|
||||
$(RUSTC) $(RFLAGS_servo) -o $@ $< -L .
|
||||
@$(call E, compile: $@)
|
||||
$(Q)$(RUSTC) $(RFLAGS_servo) -o $@ $< -L .
|
||||
|
||||
|
||||
DEPS_CHECK_TESTABLE = $(filter-out $(NO_TESTS),$(DEPS_CHECK_ALL))
|
||||
|
@ -34,26 +37,33 @@ DEPS_CHECK_TARGETS_FAST = $(addprefix check-,$(filter-out $(SLOW_TESTS),$(DEPS_C
|
|||
|
||||
.PHONY: check-test
|
||||
check-test:
|
||||
echo $(DEPS_CHECK_TARGETS_ALL)
|
||||
@$(call E, check:)
|
||||
@$(call E, " $(DEPS_CHECK_TARGETS_ALL)")
|
||||
|
||||
.PHONY: check
|
||||
check: $(DEPS_CHECK_TARGETS_FAST) check-servo tidy
|
||||
@$(call E, check: all)
|
||||
|
||||
.PHONY: check-all
|
||||
check-all: $(DEPS_CHECK_TARGETS_ALL) check-servo tidy
|
||||
@$(call E, check: all)
|
||||
|
||||
.PHONY: check-servo
|
||||
check-servo: servo-test
|
||||
./servo-test
|
||||
@$(call E, check: servo)
|
||||
$(Q)./servo-test
|
||||
|
||||
.PHONY: check-ref
|
||||
check-ref: reftest
|
||||
./reftest $(S)src/test/ref/*.list
|
||||
@$(call E, check: reftests)
|
||||
$(Q)./reftest $(S)src/test/ref/*.list
|
||||
|
||||
.PHONY: check-content
|
||||
check-content: contenttest
|
||||
./contenttest --source-dir=$(S)src/test/html/content $(TESTNAME)
|
||||
@$(call E, check: contenttests)
|
||||
$(Q)./contenttest --source-dir=$(S)src/test/html/content $(TESTNAME)
|
||||
|
||||
.PHONY: tidy
|
||||
tidy:
|
||||
python $(S)src/etc/tidy.py $(S)src
|
||||
tidy:
|
||||
@$(call E, check: tidy)
|
||||
$(Q)python $(S)src/etc/tidy.py $(S)src
|
||||
|
|
26
mk/clean.mk
26
mk/clean.mk
|
@ -18,27 +18,33 @@ DEPS_CLEAN_TARGETS_FAST = $(addprefix clean-,$(filter-out $(SLOW_BUILDS),$(DEPS_
|
|||
.PHONY: clean $(DEPS_CLEAN_TARGETS_ALL)
|
||||
|
||||
clean: $(DEPS_CLEAN_TARGETS_ALL) clean-servo
|
||||
$(Q)echo "Cleaning targets:"
|
||||
$(Q)echo "$(DEPS_CLEAN_ALL)"
|
||||
@$(call E, "cleaning:")
|
||||
@$(call E, " $(DEPS_CLEAN_ALL)")
|
||||
|
||||
clean-fast: $(DEPS_CLEAN_TARGETS_FAST) clean-servo
|
||||
$(Q)echo "Cleaning targets:"
|
||||
$(Q)echo "$(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))"
|
||||
@$(call E, "cleaning:")
|
||||
@$(call E, " $(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))")
|
||||
|
||||
clean-util:
|
||||
cd $(B)/src/components/util/ && rm -rf libutil*.dylib libutil*.so $(DONE_util)
|
||||
@$(call E, "cleaning util")
|
||||
$(Q)cd $(B)/src/components/util/ && rm -rf libutil*.dylib libutil*.so $(DONE_util)
|
||||
|
||||
clean-msg:
|
||||
cd $(B)/src/components/msg/ && rm -rf libmsg*.dylib libmsg*.so $(DONE_msg)
|
||||
@$(call E, "cleaning msg")
|
||||
$(Q)cd $(B)/src/components/msg/ && rm -rf libmsg*.dylib libmsg*.so $(DONE_msg)
|
||||
|
||||
clean-net:
|
||||
cd $(B)/src/components/net/ && rm -rf libnet*.dylib libnet*.so $(DONE_net)
|
||||
@$(call E, "cleaning net")
|
||||
$(Q)cd $(B)/src/components/net/ && rm -rf libnet*.dylib libnet*.so $(DONE_net)
|
||||
|
||||
clean-gfx:
|
||||
cd $(B)/src/components/gfx/ && rm -rf libgfx*.dylib libgfx*.so $(DONE_gfx)
|
||||
@$(call E, "cleaning gfx")
|
||||
$(Q)cd $(B)/src/components/gfx/ && rm -rf libgfx*.dylib libgfx*.so $(DONE_gfx)
|
||||
|
||||
clean-script:
|
||||
cd $(B)/src/components/script/ && rm -rf libscript*.dylib libscript*.so $(DONE_script)
|
||||
@$(call E, "cleaning script")
|
||||
$(Q)cd $(B)/src/components/script/ && rm -rf libscript*.dylib libscript*.so $(DONE_script)
|
||||
|
||||
clean-servo: clean-gfx clean-util clean-net clean-script clean-msg
|
||||
rm -f servo servo-test
|
||||
@$(call E, "cleaning servo")
|
||||
$(Q)rm -f servo servo-test
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue