diff options
| author | David Tardon <dtardon@redhat.com> | 2013-10-11 09:33:21 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-10-11 09:33:21 +0200 |
| commit | 06293b051c9eb418ce0f5a6ee2f7dabafd78f98c (patch) | |
| tree | dcab8cc68dc377896e9b92ea8322ec53df03372e /solenv | |
| parent | 2cddda124aad6ccce41367d44ec0d778727408f6 (diff) | |
do not copy testing extensions to instdir
Change-Id: Ibd2f18a8998b3e182d8d5b8af9c9f74a8ac00744
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 847705518524..42da3635c3a1 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -114,7 +114,7 @@ $(call gb_Extension_get_target,%) : \ # add deliverable # add dependency for outdir target to workdir target (pattern rule for delivery is in Package.mk) # -# gb_Extension_Extension extension srcdir +# gb_Extension_Extension extension srcdir nodeliver define gb_Extension_Extension $(call gb_Extension_get_target,$(1)) : DESCRIPTION := $(call gb_Extension_get_target,$(1)) : FILES := META-INF description.xml @@ -127,11 +127,7 @@ $(call gb_Extension_get_workdir,$(1))/description.xml :| \ $(call gb_Extension__get_preparation_target,$(1)) $(call gb_Extension__get_final_target,$(1)) : $(call gb_Extension_get_target,$(1)) -$(call gb_GeneratedPackage_GeneratedPackage,Extension/$(1),$(dir $(call gb_Extension_get_rootdir,$(1)))) -$(call gb_GeneratedPackage_add_dir,Extension/$(1),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) - -$(call gb_GeneratedPackage_get_target,Extension/$(1)) : $(call gb_Extension_get_target,$(1)) -$(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,Extension/$(1)) +$(if $(filter nodeliver,$(3)),,$(call gb_Extension__Extension_deliver,$(1),Extension/$(1))) ifneq ($(strip $(gb_WITH_LANG)),) $(call gb_Extension_get_target,$(1)) : \ @@ -149,6 +145,18 @@ $(call gb_Helper_make_userfriendly_targets,$(1),Extension,$(call gb_Extension__g endef +# Ensure delivery of the extension to instdir. +# +# gb_Extension__Extension_deliver extension package-name +define gb_Extension__Extension_deliver +$(call gb_GeneratedPackage_GeneratedPackage,$(2),$(dir $(call gb_Extension_get_rootdir,$(1)))) +$(call gb_GeneratedPackage_add_dir,$(2),$(INSTROOT)/share/extensions/$(1),$(notdir $(call gb_Extension_get_rootdir,$(1)))) + +$(call gb_GeneratedPackage_get_target,$(2)) : $(call gb_Extension_get_target,$(1)) +$(call gb_Extension__get_final_target,$(1)) : $(call gb_GeneratedPackage_get_target,$(2)) + +endef + # adding a file creates a dependency to it # file is copied to $(WORKDIR) define gb_Extension_add_file |