diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2011-05-30 18:05:01 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-06-18 11:24:41 +0200 |
| commit | 958082720c1bbf67e76ebf2d06d47904ecde0e37 (patch) | |
| tree | 658ca44fe571f045e3ebd59c5bb011612478a51c /solenv/gbuild/Deliver.mk | |
| parent | 18a7139115e9709efe84d7bebdb6c3c535a29bcc (diff) | |
ause130: #i117218# change .idl handling to gnu make
Diffstat (limited to 'solenv/gbuild/Deliver.mk')
| -rw-r--r-- | solenv/gbuild/Deliver.mk | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk index c2a5e0898f65..aa5835ae42a1 100644 --- a/solenv/gbuild/Deliver.mk +++ b/solenv/gbuild/Deliver.mk @@ -34,15 +34,30 @@ gb_Deliver_CLEARONDELIVER := $(true) define gb_Deliver_init gb_Deliver_DELIVERABLES := +gb_Deliver_DELIVERABLES_INDEX := endef -define gb_Deliver_add_deliverable -gb_Deliver_DELIVERABLES += $$(patsubst $(REPODIR)/%,%,$(2)):$$(patsubst $(REPODIR)/%,%,$(1)) +define gb_Deliver_do_add +$$(if $(3),,$$(error - missing third parameter for deliverable $(1))) +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),) endef +define gb_Deliver_add_deliverable +ifeq ($(MAKECMDGOALS),showdeliverables) +$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3)) +else +ifneq ($(CWS_WORK_STAMP),) +else +$(call gb_Deliver_do_add,$(OUTDIR)/$(1),$(2),$(3)) +endif +endif + +endef + ifeq ($(strip $(gb_Deliver_GNUCOPY)),) define gb_Deliver_deliver mkdir -p $(dir $(2)) && $(if $(gb_Deliver_CLEARONDELIVER),rm -f $(2) &&) $(if $(gb_Deliver_HARDLINK),ln,cp -f) $(1) $(2) && touch -r $(1) $(2) @@ -64,7 +79,7 @@ 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 $$(gb_Deliver_DELIVERABLES))) \ + && 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} @@ -89,7 +104,7 @@ endef showdeliverables : $(eval MAKEFLAGS := s) - $(foreach deliverable,$(sort $(gb_Deliver_DELIVERABLES)),\ + $(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: |