Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Add missing clean-* make targets.

Browse source 
Some more recent Servo crates were not cleaned by `make servo-clean`.
This commit is contained in:
Simon Sapin 2014-08-26 14:42:29 +01:00
parent b0c2e09ed7
commit 1c908f2084
2 changed files with 11 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

30
mk/clean.mk
View file

@ -25,43 +25,31 @@ clean-fast: $(DEPS_CLEAN_TARGETS_FAST) clean-servo
@$(call E, "cleaning:") @$(call E, "cleaning:")
@$(call E, " $(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))") @$(call E, " $(filter-out $(SLOW_BUILDS),$(DEPS_CLEAN_ALL))")
clean-util:
@$(call E, "cleaning util")
$(Q)cd $(B)/src/components/util/ && rm -rf libutil*.dylib libutil*.rlib libutil*.dSYM libutil*.so $(DONE_util)
clean-embedding: clean-embedding:
@$(call E, "cleaning embedding") @$(call E, "cleaning embedding")
$(Q)cd $(B)/src/components/embedding/ && rm -rf libembedding*.dylib libembedding*.dSYM libembedding*.so $(DONE_embedding) $(Q)cd $(B)/src/components/embedding/ && rm -rf libembedding*.dylib libembedding*.dSYM libembedding*.so $(DONE_embedding)
clean-msg: define DEF_CLEAN_SERVO_RULES
@$(call E, "cleaning msg")
$(Q)cd $(B)/src/components/msg/ && rm -rf libmsg*.dylib libmsg*.rlib libmsg*.dSYM libmsg*.so $(DONE_msg)
clean-net: .PHONY: clean-$(1)
@$(call E, "cleaning net") clean-$(1):
$(Q)cd $(B)/src/components/net/ && rm -rf libnet*.dylib libnet*.rlib libnet*.dSYM libnet*.so $(DONE_net) @$$(call E, "cleaning $(1)")
$$(Q)cd $$(B)/src/components/$(1)/ && rm -rf lib$(1)*.dylib lib$(1)*.rlib lib$(1)*.dSYM lib$(1)*.so $$(DONE_$(1))
clean-gfx: endef
@$(call E, "cleaning gfx")
$(Q)cd $(B)/src/components/gfx/ && rm -rf libgfx*.dylib libgfx*.rlib libgfx*.dSYM libgfx*.so $(DONE_gfx)
clean-script: $(foreach lib_crate,$(SERVO_LIB_CRATES),$(eval $(call DEF_CLEAN_SERVO_RULES,$(lib_crate))))
@$(call E, "cleaning script")
$(Q)cd $(B)/src/components/script/ && rm -rf libscript*.dylib libscript*.rlib libscript*.dSYM libscript*.so $(DONE_script) && find $(S)/src/components/script/ -name \*.pyc -delete
clean-style:
@$(call E, "cleaning style")
$(Q)cd $(B)/src/components/style/ && rm -rf libstyle*.dylib libstyle*.rlib libstyle*.dSYM libstyle*.so $(DONE_style)
clean-wpt: clean-wpt:
$(Q)rm -r _virtualenv $(Q)rm -r _virtualenv
$(Q)rm $(S)/src/test/wpt/metadata/MANIFEST.json $(Q)rm $(S)/src/test/wpt/metadata/MANIFEST.json
clean-servo: clean-gfx clean-util clean-embedding clean-net clean-script clean-msg clean-style clean-servo: $(foreach lib_crate,$(SERVO_LIB_CRATES),clean-$(lib_crate))
@$(call E, "cleaning servo") @$(call E, "cleaning servo")
$(Q)rm -f servo servo-test $(foreach lib_crate,$(SERVO_LIB_CRATES),servo-test-$(lib_crate)) libservo*.so libservo*.a $(Q)rm -f servo servo-test $(foreach lib_crate,$(SERVO_LIB_CRATES),servo-test-$(lib_crate)) libservo*.so libservo*.a
$(Q)cd $(BINDINGS_SRC) && rm -f *.pkl *.rs $(Q)cd $(BINDINGS_SRC) && rm -f *.pkl *.rs
clean-rust-snapshot-archives: clean-rust-snapshot-archives:
@$(call E, "cleaning rust snapshot archives") @$(call E, "cleaning rust snapshot archives")
$(Q)cd $(B)/rust_snapshot/ && rm -rf *.tgz $(Q)cd $(B)/rust_snapshot/ && rm -rf *.tgz

4
mk/main.mk
View file

@ -364,10 +364,10 @@ RFLAGS_servo = $(addprefix -L $(B)src/,$(DEPS_SUBMODULES)) -L $(B)src/components
SRC_servo = $(call rwildcard,$(S)src/components/main/,*.rs) SRC_servo = $(call rwildcard,$(S)src/components/main/,*.rs)
CRATE_servo = $(S)src/components/main/servo.rs CRATE_servo = $(S)src/components/main/servo.rs
DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(DONE_util) $(DONE_gfx) $(DONE_script) $(DONE_net) $(DONE_msg) $(DONE_style) $(DONE_macros) $(DONE_layout) $(DONE_layout_traits) $(DONE_script_traits) $(DONE_compositing)
SERVO_LIB_CRATES = macros util net msg gfx script script_traits style layout layout_traits compositing SERVO_LIB_CRATES = macros util net msg gfx script script_traits style layout layout_traits compositing
DEPS_servo = $(CRATE_servo) $(SRC_servo) $(DONE_SUBMODULES) $(foreach lib_crate,$(SERVO_LIB_CRATES),$(DONE_$(lib_crate)))
# rules that depend on having correct meta-target vars (DEPS_CLEAN, DEPS_servo, etc) # rules that depend on having correct meta-target vars (DEPS_CLEAN, DEPS_servo, etc)
# and SERVO_LIB_CRATES # and SERVO_LIB_CRATES
include $(S)mk/check.mk include $(S)mk/check.mk