diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-04 23:47:58 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-05 00:31:51 +0200 |
| commit | 6280f921050e6e879ca752abf4e8fb7553aba6f5 (patch) | |
| tree | de5566b4a1dcff5ae426e352e2eaf2221c22dc25 | |
| parent | simplfy dmake to gbuild bridgefile (diff) | |
| download | core-6280f921050e6e879ca752abf4e8fb7553aba6f5.tar.gz core-6280f921050e6e879ca752abf4e8fb7553aba6f5.zip | |
goodbye deliver log
| -rw-r--r-- | solenv/gbuild/Deliver.mk | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index eb5c20c36136..c910bf0ab18f 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -72,36 +72,6 @@ $(if $(1),$(call gb_Deliver__deliver,$(1),$(2)),\ file does not exist in solver, and cannot be delivered: $(2))) endef - -# We are currently only creating a deliver.log, if only one module gets build. -# As it is possible to add gbuild modules into other (which is done for example for -# the toplevel ooo module already) it does not make sense to create a deliver.log once -# fully migrated. The whole process should be rethought then. -# We need the trailing whitespace so that the newline of echo does not become part of the last record. -define gb_Deliver_setdeliverlogcommand -ifeq ($$(words $(gb_Module_ALLMODULES)),1) -$$(eval $$(call gb_Output_announce,$$(strip $$(gb_Module_ALLMODULES)),$$(true),LOG,1)) -deliverlog : COMMAND := \ - mkdir -p $$(OUTDIR)/inc/$$(strip $$(gb_Module_ALLMODULES)) \ - && RESPONSEFILE=$$(call var2file,$(shell $(gb_MKTEMP)),100,$$(sort $$(foreach list,$$(gb_Deliver_DELIVERABLES_INDEX),$$(gb_Deliver_DELIVERABLES_$$(list))))) \ - && $(gb_AWK) -f $$(GBUILDDIR)/processdelivered.awk < $$$${RESPONSEFILE} \ - > $$(OUTDIR)/inc/$$(strip $(gb_Module_ALLMODULES))/gb_deliver.log \ - && rm -f $$$${RESPONSEFILE} -else -$$(eval $$(call gb_Output_announce,more than one module - creating no deliver.log,$$(true),LOG,1)) -deliverlog : COMMAND := true -endif -endef - -# FIXME: this does not really work for real multi repository builds, but the -# deliver.log format is broken in that case anyway -.PHONY : deliverlog showdeliverables -deliverlog: - $(eval $(call gb_Deliver_setdeliverlogcommand)) - $(call gb_Helper_abbreviate_dirs, $(COMMAND)) - -# all : deliverlog - define gb_Deliver_print_deliverable $(info $(1) $(patsubst $(OUTDIR)/%,%,$(2))) endef @@ -111,4 +81,5 @@ showdeliverables : $(foreach deliverable,$(sort $(foreach list,$(gb_Deliver_DELIVERABLES_INDEX),$(gb_Deliver_DELIVERABLES_$(list)))),\ $(call gb_Deliver_print_deliverable,$(REPODIR)/$(firstword $(subst :, ,$(deliverable))),$(REPODIR)/$(lastword $(subst :, ,$(deliverable))))) true + # vim: set noet sw=4: |