Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 06:11:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 934864 - Add REPORT_BUILD do INSTALL_TARGETS and PP_TARGETS. r=gps

Browse Source
This commit is contained in:
Mike Hommey 2013-11-09 10:32:58 +09:00
parent 8dc0b551b3
commit 41a1cabced
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
config/rules.mk
View File

@ -53,7 +53,7 @@ else
REPORT_BUILD = $(info $(shell $(PYTHON) $(MOZILLA_DIR)/config/rebuild_check.py $@ $^))
endif
else
REPORT_BUILD = $(info $(notdir $@))
REPORT_BUILD = $(info $(if $(filter $(DEPTH)/%,$@),$(@:$(DEPTH)/%=%),$(notdir $@)))
endif
ifeq ($(OS_ARCH),OS2)
@ -1536,10 +1536,12 @@ install_targets_sanity = $(if $(filter-out $(notdir $@),$(notdir $(<))),$(error
$(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_FILES_$(tier)))):
$(install_targets_sanity)
$(REPORT_BUILD)
$(call install_cmd,$(IFLAGS1) "$<" "$(@D)")
$(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_EXECUTABLES_$(tier)))):
$(install_targets_sanity)
$(REPORT_BUILD)
$(call install_cmd,$(IFLAGS2) "$<" "$(@D)")
################################################################################
@ -1600,6 +1602,7 @@ $(foreach tier,$(PP_TARGETS_TIERS), \
$(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS_RESULTS_$(tier)))):
$(if $(filter-out $(notdir $@),$(notdir $(<:.in=))),$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS))
$(REPORT_BUILD)
$(RM) "$@"
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) "$<" -o "$@"

5
js/src/config/rules.mk
View File

@ -53,7 +53,7 @@ else
REPORT_BUILD = $(info $(shell $(PYTHON) $(MOZILLA_DIR)/config/rebuild_check.py $@ $^))
endif
else
REPORT_BUILD = $(info $(notdir $@))
REPORT_BUILD = $(info $(if $(filter $(DEPTH)/%,$@),$(@:$(DEPTH)/%=%),$(notdir $@)))
endif
ifeq ($(OS_ARCH),OS2)
@ -1536,10 +1536,12 @@ install_targets_sanity = $(if $(filter-out $(notdir $@),$(notdir $(<))),$(error
$(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_FILES_$(tier)))):
$(install_targets_sanity)
$(REPORT_BUILD)
$(call install_cmd,$(IFLAGS1) "$<" "$(@D)")
$(sort $(foreach tier,$(INSTALL_TARGETS_TIERS),$(INSTALL_TARGETS_EXECUTABLES_$(tier)))):
$(install_targets_sanity)
$(REPORT_BUILD)
$(call install_cmd,$(IFLAGS2) "$<" "$(@D)")
################################################################################
@ -1600,6 +1602,7 @@ $(foreach tier,$(PP_TARGETS_TIERS), \
$(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS_RESULTS_$(tier)))):
$(if $(filter-out $(notdir $@),$(notdir $(<:.in=))),$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS))
$(REPORT_BUILD)
$(RM) "$@"
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) $(XULPPFLAGS) "$<" -o "$@"