diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-05 00:12:31 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-10-05 00:31:51 +0200 |
commit | 3c3e613ce41fd689fb646035c2d9776777b308c6 (patch) | |
tree | 5827b8d699cf646d906618ed9816ba19d15d16c8 /solenv | |
parent | goodbye deliver log (diff) | |
download | core-3c3e613ce41fd689fb646035c2d9776777b308c6.tar.gz core-3c3e613ce41fd689fb646035c2d9776777b308c6.zip |
only register deliverables for showdeliverables
* this seriously improves startup improvement for gbuild
(for example from 9.3s to 5.2s for an noop offapi build)
Diffstat (limited to 'solenv')
-rw-r--r-- | solenv/gbuild/Deliver.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index c910bf0ab18f..6389ea62664e 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -39,8 +39,7 @@ gb_Deliver_DELIVERABLES_INDEX := endef -define gb_Deliver_do_add -$$(if $(3),,$$(error - missing third parameter for deliverable $(1))) +define gb_Deliver_register_deliverable gb_Deliver_DELIVERABLES_$(notdir $(3)) += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1)) gb_Deliver_DELIVERABLES_INDEX := $(sort $(gb_Deliver_DELIVERABLES_INDEX) $(notdir $(3))) $(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),) @@ -48,10 +47,9 @@ $(if $(gb_LOWRESTIME),.LOW_RESOLUTION_TIME : $(1),) endef define gb_Deliver_add_deliverable +$$(if $(3),,$$(error - missing third parameter for deliverable $(1))) ifeq ($(MAKECMDGOALS),showdeliverables) -$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3)) -else -$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3)) +$(call gb_Deliver_register_deliverable,$(OUTDIR)/$(1),$(2),$(3)) endif endef |